dbeaver/pro#6532 fix adding project settings

yagudin10 · yagudin10 · commit 04365d190e49 · 2025-09-09T11:25:50.000+02:00
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.java
@@ -43,7 +43,6 @@
 import org.jkiss.dbeaver.model.rm.RMConstants;
 import org.jkiss.dbeaver.model.rm.RMProjectPermission;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableParametrized;
-import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerDescriptor;
 import org.jkiss.dbeaver.registry.network.NetworkHandlerRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -526,14 +525,6 @@ public List<String> getTools() {
         return tools;
     }
 
-    public Map<String, Object> getConnectionSettings() throws DBException {
-        return session.getSecurityController().getObjectSettings(
-            dataSourceContainer.getId(),
-            SMObjectType.datasource,
-            null
-        );
-    }
-
     /**
      * Updates param that checks whether credentials were saved only in session.
      */
diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
@@ -308,6 +308,7 @@ public void deleteProject(@NotNull String projectId) throws DBException {
                 log.debug("Deleting project '" + projectId + "'");
                 IOUtils.deleteDirectory(targetPath);
                 getSecurityController().deleteAllObjectPermissions(projectId, SMObjectType.project);
+                getSecurityController().deleteObjectSettings(projectId, SMObjectType.project, null);
                 synchronized (projectRegistries) {
                     projectRegistries.remove(projectId);
                 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/DBWServiceCore.java
@@ -208,21 +208,4 @@ WebConnectionInfo setConnectionNavigatorSettings(
     @WebAction(authRequired = false)
     boolean cancelAsyncTask(WebSession webSession, String taskId) throws DBWebException;
 
-    @NotNull
-    WebConnectionInfo addConnectionSettings(
-        @NotNull WebSession webSession,
-        @NotNull @WebObjectId String projectId,
-        @NotNull String connectionId,
-        @NotNull Map<String, Object> settings
-    ) throws DBWebException;
-
-
-    @NotNull
-    WebConnectionInfo removeConnectionSettings(
-        @NotNull WebSession webSession,
-        @NotNull @WebObjectId String projectId,
-        @NotNull String connectionId,
-        @Nullable List<String> settingIds
-    ) throws DBWebException;
-
 }
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/WebServiceBindingCore.java
@@ -171,22 +171,6 @@ public void bindWiring(DBWBindingContext model) throws DBWebException {
                 getProjectReference(env),
                 env.getArgument("folderPath")
             ))
-            .dataFetcher(
-                "addConnectionSettings", env -> getService(env).addConnectionSettings(
-                    getWebSession(env),
-                    getProjectReference(env),
-                    env.getArgument("id"),
-                    env.getArgument("settings")
-                )
-            )
-            .dataFetcher(
-                "removeConnectionSettings", env -> getService(env).removeConnectionSettings(
-                    getWebSession(env),
-                    getProjectReference(env),
-                    env.getArgument("id"),
-                    env.getArgument("settingIds")
-                )
-            )
         ;
 
         model.getRuntimeWiring().type(TypeRuntimeWiring.newTypeWiring("AsyncTaskResult").typeResolver(TypeResolutionEnvironment::getObject)
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -48,7 +48,6 @@
 import org.jkiss.dbeaver.model.net.ssh.SSHSession;
 import org.jkiss.dbeaver.model.rm.RMProjectType;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
-import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.websocket.WSConstants;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
@@ -644,48 +643,6 @@ public boolean cancelAsyncTask(WebSession webSession, String taskId) throws DBWe
         return webSession.asyncTaskCancel(taskId);
     }
 
-    @NotNull
-    @Override
-    public WebConnectionInfo addConnectionSettings(
-        @NotNull WebSession webSession,
-        @NotNull String projectId,
-        @NotNull String connectionId,
-        @NotNull Map<String, Object> settings
-    ) throws DBWebException {
-        WebConnectionInfo connectionInfo = WebDataSourceUtils.getWebConnectionInfo(webSession, projectId, connectionId);
-        try {
-            webSession.getSecurityController().addObjectSettings(
-                connectionId,
-                SMObjectType.datasource,
-                settings
-            );
-        } catch (DBException e) {
-            throw new DBWebException("Error adding settings to connection %s".formatted(connectionId), e);
-        }
-        return connectionInfo;
-    }
-
-    @NotNull
-    @Override
-    public WebConnectionInfo removeConnectionSettings(
-        @NotNull WebSession webSession,
-        @NotNull String projectId,
-        @NotNull String connectionId,
-        @Nullable List<String> settingIds
-    ) throws DBWebException {
-        WebConnectionInfo connectionInfo = WebDataSourceUtils.getWebConnectionInfo(webSession, projectId, connectionId);
-        try {
-            webSession.getSecurityController().deleteObjectSettings(
-                connectionId,
-                SMObjectType.datasource,
-                settingIds == null ? null : new HashSet<>(settingIds)
-            );
-        } catch (DBException e) {
-            throw new DBWebException("Error adding settings to connection %s".formatted(connectionId), e);
-        }
-        return connectionInfo;
-    }
-
     @Override
     public WebGroupPropertiesInfo<ProductSettingDescriptor> getProductSettings(@NotNull WebSession webSession) {
         return new WebGroupPropertiesInfo<>(webSession, ProductSettingsRegistry.getInstance().getSettings());
diff --git a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/DBWServiceRM.java b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/DBWServiceRM.java
@@ -204,6 +204,6 @@ boolean addProjectSettings(
     boolean deleteProjectSettings(
         @NotNull WebSession webSession,
         @NotNull @WebObjectId String projectId,
-        @NotNull List<String> settings
+        @Nullable List<String> settings
     ) throws DBWebException;
 }
diff --git a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/impl/WebServiceRM.java b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/impl/WebServiceRM.java
@@ -491,7 +491,7 @@ public boolean addProjectSettings(
     public boolean deleteProjectSettings(
         @NotNull WebSession webSession,
         @NotNull String projectId,
-        @NotNull List<String> settings
+        @Nullable List<String> settings
     ) throws DBWebException {
         try {
             var project = webSession.getProjectById(projectId);
@@ -501,7 +501,7 @@ public boolean deleteProjectSettings(
             webSession.getSecurityController().deleteObjectSettings(
                 projectId,
                 SMObjectType.project,
-                new HashSet<>(settings)
+                settings == null ? null : new HashSet<>(settings)
             );
             return true;
         } catch (DBException e) {
diff --git a/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
@@ -112,22 +112,26 @@ public void addObjectSettings(
     ) throws DBException {
         String userId = getUserIdOrThrow();
         try (Connection dbCon = database.openConnection()) {
-            try (
-                PreparedStatement dbStat = dbCon.prepareStatement(
-                    "INSERT INTO {table_prefix}CB_OBJECT_SETTINGS" +
-                        "(OBJECT_ID,OBJECT_TYPE,SUBJECT_ID,SETTING_ID,SETTING_VALUE,UPDATED_BY,UPDATE_TIME) " +
-                        "VALUES(?,?,?,?,?,?,CURRENT_TIMESTAMP)")
-            ) {
-                for (Map.Entry<String, Object> entry : settings.entrySet()) {
-                    dbStat.setString(1, objectId);
-                    dbStat.setString(2, objectType.name());
-                    dbStat.setString(3, userId);
-                    dbStat.setString(4, entry.getKey());
-                    dbStat.setString(5, CommonUtils.toString(entry.getValue()));
-                    dbStat.setString(6, userId);
-                    dbStat.addBatch();
-                }
-                dbStat.executeBatch();
+            try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
+                deleteObjectSettings(objectId, objectType, settings.keySet());
+                try (
+                    PreparedStatement dbStat = dbCon.prepareStatement(
+                        "INSERT INTO {table_prefix}CB_OBJECT_SETTINGS" +
+                            "(OBJECT_ID,OBJECT_TYPE,SUBJECT_ID,SETTING_ID,SETTING_VALUE,UPDATED_BY,UPDATE_TIME) " +
+                            "VALUES(?,?,?,?,?,?,CURRENT_TIMESTAMP)")
+                ) {
+                    for (Map.Entry<String, Object> entry : settings.entrySet()) {
+                        dbStat.setString(1, objectId);
+                        dbStat.setString(2, objectType.name());
+                        dbStat.setString(3, userId);
+                        dbStat.setString(4, entry.getKey());
+                        dbStat.setString(5, CommonUtils.toString(entry.getValue()));
+                        dbStat.setString(6, userId);
+                        dbStat.addBatch();
+                    }
+                    dbStat.executeBatch();
+                }
+                txn.commit();
             }
         } catch (SQLException e) {
             throw new DBCException("Error while adding object settings", e);

Original file line number	Diff line number	Diff line change
`@@ -308,6 +308,7 @@ public void deleteProject(@NotNull String projectId) throws DBException {`
`308`	`308`	`log.debug("Deleting project '" + projectId + "'");`
`309`	`309`	`IOUtils.deleteDirectory(targetPath);`
`310`	`310`	`getSecurityController().deleteAllObjectPermissions(projectId, SMObjectType.project);`
	`311`	`+ getSecurityController().deleteObjectSettings(projectId, SMObjectType.project, null);`
`311`	`312`	`synchronized (projectRegistries) {`
`312`	`313`	`projectRegistries.remove(projectId);`
`313`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,6 @@ boolean addProjectSettings(`
`204`	`204`	`boolean deleteProjectSettings(`
`205`	`205`	`@NotNull WebSession webSession,`
`206`	`206`	`@NotNull @WebObjectId String projectId,`
`207`		`- @NotNull List<String> settings`
	`207`	`+ @Nullable List<String> settings`
`208`	`208`	`) throws DBWebException;`
`209`	`209`	`}`