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-1970 add session permissions to rest api (#834)

Browse Source 
* CB-1970 add session permissions to rest api

* CB-1970 put session id into auth permissions

* CB-1970 put session id into SMAuthPermissions
This commit is contained in:
Ainur
2022-05-18 17:21:40 +03:00
committed by GitHub
parent 930a1a26fc
commit 1fd10e29a4
1 changed files with 6 additions and 4 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
+6 -4
View File
@@ -824,7 +824,7 @@ public class CBEmbeddedSecurityController implements SMAdminController {
var token = generateAuthToken(appSessionId, null, dbCon);
var permissions = getAnonymousUserPermissions();
txn.commit();
return new SMAuthInfo(token, new SMAuthPermissions(null, permissions));
return new SMAuthInfo(token, new SMAuthPermissions(null, appSessionId, permissions));
}
} catch (SQLException e) {
throw new DBException(e.getMessage(), e);
@@ -851,7 +851,7 @@ public class CBEmbeddedSecurityController implements SMAdminController {
var token = generateAuthToken(appSessionId, userId, dbCon);
var permissions = getUserPermissions(userId);
txn.commit();
return new SMAuthInfo(token, new SMAuthPermissions(userId, permissions));
return new SMAuthInfo(token, new SMAuthPermissions(userId, appSessionId, permissions));
}
} catch (SQLException e) {
throw new DBException(e.getMessage(), e);
@@ -923,8 +923,9 @@ public class CBEmbeddedSecurityController implements SMAdminController {
@Override
public SMAuthPermissions getTokenPermissions(String token) throws DBException {
String userId;
String sessionId;
try (Connection dbCon = database.openConnection();
PreparedStatement dbStat = dbCon.prepareStatement("SELECT USER_ID, EXPIRATION_TIME FROM CB_AUTH_TOKEN WHERE TOKEN_ID=?");
PreparedStatement dbStat = dbCon.prepareStatement("SELECT USER_ID, EXPIRATION_TIME, SESSION_ID FROM CB_AUTH_TOKEN WHERE TOKEN_ID=?");
) {
dbStat.setString(1, token);
try (var dbResult = dbStat.executeQuery()) {
@@ -936,12 +937,13 @@ public class CBEmbeddedSecurityController implements SMAdminController {
if (Timestamp.from(Instant.now()).after(expiredDate)) {
throw new SMException("Token expired");
}
sessionId = dbResult.getString(3);
}
} catch (SQLException e) {
throw new DBCException("Error reading token info in database", e);
}
var permissions = userId == null ? getAnonymousUserPermissions() : getUserPermissions(userId);
return new SMAuthPermissions(userId, permissions);
return new SMAuthPermissions(userId, sessionId, permissions);
}
@Override