From a8949ebc14a2678519b9b550d49943afb918672d Mon Sep 17 00:00:00 2001 From: Wroud Date: Wed, 22 Jun 2022 19:35:58 +0300 Subject: [PATCH 1/2] chore: update version 22.1.1 --- webapp/packages/product-default/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index d4f1861eee..371b31d642 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -1,7 +1,7 @@ { "name": "@cloudbeaver/product-default", "sideEffects": false, - "version": "22.1.0", + "version": "22.1.1", "description": "", "license": "Apache-2.0", "main": "lib/index.js", From 5c9788d5701da9c7b107362cf13cda7db62db02e Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Thu, 23 Jun 2022 10:56:24 +0300 Subject: [PATCH 2/2] =?UTF-8?q?CB-2003=20add=20link=20external=20credentia?= =?UTF-8?q?ls=20with=20active=20user=20parameter=20to=20c=E2=80=A6=20(#903?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * CB-2003 add link external credentials with active user parameter to cb config * CB-2003 add link external credentials with active user parameter to cb config * CB-2003 add property to runtime config --- .../src/io/cloudbeaver/server/CBAppConfig.java | 8 ++++++++ .../src/io/cloudbeaver/server/CBApplication.java | 1 + .../cloudbeaver/service/auth/impl/WebServiceAuthImpl.java | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java index 10f9e129d4..5960919440 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBAppConfig.java @@ -49,6 +49,7 @@ public class CBAppConfig extends BaseWebAppConfiguration { private boolean forwardProxy; private boolean publicCredentialsSaveEnabled; private boolean adminCredentialsSaveEnabled; + private boolean linkExternalCredentialsWithUser; private boolean redirectOnFederatedAuth; @@ -81,6 +82,7 @@ public class CBAppConfig extends BaseWebAppConfiguration { this.resourceQuotas = new LinkedHashMap<>(); this.enableReverseProxyAuth = false; this.forwardProxy = false; + this.linkExternalCredentialsWithUser = true; } public CBAppConfig(CBAppConfig src) { @@ -101,6 +103,7 @@ public class CBAppConfig extends BaseWebAppConfiguration { this.resourceQuotas = new LinkedHashMap<>(src.resourceQuotas); this.enableReverseProxyAuth = src.enableReverseProxyAuth; this.forwardProxy = src.forwardProxy; + this.linkExternalCredentialsWithUser = src.linkExternalCredentialsWithUser; } @@ -306,6 +309,11 @@ public class CBAppConfig extends BaseWebAppConfiguration { } } + public boolean isLinkExternalCredentialsWithUser() { + return linkExternalCredentialsWithUser; + } + + //////////////////////////////////////////// // Reverse proxy auth diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java index d084be891d..e6349c6667 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java @@ -824,6 +824,7 @@ public class CBApplication extends BaseWebApplication { appConfigProperties.put("adminCredentialsSaveEnabled", appConfig.isAdminCredentialsSaveEnabled()); appConfigProperties.put("enableReverseProxyAuth", appConfig.isEnabledReverseProxyAuth()); appConfigProperties.put("forwardProxy", appConfig.isEnabledForwardProxy()); + appConfigProperties.put("linkExternalCredentialsWithUser", appConfig.isLinkExternalCredentialsWithUser()); appConfigProperties.put(CBConstants.PARAM_RESOURCE_MANAGER_ENABLED, appConfig.isResourceManagerEnabled()); Map resourceQuotas = appConfig.getResourceQuotas(); diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java index 66d3cd47ff..713a8e4f43 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java @@ -146,7 +146,9 @@ public class WebServiceAuthImpl implements DBWServiceAuth { userId = curUser.getUserId(); if (authProviderExternal != null) { // We may need to associate new credentials with active user - if (linkWithActiveUser) { + if (linkWithActiveUser && + CBApplication.getInstance().getAppConfiguration().isLinkExternalCredentialsWithUser() + ) { securityController.setUserCredentials(userId, authProvider.getId(), userCredentials); } }