fixes related to acl, dao

Author: sudo87

api/src/main/java/org/apache/cloudstack/api/command/user/dns/AddDnsServerCmd.java

@@ -28,9 +28,13 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.DnsServerResponse;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.dns.DnsProviderType;
 import org.apache.cloudstack.dns.DnsServer;
 import org.apache.commons.lang3.BooleanUtils;
 
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.EnumUtils;
+
 @APICommand(name = "addDnsServer",
         description = "Adds a new external DNS server",
         responseObject = DnsServerResponse.class,
@@ -51,8 +55,8 @@ public class AddDnsServerCmd extends BaseCmd {
     @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "API URL of the provider")
     private String url;
 
-    @Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING, required = true, description = "Provider type (e.g., PowerDNS)")
-    private String provider;
+    @Parameter(name = ApiConstants.PROVIDER_TYPE, type = CommandType.STRING, required = true, description = "Provider type (e.g., PowerDNS)")
+    private String providerType;
 
     @Parameter(name = ApiConstants.DNS_USER_NAME, type = CommandType.STRING,
             description = "Username or email associated with the external DNS provider account (used for authentication)")
@@ -82,8 +86,9 @@ public class AddDnsServerCmd extends BaseCmd {
     /////////////////////////////////////////////////////
 
     public String getName() { return name; }
+
     public String getUrl() { return url; }
-    public String getProvider() { return provider; }
+
     public String getCredentials() {
         return credentials;
     }
@@ -104,6 +109,15 @@ public List<String> getNameServers() {
         return nameServers;
     }
 
+    public DnsProviderType getProviderType() {
+        DnsProviderType dnsProviderType = EnumUtils.getEnumIgnoreCase(DnsProviderType.class, providerType, DnsProviderType.PowerDNS);
+        if (dnsProviderType == null) {
+            throw new InvalidParameterValueException(String.format("Invalid value passed for provider type, valid values are: %s",
+                    EnumUtils.listValues(DnsProviderType.values())));
+        }
+        return dnsProviderType;
+    }
+
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();

api/src/main/java/org/apache/cloudstack/api/command/user/dns/AssociateDnsZoneToNetworkCmd.java

@@ -18,6 +18,8 @@
 package org.apache.cloudstack.api.command.user.dns;
 
 import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.acl.SecurityChecker;
+import org.apache.cloudstack.api.ACL;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -27,12 +29,14 @@
 import org.apache.cloudstack.api.response.DnsZoneNetworkMapResponse;
 import org.apache.cloudstack.api.response.DnsZoneResponse;
 import org.apache.cloudstack.api.response.NetworkResponse;
+import org.apache.cloudstack.dns.DnsZone;
 
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.user.Account;
 
 @APICommand(name = "associateDnsZoneToNetwork",
         description = "Associates a DNS Zone with a Network for VM auto-registration",
@@ -47,6 +51,7 @@ public class AssociateDnsZoneToNetworkCmd extends BaseCmd {
             required = true, description = "The ID of the DNS zone")
     private Long dnsZoneId;
 
+    @ACL(accessType = SecurityChecker.AccessType.OperateEntry)
     @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class,
             required = true, description = "The ID of the network")
     private Long networkId;
@@ -68,7 +73,11 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE
 
     @Override
     public long getEntityOwnerId() {
-        return dnsProviderManager.getDnsZone(dnsZoneId).getAccountId();
+        DnsZone zone = _entityMgr.findById(DnsZone.class, dnsZoneId);
+        if (zone != null) {
+            return zone.getAccountId();
+        }
+        return Account.ACCOUNT_ID_SYSTEM;
     }
 
     public Long getDnsZoneId() {

api/src/main/java/org/apache/cloudstack/api/command/user/dns/DeleteDnsZoneCmd.java

@@ -80,8 +80,7 @@ public void execute() {
 
     @Override
     public long getEntityOwnerId() {
-        // Look up the Zone to find the Account Owner
-        DnsZone zone = dnsProviderManager.getDnsZone(id);
+        DnsZone zone = _entityMgr.findById(DnsZone.class, id);
         if (zone != null) {
             return zone.getAccountId();
         }

api/src/main/java/org/apache/cloudstack/api/command/user/dns/DisassociateDnsZoneFromNetworkCmd.java

@@ -26,7 +26,8 @@
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.DnsZoneNetworkMapResponse;
+import org.apache.cloudstack.api.response.DnsZoneResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 
 import com.cloud.exception.ConcurrentOperationException;
@@ -44,10 +45,14 @@
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DisassociateDnsZoneFromNetworkCmd extends BaseCmd {
 
+    @Parameter(name = ApiConstants.DNS_ZONE_ID, type = CommandType.UUID, entityType = DnsZoneResponse.class,
+            required = true, description = "The ID of the DNS zone")
+    private Long dnsZoneId;
+
     @ACL(accessType = SecurityChecker.AccessType.OperateEntry)
-    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = DnsZoneNetworkMapResponse.class,
-            required = true, description = "The ID of the DNS zone to network mapping")
-    private Long id;
+    @Parameter(name = ApiConstants.NETWORK_ID, type = CommandType.UUID, entityType = NetworkResponse.class,
+            required = true, description = "The ID of the network")
+    private Long networkId;
 
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
@@ -69,5 +74,11 @@ public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
     }
 
-    public Long getId() { return id; }
+    public Long getDnsZoneId() {
+        return dnsZoneId;
+    }
+
+    public void setDnsZoneId(Long dnsZoneId) {
+        this.dnsZoneId = dnsZoneId;
+    }
 }

api/src/main/java/org/apache/cloudstack/api/command/user/dns/ListDnsServersCmd.java

@@ -24,8 +24,12 @@
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.DnsServerResponse;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.dns.DnsProviderType;
 import org.apache.cloudstack.dns.DnsServer;
 
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.utils.EnumUtils;
+
 @APICommand(name = "listDnsServers",
         description = "Lists DNS servers owned by the account.",
         responseObject = DnsServerResponse.class,
@@ -43,9 +47,9 @@ public class ListDnsServersCmd  extends BaseListAccountResourcesCmd {
             description = "the ID of the DNS server")
     private Long id;
 
-    @Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING,
+    @Parameter(name = ApiConstants.PROVIDER_TYPE, type = CommandType.STRING,
             description = "filter by provider type (e.g. PowerDNS, Cloudflare)")
-    private String provider;
+    private String providerType;
 
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
@@ -55,8 +59,13 @@ public Long getId() {
         return id;
     }
 
-    public String getProvider() {
-        return provider;
+    public DnsProviderType getProviderType() {
+        DnsProviderType dnsProviderType = EnumUtils.getEnumIgnoreCase(DnsProviderType.class, providerType, DnsProviderType.PowerDNS);
+        if (dnsProviderType == null) {
+            throw new InvalidParameterValueException(String.format("Invalid value passed for provider type, valid values are: %s",
+                    EnumUtils.listValues(DnsProviderType.values())));
+        }
+        return dnsProviderType;
     }
 
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/dns/ListDnsZonesCmd.java

@@ -20,7 +20,7 @@
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseListAccountResourcesCmd;
+import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.DnsServerResponse;
 import org.apache.cloudstack.api.response.DnsZoneResponse;
@@ -33,7 +33,7 @@
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.23.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
-public class ListDnsZonesCmd extends BaseListAccountResourcesCmd {
+public class ListDnsZonesCmd extends BaseListCmd {
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/dns/RegisterDnsRecordForVmCmd.java

@@ -24,6 +24,7 @@
 import com.cloud.utils.component.Adapter;
 
 public interface DnsProvider extends Adapter {
+
     DnsProviderType getProviderType();
 
     // Validates connectivity to the server