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

Merge pull request #1053 from dbeaver/fix/CB-2343

Browse Source 
CB-2343 empty config configureServer fix
This commit is contained in:
Ainur
2022-08-17 18:32:12 +03:00
committed by GitHub
parent 138eca7721 8c04bf5d1b
commit 0faafb7aa7
3 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/DBWServiceAdmin.java
+1 -1
View File
@@ -142,7 +142,7 @@ public interface DBWServiceAdmin extends DBWService {
// Server configuration
@WebAction(requirePermissions = DBWConstants.PERMISSION_ADMIN)
boolean configureServer(WebSession webSession, AdminServerConfig config) throws DBWebException;
boolean configureServer(WebSession webSession, Map<String, Object> params) throws DBWebException;
@WebAction(requirePermissions = DBWConstants.PERMISSION_ADMIN)
boolean setDefaultNavigatorSettings(WebSession webSession, DBNBrowseSettings settings) throws DBWebException;
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java
+1 -1
View File
@@ -161,7 +161,7 @@ public class WebServiceBindingAdmin extends WebServiceBindingBase<DBWServiceAdmi
env.getArgument("parameters")))
.dataFetcher("configureServer",
env -> getService(env).configureServer(getWebSession(env), new AdminServerConfig(env.getArgument("configuration"))))
env -> getService(env).configureServer(getWebSession(env), env.getArgument("configuration")))
.dataFetcher("setDefaultNavigatorSettings",
env -> getService(env).setDefaultNavigatorSettings(getWebSession(env), WebServiceUtils.parseNavigatorSettings(env.getArgument("settings"))))
;
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+36 -24
View File
@@ -550,38 +550,50 @@ public class WebServiceAdmin implements DBWServiceAdmin {
@Override
public boolean configureServer(WebSession webSession, AdminServerConfig config) throws DBWebException {
public boolean configureServer(WebSession webSession, Map<String, Object> params) throws DBWebException {
try {
CBAppConfig appConfig = new CBAppConfig(CBApplication.getInstance().getAppConfiguration());
appConfig.setAnonymousAccessEnabled(config.isAnonymousAccessEnabled());
appConfig.setSupportsCustomConnections(config.isCustomConnectionsEnabled());
appConfig.setPublicCredentialsSaveEnabled(config.isPublicCredentialsSaveEnabled());
appConfig.setAdminCredentialsSaveEnabled(config.isAdminCredentialsSaveEnabled());
appConfig.setEnabledFeatures(config.getEnabledFeatures().toArray(new String[0]));
appConfig.setEnabledDrivers(config.getEnabledDrivers());
appConfig.setDisabledDrivers(config.getDisabledDrivers());
appConfig.setResourceManagerEnabled(config.isResourceManagerEnabled());
String adminName = null;
String adminPassword = null;
String serverName = CBApplication.getInstance().getServerName();
String serverURL = CBApplication.getInstance().getServerURL();
long sessionExpireTime = CBApplication.getInstance().getMaxSessionIdleTime();
if (CommonUtils.isEmpty(config.getEnabledAuthProviders())) {
// All of them
appConfig.setEnabledAuthProviders(new String[0]);
} else {
appConfig.setEnabledAuthProviders(config.getEnabledAuthProviders().toArray(new String[0]));
if (!params.isEmpty()) { // FE can send an empty configuration
var config = new AdminServerConfig(params);
appConfig.setAnonymousAccessEnabled(config.isAnonymousAccessEnabled());
appConfig.setSupportsCustomConnections(config.isCustomConnectionsEnabled());
appConfig.setPublicCredentialsSaveEnabled(config.isPublicCredentialsSaveEnabled());
appConfig.setAdminCredentialsSaveEnabled(config.isAdminCredentialsSaveEnabled());
appConfig.setEnabledFeatures(config.getEnabledFeatures().toArray(new String[0]));
appConfig.setEnabledDrivers(config.getEnabledDrivers());
appConfig.setDisabledDrivers(config.getDisabledDrivers());
appConfig.setResourceManagerEnabled(config.isResourceManagerEnabled());
if (CommonUtils.isEmpty(config.getEnabledAuthProviders())) {
// All of them
appConfig.setEnabledAuthProviders(new String[0]);
} else {
appConfig.setEnabledAuthProviders(config.getEnabledAuthProviders().toArray(new String[0]));
}
appConfig.setDefaultNavigatorSettings(
CBApplication.getInstance().getAppConfiguration().getDefaultNavigatorSettings());
adminName = config.getAdminName();
adminPassword = config.getAdminPassword();
serverName = config.getServerName();
serverURL = config.getServerURL();
sessionExpireTime = config.getSessionExpireTime();
}
appConfig.setDefaultNavigatorSettings(
CBApplication.getInstance().getAppConfiguration().getDefaultNavigatorSettings());
List<WebAuthInfo> authInfoList = webSession.getAllAuthInfo();
String adminName = config.getAdminName();
String adminPassword = config.getAdminPassword();
if (CommonUtils.isEmpty(adminName)) {
// Grant admin permissions to the current user
WebUser curUser = webSession.getUser();
adminName = curUser == null ? null : curUser.getUserId();
adminPassword = null;
}
List<WebAuthInfo> authInfoList = webSession.getAllAuthInfo();
if (CommonUtils.isEmpty(adminName)) {
// Try to get admin name from existing authentications (first one)
if (!authInfoList.isEmpty()) {
@@ -604,12 +616,12 @@ public class WebServiceAdmin implements DBWServiceAdmin {
boolean configurationMode = CBApplication.getInstance().isConfigurationMode();
CBApplication.getInstance().finishConfiguration(
config.getServerName(),
config.getServerURL(),
serverName,
serverURL,
adminName,
adminPassword,
authInfoList,
config.getSessionExpireTime(),
sessionExpireTime,
appConfig);
// Refresh active session