CB-4161 validate custom config status

dbeaver · Oct 24, 2023 · 6cdc8ee · 6cdc8ee
1 parent eb8614b
commit 6cdc8ee
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java b/...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
@@ -1279,7 +1279,7 @@ public SMAuthInfo authenticate(
         @Nullable String authProviderConfigurationId,
         @NotNull Map<String, Object> userCredentials
     ) throws DBException {
-        if (isProviderDisabled(authProviderId)) {
+        if (isProviderDisabled(authProviderId, authProviderConfigurationId)) {
             throw new SMException("Unsupported authentication provider: " + authProviderId);
         }
         var authProgressMonitor = new LoggingProgressMonitor(log);
@@ -2732,9 +2732,17 @@ private String getUserIdOrNull() {
         return activeUserCredentials.getUserId();
     }
 
-    private boolean isProviderDisabled(@NotNull String providerId) {
+    private boolean isProviderDisabled(@NotNull String providerId, @Nullable String authConfigurationId) {
         WebAuthConfiguration appConfiguration = application.getAuthConfiguration();
-        return !appConfiguration.isAuthProviderEnabled(providerId);
+        if (!appConfiguration.isAuthProviderEnabled(providerId)) {
+            return true;
+        }
+        if (authConfigurationId != null) {
+            SMAuthProviderCustomConfiguration configuration =
+                appConfiguration.getAuthProviderConfiguration(authConfigurationId);
+            return configuration == null || configuration.isDisabled();
+        }
+        return false;
     }
 
     public void clearOldAuthAttemptInfo() throws DBException {