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-1580 Federated auth redesign

Browse Source
This commit is contained in:
Serge Rider
2022-02-04 10:20:26 +03:00
parent 0f4a275943
commit 84dab8a79c
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
+21 -10
View File
@@ -737,24 +737,35 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
}
public void addAuthInfo(@NotNull WebAuthInfo authInfo) throws DBException {
WebUser newUser = authInfo.getUser();
addAuthTokens(authInfo);
}
public void addAuthTokens(@NotNull WebAuthInfo ... tokens) throws DBException {
WebUser newUser = null;
for (WebAuthInfo authInfo : tokens) {
if (newUser != null && newUser != authInfo.getUser()) {
throw new DBException("Different users specified in auth tokens: " + Arrays.toString(tokens));
}
newUser = authInfo.getUser();
}
if (this.user == null && newUser != null) {
forceUserRefresh(newUser);
} else if (!CommonUtils.equalObjects(this.user, newUser)) {
throw new DBException("Can't authorize different users in the single session");
}
WebAuthInfo oldAuthInfo = getAuthInfo(authInfo.getAuthProviderDescriptor().getId());
if (oldAuthInfo != null) {
removeAuthInfo(oldAuthInfo);
for (WebAuthInfo authInfo : tokens) {
WebAuthInfo oldAuthInfo = getAuthInfo(authInfo.getAuthProviderDescriptor().getId());
if (oldAuthInfo != null) {
removeAuthInfo(oldAuthInfo);
}
DBASession authSession = authInfo.getAuthSession();
if (authSession != null) {
getSessionContext().addSession(authSession);
}
}
DBASession authSession = authInfo.getAuthSession();
if (authSession != null) {
getSessionContext().addSession(authSession);
}
synchronized (authTokens) {
authTokens.add(authInfo);
Collections.addAll(authTokens, tokens);
}
}