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

Merge remote-tracking branch 'origin/devel' into devel

Browse Source
This commit is contained in:
Serge Rider
2020-05-29 11:23:48 +03:00
parent 6ee659efba 83c38103a5
commit 256e8570ea
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java
+11 -1
View File
@@ -76,6 +76,7 @@ class CBSecurityController implements DBWSecurityController {
@Override
public void deleteUser(String userId) throws DBCException {
try (Connection dbCon = database.openConnection()) {
deleteAuthSubject(dbCon, userId);
JDBCUtils.executeStatement(dbCon, "DELETE FROM CB_USER WHERE USER_ID=?", userId);
} catch (SQLException e) {
throw new DBCException("Error deleting user from database", e);
@@ -106,7 +107,9 @@ class CBSecurityController implements DBWSecurityController {
@Override
public WebRole[] getUserRoles(String userId) throws DBCException {
try (Connection dbCon = database.openConnection()) {
try (PreparedStatement dbStat = dbCon.prepareStatement("SELECT * FROM CB_USER_ROLE WHERE USER_ID=?")) {
try (PreparedStatement dbStat = dbCon.prepareStatement(
"SELECT R.* FROM CB_USER_ROLE UR,CB_ROLE R " +
"WHERE UR.USER_ID=? AND UR.ROLE_ID=R.ROLE_ID")) {
dbStat.setString(1, userId);
List<WebRole> roles = new ArrayList<>();
try (ResultSet dbResult = dbStat.executeQuery()) {
@@ -357,6 +360,7 @@ class CBSecurityController implements DBWSecurityController {
@Override
public void deleteRole(String roleId) throws DBCException {
try (Connection dbCon = database.openConnection()) {
deleteAuthSubject(dbCon, roleId);
JDBCUtils.executeStatement(dbCon, "DELETE FROM CB_ROLE WHERE ROLE_ID=?", roleId);
} catch (SQLException e) {
throw new DBCException("Error deleting role from database", e);
@@ -558,5 +562,11 @@ class CBSecurityController implements DBWSecurityController {
}
}
private void deleteAuthSubject(Connection dbCon, String subjectId) throws SQLException {
try (PreparedStatement dbStat = dbCon.prepareStatement("DELETE FROM CB_AUTH_SUBJECT WHERE SUBJECT_ID=?")) {
dbStat.setString(1, subjectId);
dbStat.execute();
}
}
}
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java
+2 -2
View File
@@ -50,9 +50,9 @@ public class WebServiceBindingAdmin extends WebServiceBindingBase<DBWServiceAdmi
env -> getService(env).deleteRole(getWebSession(env), env.getArgument("roleId")));
model.getQueryType().dataFetcher("grantUserRole",
env -> getService(env).grantUserRole(getWebSession(env), env.getArgument("userId"), env.getArgument("userId")));
env -> getService(env).grantUserRole(getWebSession(env), env.getArgument("userId"), env.getArgument("roleId")));
model.getQueryType().dataFetcher("revokeUserRole",
env -> getService(env).revokeUserRole(getWebSession(env), env.getArgument("userId"), env.getArgument("userId")));
env -> getService(env).revokeUserRole(getWebSession(env), env.getArgument("userId"), env.getArgument("roleId")));
model.getQueryType().dataFetcher("setRolePermissions",
env -> getService(env).setRolePermissions(getWebSession(env), env.getArgument("roleId"), env.getArgument("permissions")));
model.getQueryType().dataFetcher("setUserCredentials",
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+8
View File
@@ -31,6 +31,7 @@ import io.cloudbeaver.service.admin.AdminUserInfo;
import io.cloudbeaver.service.admin.DBWServiceAdmin;
import org.jkiss.code.NotNull;
import org.jkiss.utils.ArrayUtils;
import org.jkiss.utils.CommonUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -104,6 +105,9 @@ public class WebServiceAdmin implements DBWServiceAdmin {
@Override
public boolean deleteUser(@NotNull WebSession webSession, String userName) throws DBWebException {
if (CommonUtils.equalObjects(userName, webSession.getUser().getUserId())) {
throw new DBWebException("You cannot delete yourself");
}
try {
CBPlatform.getInstance().getApplication().getSecurityController().deleteUser(userName);
return true;
@@ -130,6 +134,10 @@ public class WebServiceAdmin implements DBWServiceAdmin {
@Override
public boolean deleteRole(@NotNull WebSession webSession, String roleId) throws DBWebException {
try {
WebRole[] userRoles = CBPlatform.getInstance().getApplication().getSecurityController().getUserRoles(webSession.getUser().getUserId());
if (Arrays.stream(userRoles).anyMatch(webRole -> webRole.getRoleId().equals(roleId))) {
throw new DBWebException("You can not delete your own role");
}
CBPlatform.getInstance().getApplication().getSecurityController().deleteRole(roleId);
return true;
} catch (Exception e) {