Skip to content

Commit 6d74ade

Browse files
committed
allow domain admins to add ldap users
1 parent 5e5ae0c commit 6d74ade

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

‎engine/schema/src/main/resources/META-INF/db/schema-42210to42300.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,3 +651,21 @@ WHERE `name`='user.vm.readonly.details' AND `value` IS NOT NULL;
651651
-- usage records introduced in 4.22.1 (cumulative and per-VM) can coexist. See #13399.
652652
CALL `cloud_usage`.`IDEMPOTENT_DROP_INDEX`('id', 'cloud_usage.usage_volume');
653653
CALL `cloud_usage`.`IDEMPOTENT_ADD_UNIQUE_INDEX`('cloud_usage.usage_volume', 'id', '(volume_id ASC, created ASC, vm_id ASC)');
654+
655+
-- Grant ldapCreateAccount, linkAccountToLdap and importLdapUsers to any role that can already
656+
-- create accounts natively (built-in Domain Admin, Resource Admin, and any custom role granted
657+
-- createAccount), matching their @APICommand(authorized=...) declarations. See #3687.
658+
INSERT INTO cloud.role_permissions (uuid, role_id, rule, permission, sort_order)
659+
SELECT uuid(), role_id, 'ldapCreateAccount', permission, sort_order
660+
FROM cloud.role_permissions rp
661+
WHERE rule = 'createAccount' AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.role_id AND rp_.rule = 'ldapCreateAccount');
662+
663+
INSERT INTO cloud.role_permissions (uuid, role_id, rule, permission, sort_order)
664+
SELECT uuid(), role_id, 'linkAccountToLdap', permission, sort_order
665+
FROM cloud.role_permissions rp
666+
WHERE rule = 'createAccount' AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.role_id AND rp_.rule = 'linkAccountToLdap');
667+
668+
INSERT INTO cloud.role_permissions (uuid, role_id, rule, permission, sort_order)
669+
SELECT uuid(), role_id, 'importLdapUsers', permission, sort_order
670+
FROM cloud.role_permissions rp
671+
WHERE rule = 'createAccount' AND NOT EXISTS(SELECT 1 FROM cloud.role_permissions rp_ WHERE rp.role_id = rp_.role_id AND rp_.rule = 'importLdapUsers');

‎plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
import java.security.SecureRandom;
4545
import java.util.Map;
4646

47-
@APICommand(name = "ldapCreateAccount", description = "Creates an account from an LDAP user", responseObject = AccountResponse.class, since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
47+
@APICommand(name = "ldapCreateAccount", description = "Creates an account from an LDAP user", responseObject = AccountResponse.class, since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
48+
authorized = {RoleType.Admin, RoleType.DomainAdmin})
4849
public class LdapCreateAccountCmd extends BaseCmd {
4950
private static final String s_name = "createaccountresponse";
5051

‎plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
import com.cloud.user.UserAccount;
5757
import com.cloud.utils.StringUtils;
5858

59-
@APICommand(name = "importLdapUsers", description = "Import LDAP users", responseObject = LdapUserResponse.class, since = "4.3.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
59+
@APICommand(name = "importLdapUsers", description = "Import LDAP users", responseObject = LdapUserResponse.class, since = "4.3.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
60+
authorized = {RoleType.Admin, RoleType.DomainAdmin})
6061
public class LdapImportUsersCmd extends BaseListCmd {
6162

6263

0 commit comments

Comments
 (0)