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-1909 avoid ability to specify similar creds for several users (#805)

Browse Source
This commit is contained in:
Alexander Skoblikov
2022-04-29 17:03:39 +03:00
committed by GitHub
parent cea17b631d
commit 5f4f70b6e2
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/CBEmbeddedSecurityController.java
+7 -7
View File
@@ -359,6 +359,10 @@ public class CBEmbeddedSecurityController implements SMAdminController {
@Override
public void setUserCredentials(String userId, String authProviderId, Map<String, Object> credentials) throws DBException {
var existUserByCredentials = findUserByCredentials(authProviderId, credentials);
if (existUserByCredentials != null && !existUserByCredentials.equals(userId)) {
throw new DBException("Another user is already linked to the specified credentials");
}
List<String[]> transformedCredentials;
AuthProviderDescriptor authProvider = getAuthProvider(authProviderId);
try {
@@ -846,22 +850,18 @@ public class CBEmbeddedSecurityController implements SMAdminController {
AuthProviderDescriptor authProvider = getAuthProvider(authProviderId);
SMAuthProvider<?> smAuthProviderInstance = authProvider.getInstance();
String userId = findUserByCredentials(authProviderId, userCredentials);
String expectedUserId;
String userIdFromCredentials;
try {
expectedUserId = smAuthProviderInstance.validateLocalAuth(progressMonitor, this, Map.of(), userCredentials, null);
userIdFromCredentials = smAuthProviderInstance.validateLocalAuth(progressMonitor, this, Map.of(), userCredentials, null);
} catch (DBException e) {
return null;
}
if (userId != null && !expectedUserId.equals(userId)) {
return null;
}
if (userId == null) {
if (!(authProvider.getInstance() instanceof SMAuthProviderExternal<?>)) {
return null;
}
userId = expectedUserId;
userId = userIdFromCredentials;
if (!isSubjectExists(userId)) {
var newUser = new SMUser(userId);
createUser(newUser.getUserId(), newUser.getMetaParameters());