Skip to content
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

CB-6168 map user role by team #3214

Merged
merged 4 commits into from
Jan 29, 2025
Merged

CB-6168 map user role by team #3214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97428cd
CB-6168 map user role by team
alexander-skoblikov Jan 27, 2025
cddc189
CB-6168 review fix
alexander-skoblikov Jan 27, 2025
f767f09
Merge branch 'devel' into CB-6168-custom-role-attribute-mapping-for-o…
kseniaguzeeva Jan 28, 2025
33603e0
Merge branch 'devel' into CB-6168-custom-role-attribute-mapping-for-o…
kseniaguzeeva Jan 29, 2025
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
4 changes: 3 additions & 1 deletion server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.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-2024 DBeaver Corp and others
* Copyright (C) 2010-2025 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 All @@ -17,6 +17,7 @@
package io.cloudbeaver.auth;

import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
Expand All @@ -36,6 +37,7 @@
@NotNull Map<String, Object> authParameters
) throws DBException;

@Nullable

Check warning on line 40 in server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.java

View workflow job for this annotation

GitHub Actions / Server / Lint 

[checkstyle] reported by reviewdog 🐶
Missing a Javadoc comment.

Raw Output:
/github/workspace/./server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.java:40:5: warning: Missing a Javadoc comment. (com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck)

Check warning on line 40 in server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.java

View check run for this annotation

Jenkins-CI-integration / CheckStyle Java Report

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.java#L40 

Missing a Javadoc comment.
String getExternalTeamIdMetadataFieldName();

}
14 changes: 13 additions & 1 deletion server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAutoAssign.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-2024 DBeaver Corp and others
* Copyright (C) 2010-2025 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 All @@ -17,11 +17,14 @@

package io.cloudbeaver.auth;

import org.jkiss.code.Nullable;

import java.util.ArrayList;
import java.util.List;

public class SMAutoAssign {
private String authRole;
private String authRoleAssignReason;
private List<String> externalTeamIds = new ArrayList<>();

public SMAutoAssign() {
Expand All @@ -44,7 +47,16 @@
return externalTeamIds;
}

public void addExternalTeamId(String externalRoleId) {

Check warning on line 50 in server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAutoAssign.java

View workflow job for this annotation

GitHub Actions / Server / Lint 

[checkstyle] reported by reviewdog 🐶
Missing a Javadoc comment.

Raw Output:
/github/workspace/./server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAutoAssign.java:50:5: warning: Missing a Javadoc comment. (com.puppycrawl.tools.checkstyle.checks.javadoc.MissingJavadocMethodCheck)
this.externalTeamIds.add(externalRoleId);
}

@Nullable
public String getAuthRoleAssignReason() {
return authRoleAssignReason;
}

public void setAuthRoleAssignReason(@Nullable String authRoleChangedReason) {
this.authRoleAssignReason = authRoleChangedReason;
}
}
5 changes: 3 additions & 2 deletions ...s/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.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-2024 DBeaver Corp and others
* Copyright (C) 2010-2025 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 All @@ -24,7 +24,8 @@
/**
* Abstract external auth provider
*/
public abstract class AbstractExternalAuthProvider<SESSION extends SMSession> implements SMAuthProviderExternal<SESSION> {
public abstract class AbstractExternalAuthProvider<SESSION extends SMSession>
implements SMAuthProviderExternal<SESSION> {

public static final String META_AUTH_PROVIDER = "$provider";
public static final String META_AUTH_SPACE_ID = "$space";
Expand Down
5 changes: 4 additions & 1 deletion ...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-2024 DBeaver Corp and others
* Copyright (C) 2010-2025 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 @@ -2232,6 +2232,9 @@
if (activeUserId == null) {
activeUserId = userIdFromCreds;
}
if (autoAssign != null && CommonUtils.isNotEmpty(autoAssign.getAuthRoleAssignReason())) {
log.info(activeUserId + " authenticated with role " + autoAssign.getAuthRole() + ", reason: " + autoAssign.getAuthRoleAssignReason());

Check warning on line 2236 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 🐶
Line is longer than 140 characters (found 154).

Raw Output:
/github/workspace/./server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java:2236:0: warning: Line is longer than 140 characters (found 154). (com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck)

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

View check run for this annotation

Jenkins-CI-integration / CheckStyle Java Report

server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java#L2236 

Line is longer than 140 characters (found 154).
}
}
dbStoredUserData.put(
authConfiguration,
Expand Down