From 980e169ee1661c2bfca6c608490d33555ca83bed Mon Sep 17 00:00:00 2001 From: sergeyteleshev Date: Fri, 22 Aug 2025 18:24:18 +0200 Subject: [PATCH] [CB] Ability to change multiserver licenses users/roles from UI (#3598) * dbeaver/pro#6311 removes multi instance limits on frontend side (allows to create/delete/disable users in users and provisioning) * dbeaver/pro#6311 add flag to server config * build fix * reverts all in favor of licenseUsersModificationEnabled * dbeaver/pro#6311 review fixes * adds extended serverConfig * dbeaver/pro#6311 fix disabled users --------- Co-authored-by: Ruslan Co-authored-by: kseniaguzeeva <112612526+kseniaguzeeva@users.noreply.github.com> Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com> --- .../src/io/cloudbeaver/model/WebServerConfig.java | 2 +- .../service/security/CBEmbeddedSecurityController.java | 2 +- .../src/Administration/Users/UsersTable/CreateUserBootstrap.ts | 2 +- .../src/AdministrationUsersManagementService.ts | 2 +- .../src/externalUserProviderStatusContext.ts | 2 +- .../packages/plugin-authentication-administration/src/index.ts | 2 +- .../plugin-authentication-administration/src/manifest.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java index 72aceef401..efad31d740 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebServerConfig.java @@ -41,7 +41,7 @@ import java.util.Map; public class WebServerConfig { private final WebApplication application; - private boolean provideSensitiveInformation = true; + protected boolean provideSensitiveInformation = true; public WebServerConfig(@NotNull WebApplication application) { this.application = application; 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 index ba3775fb4c..7d56fb842d 100644 --- 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 @@ -104,7 +104,7 @@ public class CBEmbeddedSecurityController this.smConfig = smConfig; } - private boolean isSubjectExists(String subjectId) throws DBCException { + protected boolean isSubjectExists(String subjectId) throws DBCException { try (Connection dbCon = database.openConnection()) { try (PreparedStatement dbStat = dbCon.prepareStatement( "SELECT 1 FROM {table_prefix}CB_AUTH_SUBJECT WHERE SUBJECT_ID=?") diff --git a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts index 091ac18c5f..ad2bf770aa 100644 --- a/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts +++ b/webapp/packages/plugin-authentication-administration/src/Administration/Users/UsersTable/CreateUserBootstrap.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-authentication-administration/src/AdministrationUsersManagementService.ts b/webapp/packages/plugin-authentication-administration/src/AdministrationUsersManagementService.ts index e94c6ae4bb..f4a410b4e8 100644 --- a/webapp/packages/plugin-authentication-administration/src/AdministrationUsersManagementService.ts +++ b/webapp/packages/plugin-authentication-administration/src/AdministrationUsersManagementService.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-authentication-administration/src/externalUserProviderStatusContext.ts b/webapp/packages/plugin-authentication-administration/src/externalUserProviderStatusContext.ts index ebb08b6328..692e04c8dd 100644 --- a/webapp/packages/plugin-authentication-administration/src/externalUserProviderStatusContext.ts +++ b/webapp/packages/plugin-authentication-administration/src/externalUserProviderStatusContext.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-authentication-administration/src/index.ts b/webapp/packages/plugin-authentication-administration/src/index.ts index b213f5d5d1..58b36bc8b5 100644 --- a/webapp/packages/plugin-authentication-administration/src/index.ts +++ b/webapp/packages/plugin-authentication-administration/src/index.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License. diff --git a/webapp/packages/plugin-authentication-administration/src/manifest.ts b/webapp/packages/plugin-authentication-administration/src/manifest.ts index 8f43f3e494..13d8024ee4 100644 --- a/webapp/packages/plugin-authentication-administration/src/manifest.ts +++ b/webapp/packages/plugin-authentication-administration/src/manifest.ts @@ -1,6 +1,6 @@ /* * CloudBeaver - Cloud Database Manager - * Copyright (C) 2020-2024 DBeaver Corp and others + * Copyright (C) 2020-2025 DBeaver Corp and others * * Licensed under the Apache License, Version 2.0. * you may not use this file except in compliance with the License.