Skip to content

CB-2181 fix read subject object perms #1021

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
alexander-skoblikov merged 1 commit into from
Aug 4, 2022
Merged

CB-2181 fix read subject object perms #1021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 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
Expand Up @@ -1601,7 +1601,7 @@ public List<SMObjectPermissionsGrant> getObjectPermissionGrants(
@Override
public List<SMObjectPermissionsGrant> getSubjectObjectPermissionGrants(@NotNull String subjectId, @NotNull SMObjectType smObjectType) throws DBException {
var allLinkedSubjects = getAllLinkedSubjects(subjectId);
var grantedPermissionsBySubjectId = new HashMap<String, SMObjectPermissionsGrant.Builder>();
var grantedPermissionsByObjectId = new HashMap<String, SMObjectPermissionsGrant.Builder>();
try (Connection dbCon = database.openConnection()) {
var sqlBuilder = new StringBuilder("SELECT OP.OBJECT_ID,S.SUBJECT_TYPE,OP.PERMISSION\n")
.append("FROM CB_OBJECT_PERMISSIONS OP,CB_AUTH_SUBJECT S\n")
Expand All @@ -1610,19 +1610,18 @@ public List<SMObjectPermissionsGrant> getSubjectObjectPermissionGrants(@NotNull
sqlBuilder.append(") AND OP.OBJECT_TYPE=?");
try (PreparedStatement dbStat = dbCon.prepareStatement(sqlBuilder.toString())) {
dbStat.setString(1, smObjectType.getObjectType());
List<SMDataSourceGrant> result = new ArrayList<>();
try (ResultSet dbResult = dbStat.executeQuery()) {
while (dbResult.next()) {
String objectId = dbResult.getString(1);
SMSubjectType subjectType = SMSubjectType.fromCode(dbResult.getString(2));
String permission = dbResult.getString(3);
grantedPermissionsBySubjectId.computeIfAbsent(
subjectId,
grantedPermissionsByObjectId.computeIfAbsent(
objectId,
key -> SMObjectPermissionsGrant.builder(subjectId, subjectType, objectId)
).addPermission(permission);
}
}
return grantedPermissionsBySubjectId.values().stream()
return grantedPermissionsByObjectId.values().stream()
.map(SMObjectPermissionsGrant.Builder::build)
.collect(Collectors.toList());
}
Expand Down