opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-28 03:41:48 +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
2022-04-08 10:55:08 +03:00
parent 1e59721f68 1233405ecc
commit 0f077142cf
4 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+4 -8
View File
@@ -155,10 +155,8 @@ public class WebServiceAdmin implements DBWServiceAdmin {
throw new DBWebException("Empty role ID");
}
try {
WebRole newRole = new WebRole(roleId);
newRole.setName(roleName);
newRole.setDescription(description);
CBPlatform.getInstance().getApplication().getAdminSecurityController().createRole(newRole, webSession.getUser().getUserId());
CBPlatform.getInstance().getApplication().getAdminSecurityController().createRole(roleId, roleName, description, webSession.getUser().getUserId());
WebRole newRole = CBPlatform.getInstance().getApplication().getAdminSecurityController().findRole(roleId);
return new AdminRoleInfo(newRole);
} catch (Exception e) {
throw new DBWebException("Error creating new role", e);
@@ -172,10 +170,8 @@ public class WebServiceAdmin implements DBWServiceAdmin {
throw new DBWebException("Empty role ID");
}
try {
WebRole newRole = new WebRole(roleId);
newRole.setName(roleName);
newRole.setDescription(description);
CBPlatform.getInstance().getApplication().getAdminSecurityController().updateRole(newRole);
CBPlatform.getInstance().getApplication().getAdminSecurityController().updateRole(roleId, roleName, description);
WebRole newRole = CBPlatform.getInstance().getApplication().getAdminSecurityController().findRole(roleId);
return new AdminRoleInfo(newRole);
} catch (Exception e) {
throw new DBWebException("Error updating role " + roleId, e);
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/CBSecurityController.java
+15 -15
View File
@@ -571,23 +571,23 @@ public class CBSecurityController implements SMAdminController<WebUser, WebRole>
}
@Override
public void createRole(WebRole role, String grantor) throws DBCException {
if (isSubjectExists(role.getRoleId())) {
throw new DBCException("User or role '" + role.getRoleId() + "' already exists");
public void createRole(String roleId, String name, String description, String grantor) throws DBCException {
if (isSubjectExists(roleId)) {
throw new DBCException("User or role '" + roleId + "' already exists");
}
try (Connection dbCon = database.openConnection()) {
try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
createAuthSubject(dbCon, role.getRoleId(), SUBJECT_ROLE);
createAuthSubject(dbCon, roleId, SUBJECT_ROLE);
try (PreparedStatement dbStat = dbCon.prepareStatement(
"INSERT INTO CB_ROLE(ROLE_ID,ROLE_NAME,ROLE_DESCRIPTION,CREATE_TIME) VALUES(?,?,?,?)")) {
dbStat.setString(1, role.getRoleId());
dbStat.setString(2, CommonUtils.notEmpty(role.getName()));
dbStat.setString(3, CommonUtils.notEmpty(role.getDescription()));
dbStat.setString(1, roleId);
dbStat.setString(2, CommonUtils.notEmpty(name));
dbStat.setString(3, CommonUtils.notEmpty(description));
dbStat.setTimestamp(4, new Timestamp(System.currentTimeMillis()));
dbStat.execute();
}
insertPermissions(dbCon, role.getRoleId(),
insertPermissions(dbCon, roleId,
new String[] {DBWConstants.PERMISSION_PUBLIC} , grantor);
txn.commit();
@@ -598,19 +598,19 @@ public class CBSecurityController implements SMAdminController<WebUser, WebRole>
}
@Override
public void updateRole(WebRole role) throws DBCException {
if (!isSubjectExists(role.getRoleId())) {
throw new DBCException("Role '" + role.getRoleId() + "' doesn't exists");
public void updateRole(String roleId, String name, String description) throws DBCException {
if (!isSubjectExists(roleId)) {
throw new DBCException("Role '" + roleId + "' doesn't exists");
}
try (Connection dbCon = database.openConnection()) {
try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
try (PreparedStatement dbStat = dbCon.prepareStatement(
"UPDATE CB_ROLE SET ROLE_NAME=?,ROLE_DESCRIPTION=? WHERE ROLE_ID=?")) {
dbStat.setString(1, CommonUtils.notEmpty(role.getName()));
dbStat.setString(2, CommonUtils.notEmpty(role.getDescription()));
dbStat.setString(3, role.getRoleId());
dbStat.setString(1, CommonUtils.notEmpty(name));
dbStat.setString(2, CommonUtils.notEmpty(description));
dbStat.setString(3, roleId);
if (dbStat.executeUpdate() <= 0) {
throw new DBCException("Role '" + role.getRoleId() + "' doesn't exist");
throw new DBCException("Role '" + roleId + "' doesn't exist");
}
}
txn.commit();
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/internal/db/CBDatabase.java
+1 -1
View File
@@ -348,7 +348,7 @@ public class CBDatabase {
if (!CommonUtils.isEmpty(initialData.getRoles())) {
// Create roles
for (WebRole role : initialData.getRoles()) {
adminSecurityController.createRole(role, adminName);
adminSecurityController.createRole(role.getRoleId(), role.getName(), role.getDescription(), adminName);
if (adminName != null) {
adminSecurityController.setSubjectPermissions(role.getRoleId(), new ArrayList<>(role.getPermissions()), adminName);
}