Skip to content

dbeaver/pro#5124 fix case-insensitive username in import #4251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serge-rider merged 2 commits into from
Apr 7, 2026
+15 −5
Merged

dbeaver/pro#5124 fix case-insensitive username in import #4251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98b6c8b
dbeaver/pro#5124 fix case-insensitive username in import
HocKu7 Mar 31, 2026
928ccf3
Merge branch 'devel' into dbeaver/pro#5124-fix-case-insensetive-usern…
EvgeniaBzzz Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* DBeaver - Universal Database Manager
* Copyright (C) 2010-2025 DBeaver Corp and others
* Copyright (C) 2010-2026 DBeaver Corp and others
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -404,15 +404,25 @@
}

protected void importUsers(@NotNull Connection connection, @NotNull SMUserImportList userImportList)
throws DBException, SQLException {

Check warning on line 407 in server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java

View workflow job for this annotation

GitHub Actions / Server / Lint 

[checkstyle] reported by reviewdog 🐶
'throws' has incorrect indentation level 8, expected level should be 12.

Raw Output:
/github/workspace/./server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java:407:9: warning: 'throws' has incorrect indentation level 8, expected level should be 12. (com.puppycrawl.tools.checkstyle.checks.indentation.IndentationCheck)
List<SMUserProvisioning> users = userImportList.getUsers();
Set<String> seen = new HashSet<>();
outer:
for (SMUserProvisioning user : userImportList.getUsers()) {
String authRole = user.getAuthRole() == null ? userImportList.getAuthRole() : user.getAuthRole();
String userId = user.getUserId();
for (SMUserProvisioning user : users) {
Map<String, String> metaParameters = user.getMetaParameters();
String effectiveUserId = user.getUserId();
if (CommonUtils.isNotEmpty(metaParameters.get(SMStandardMeta.META_USER_ID))) {
userId = metaParameters.get(SMStandardMeta.META_USER_ID);
effectiveUserId = metaParameters.get(SMStandardMeta.META_USER_ID);
}
String effectiveUserIdLowerCase = effectiveUserId.toLowerCase();
if (seen.contains(effectiveUserIdLowerCase)) {
log.warn("Skipping duplicate user (case-insensitive): " + effectiveUserId);
continue;
}
seen.add(effectiveUserIdLowerCase);

String authRole = user.getAuthRole() == null ? userImportList.getAuthRole() : user.getAuthRole();
String userId = effectiveUserId;
for (String possibleUserId : List.of(userId, userId.toLowerCase())) {
if (isSubjectExists(possibleUserId)) {
if (getSubjectType(possibleUserId) == SMSubjectType.team) {
Expand Down
Loading