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

CB-864 Support all auth providers in config mode

Browse Source
This commit is contained in:
Serge Rider
2021-03-27 12:49:07 +03:00
parent e51e24cc48
commit 3a553deaa5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
+6 -2
View File
@@ -54,7 +54,12 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
if (CommonUtils.isEmpty(providerId)) {
throw new DBWebException("Missing auth provider parameter");
}
if (!CBApplication.getInstance().isConfigurationMode()) {
boolean configMode = CBApplication.getInstance().isConfigurationMode();
if (configMode || webSession.hasPermission(DBWConstants.PERMISSION_ADMIN)) {
// Admin can authorize in any providers
} else {
// Check enabled auth providers
String[] enabledAuthProviders = CBApplication.getInstance().getAppConfiguration().getEnabledAuthProviders();
if (enabledAuthProviders != null && !ArrayUtils.contains(enabledAuthProviders, providerId)) {
throw new DBWebException("Authentication provider '" + providerId + "' is disabled");
@@ -64,7 +69,6 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
if (authProvider == null) {
throw new DBWebException("Invalid auth provider '" + providerId + "'");
}
boolean configMode = CBApplication.getInstance().isConfigurationMode();
try {
Map<String, Object> providerConfig = Collections.emptyMap();