Skip to content

Commit

Permalink
CB-4603. Refactor searching by group, include default group for all s…
Browse files Browse the repository at this point in the history 
…ql query with team
  • Loading branch information
DenisSinelnikov committed Mar 1, 2024
1 parent 62510fe commit 552968d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 61 deletions.
11 changes: 0 additions & 11 deletions server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,6 @@ public boolean implies(ProtectionDomain domain, Permission permission) {
});
System.setSecurityManager(new SecurityManager());
}
try {
addAllUsersToDefaultTeam();
} catch (DBException e) {
log.error("Failed insert default teams");
}

eventController.scheduleCheckJob();

Expand All @@ -386,12 +381,6 @@ public boolean implies(ProtectionDomain domain, Permission permission) {
return;
}

private void addAllUsersToDefaultTeam() throws DBException {
if (securityController instanceof CBEmbeddedSecurityController<?> controller) {
controller.addAllUsersToDefaultTeam();
}
}

protected void initializeAdditionalConfiguration() {

}
Expand Down
58 changes: 8 additions & 50 deletions ...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,61 +249,17 @@ public void setUserTeams(@NotNull Connection dbCon, String userId, String[] team
}
}

public void addAllUsersToDefaultTeam() throws DBCException {
if (application.isConfigurationMode()) {
return;
}
if (CommonUtils.isEmpty(application.getAppConfiguration().getDefaultUserTeam())) {
return;
}

try (Connection dbCon = database.openConnection()) {
try (PreparedStatement dbStat = dbCon.prepareStatement(
database.normalizeTableNames("SELECT USER_ID \n" +
"FROM {table_prefix}CB_USER\n" +
"WHERE USER_ID NOT IN (\n" +
" SELECT USER_ID FROM {table_prefix}CB_USER_TEAM CUT WHERE CUT.TEAM_ID = ? \n" +
")")
)) {
dbStat.setString(1, application.getAppConfiguration().getDefaultUserTeam());
ResultSet dbResult = dbStat.executeQuery();
List<String> usersIds = new ArrayList<>();
while (dbResult.next()) {
String userId = dbResult.getString(1);
usersIds.add(userId);
}

if (usersIds.isEmpty()) {
return;
}

for (String usersId : usersIds) {
try (PreparedStatement insertStat = dbCon.prepareStatement(
database.normalizeTableNames("INSERT INTO {table_prefix}CB_USER_TEAM(USER_ID, TEAM_ID, GRANT_TIME, GRANTED_BY)" +
" VALUES(?,?,?,?)"))) {
insertStat.setString(1, usersId);
insertStat.setString(2, application.getAppConfiguration().getDefaultUserTeam());
insertStat.setTimestamp(3, new Timestamp(System.currentTimeMillis()));
insertStat.setString(4, "CloudBeaver Application");
insertStat.executeUpdate();
}
}
}
} catch (SQLException e) {
throw new DBCException("Error while setting default user teams", e);
}
}


@NotNull
@Override
public SMTeam[] getUserTeams(String userId) throws DBException {
Map<String, SMTeam> teams = new LinkedHashMap<>();
try (Connection dbCon = database.openConnection()) {
String defaultUserTeam = application.getAppConfiguration().getDefaultUserTeam();
try (PreparedStatement dbStat = dbCon.prepareStatement(database.normalizeTableNames(
"SELECT R.*,S.IS_SECRET_STORAGE FROM {table_prefix}CB_USER_TEAM UR, {table_prefix}CB_TEAM R, " +
"{table_prefix}CB_AUTH_SUBJECT S " +
"WHERE UR.USER_ID=? AND UR.TEAM_ID=R.TEAM_ID AND S.SUBJECT_ID=R.TEAM_ID"))
"WHERE UR.USER_ID=? AND UR.TEAM_ID IN (R.TEAM_ID," + defaultUserTeam +
") AND S.SUBJECT_ID IN (R.TEAM_ID," + defaultUserTeam + ")"))
) {
dbStat.setString(1, userId);
try (ResultSet dbResult = dbStat.executeQuery()) {
Expand Down Expand Up @@ -955,10 +911,11 @@ public SMTeam[] readAllTeams() throws DBCException {
try (Connection dbCon = database.openConnection()) {
Map<String, SMTeam> teams = new LinkedHashMap<>();
try (Statement dbStat = dbCon.createStatement()) {
String defaultUserTeam = application.getAppConfiguration().getDefaultUserTeam();
try (ResultSet dbResult = dbStat.executeQuery(
database.normalizeTableNames("SELECT T.*,S.IS_SECRET_STORAGE FROM {table_prefix}CB_TEAM T," +
"{table_prefix}CB_AUTH_SUBJECT S " +
"WHERE T.TEAM_ID=S.SUBJECT_ID ORDER BY TEAM_ID"))) {
"WHERE T.TEAM_ID IN (S.SUBJECT_ID," + defaultUserTeam + ") ORDER BY TEAM_ID"))) {
while (dbResult.next()) {
SMTeam team = fetchTeam(dbResult);
teams.put(team.getTeamId(), team);
Expand All @@ -967,7 +924,7 @@ public SMTeam[] readAllTeams() throws DBCException {
try (ResultSet dbResult = dbStat.executeQuery(
database.normalizeTableNames("SELECT SUBJECT_ID,PERMISSION_ID\n" +
"FROM {table_prefix}CB_AUTH_PERMISSIONS AP, {table_prefix}CB_TEAM R\n" +
"WHERE AP.SUBJECT_ID=R.TEAM_ID\n"))) {
"WHERE AP.SUBJECT_ID IN (R.TEAM_ID," + defaultUserTeam + ")\n"))) {
while (dbResult.next()) {
SMTeam team = teams.get(dbResult.getString(1));
if (team != null) {
Expand Down Expand Up @@ -1215,10 +1172,11 @@ public Set<String> getSubjectPermissions(String subjectId) throws DBException {
public Set<String> getUserPermissions(String userId) throws DBException {
try (Connection dbCon = database.openConnection()) {
Set<String> permissions = new HashSet<>();
String defaultUserTeam = application.getAppConfiguration().getDefaultUserTeam();
try (PreparedStatement dbStat = dbCon.prepareStatement(
database.normalizeTableNames(
"SELECT DISTINCT AP.PERMISSION_ID FROM {table_prefix}CB_AUTH_PERMISSIONS AP, {table_prefix}CB_USER_TEAM UR\n" +
"WHERE UR.TEAM_ID=AP.SUBJECT_ID AND UR.USER_ID=?"
"WHERE UR.TEAM_ID IN (AP.SUBJECT_ID," + defaultUserTeam + ") AND UR.USER_ID=?"
)
)) {
dbStat.setString(1, userId);
Expand Down

0 comments on commit 552968d

Please sign in to comment.