opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-404 Anonymous session must use global project paths

Browse Source
This commit is contained in:
Serge Rider
2020-10-12 14:50:30 +03:00
parent 41f3d1e309
commit 69312b9dd2
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
+9 -5
View File
@@ -203,28 +203,32 @@ public class WebSession implements DBASession {
private void initNavigatorModel() {
CBPlatform platform = CBPlatform.getInstance();
DBPProject globalProject = platform.getWorkspace().getActiveProject();
String projectName;
File porojectsRoot;
File projectPath;
if (user != null) {
projectName = user.getUserId();
porojectsRoot = new File(platform.getWorkspace().getAbsolutePath(), "user-projects");
projectPath = new File(
new File(platform.getWorkspace().getAbsolutePath(), "user-projects"),
projectName);
} else {
projectName = getSessionId();
porojectsRoot = new File(platform.getWorkspace().getAbsolutePath(), "session-projects");
// For anonymous sessions use path of global project
projectPath = globalProject.getAbsolutePath();
}
projectName = CommonUtils.escapeFileName(projectName);
sessionProject = new ProjectMetadata(
platform.getWorkspace(),
projectName,
new File(porojectsRoot, projectName));
projectPath);
if (user == null) {
sessionProject.setInMemory(true);
}
DBPDataSourceRegistry dataSourceRegistry = sessionProject.getDataSourceRegistry();
{
// Copy global datasources.
for (DBPDataSourceContainer ds : platform.getWorkspace().getActiveProject().getDataSourceRegistry().getDataSources()) {
for (DBPDataSourceContainer ds : globalProject.getDataSourceRegistry().getDataSources()) {
if (!ds.isTemplate() && isDataSourceAccessible(ds)) {
DataSourceDescriptor dsCopy = new DataSourceDescriptor((DataSourceDescriptor) ds, dataSourceRegistry, false);
dsCopy.setTemporary(true);