Skip to content

Commit ba84808

Browse files
minchen07minchen07
committed
Disable IAM feature from 4.4 release.
1 parent c0936fe commit ba84808

74 files changed

Lines changed: 2121 additions & 3172 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/com/cloud/network/NetworkModel.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import java.util.Map;
2323
import java.util.Set;
2424

25-
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
26-
2725
import com.cloud.dc.Vlan;
2826
import com.cloud.exception.InsufficientAddressCapacityException;
2927
import com.cloud.exception.InvalidParameterValueException;
@@ -277,6 +275,4 @@ public interface NetworkModel {
277275
boolean isNetworkReadyForGc(long networkId);
278276

279277
boolean getNetworkEgressDefaultPolicy(Long networkId);
280-
281-
void checkNetworkPermissions(Account owner, Network network, AccessType accessType);
282278
}

‎api/src/com/cloud/user/AccountService.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,12 @@ UserAccount createUserAccount(String userName, String password, String firstName
103103

104104
RoleType getRoleType(Account account);
105105

106-
void checkAccess(Account caller, Domain domain) throws PermissionDeniedException;
106+
void checkAccess(Account account, Domain domain) throws PermissionDeniedException;
107107

108-
void checkAccess(Account caller, AccessType accessType, ControlledEntity... entities) throws PermissionDeniedException;
108+
void checkAccess(Account account, AccessType accessType, boolean sameOwner, ControlledEntity... entities) throws PermissionDeniedException;
109109

110-
void checkAccess(Account caller, AccessType accessType, String apiName, ControlledEntity... entities) throws PermissionDeniedException;
110+
void checkAccess(Account account, AccessType accessType, boolean sameOwner, String apiName,
111+
ControlledEntity... entities) throws PermissionDeniedException;
111112

112113
Long finalyzeAccountId(String accountName, Long domainId, Long projectId, boolean enabledOnly);
113114

‎api/src/org/apache/cloudstack/acl/SecurityChecker.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
public interface SecurityChecker extends Adapter {
3232

3333
public enum AccessType {
34-
ListEntry,
35-
UseEntry,
36-
OperateEntry,
3734
ModifyProject,
35+
OperateEntry,
36+
UseEntry,
37+
ListEntry
3838
}
3939

4040
/**

‎api/src/org/apache/cloudstack/api/command/admin/address/AssociateIPAddrCmdByAdmin.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,8 @@
3131
import com.cloud.exception.ResourceAllocationException;
3232
import com.cloud.exception.ResourceUnavailableException;
3333
import com.cloud.network.IpAddress;
34-
import com.cloud.network.vpc.Vpc;
3534

36-
@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Full,
37-
entityType = {IpAddress.class, Vpc.class},
38-
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
35+
@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Full)
3936
public class AssociateIPAddrCmdByAdmin extends AssociateIPAddrCmd {
4037
public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmdByAdmin.class.getName());
4138

‎api/src/org/apache/cloudstack/api/command/admin/vm/AddNicToVMCmdByAdmin.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.cloud.uservm.UserVm;
3434
import com.cloud.vm.VirtualMachine;
3535

36+
3637
@APICommand(name = "addNicToVirtualMachine", description = "Adds VM to specified network by creating a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Full, entityType = {VirtualMachine.class},
3738
requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
3839
public class AddNicToVMCmdByAdmin extends AddNicToVMCmd {

‎api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import com.cloud.user.Account;
5959

6060
@APICommand(name = "associateIpAddress", description = "Acquires and associates a public IP to an account.", responseObject = IPAddressResponse.class, responseView = ResponseView.Restricted,
61-
entityType = {IpAddress.class, Vpc.class},
6261
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
6362
public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
6463
public static final Logger s_logger = Logger.getLogger(AssociateIPAddrCmd.class.getName());

‎api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import com.cloud.utils.net.NetUtils;
5050
import com.cloud.vm.VirtualMachine;
5151

52+
5253
@APICommand(name = "createPortForwardingRule", description = "Creates a port forwarding rule", responseObject = FirewallRuleResponse.class, entityType = {FirewallRule.class,
5354
VirtualMachine.class, IpAddress.class},
5455
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)

‎api/src/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import java.util.List;
2424
import java.util.Map;
2525

26-
import com.cloud.utils.net.NetUtils;
2726
import org.apache.log4j.Logger;
2827

29-
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
30-
import org.apache.cloudstack.api.ACL;
3128
import org.apache.cloudstack.api.APICommand;
3229
import org.apache.cloudstack.api.ApiConstants;
3330
import org.apache.cloudstack.api.ApiErrorCode;
@@ -41,15 +38,15 @@
4138

4239
import com.cloud.event.EventTypes;
4340
import com.cloud.exception.InvalidParameterValueException;
44-
import com.cloud.network.rules.FirewallRule;
4541
import com.cloud.network.rules.LoadBalancer;
4642
import com.cloud.user.Account;
4743
import com.cloud.utils.StringUtils;
44+
import com.cloud.utils.net.NetUtils;
4845
import com.cloud.vm.VirtualMachine;
4946

5047
@APICommand(name = "assignToLoadBalancerRule",
5148
description = "Assigns virtual machine or a list of virtual machines to a load balancer rule.",
52-
responseObject = SuccessResponse.class, entityType = {FirewallRule.class, VirtualMachine.class},
49+
responseObject = SuccessResponse.class,
5350
requestHasSensitiveInfo = false,
5451
responseHasSensitiveInfo = false)
5552
public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
@@ -61,15 +58,13 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
6158
//////////////// API parameters /////////////////////
6259
/////////////////////////////////////////////////////
6360

64-
@ACL(accessType = AccessType.OperateEntry)
6561
@Parameter(name = ApiConstants.ID,
6662
type = CommandType.UUID,
6763
entityType = FirewallRuleResponse.class,
6864
required = true,
6965
description = "the ID of the load balancer rule")
7066
private Long id;
7167

72-
@ACL(accessType = AccessType.OperateEntry)
7368
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_IDS,
7469
type = CommandType.LIST,
7570
collectionType = CommandType.UUID,

‎api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ public void execute() {
8686
if (lb != null) {
8787
//check permissions
8888
Account caller = CallContext.current().getCallingAccount();
89-
_accountService.checkAccess(caller, null, lb);
89+
_accountService.checkAccess(caller, null, true, lb);
9090
List<? extends StickinessPolicy> stickinessPolicies = _lbService.searchForLBStickinessPolicies(this);
9191
LBStickinessResponse spResponse = _responseGenerator.createLBStickinessPolicyResponse(stickinessPolicies, lb);
9292
spResponses.add(spResponse);
9393
response.setResponses(spResponses);
9494
}
9595

9696
response.setResponseName(getCommandName());
97-
setResponseObject(response);
97+
this.setResponseObject(response);
9898
}
9999

100100
}

‎api/src/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@
3434
import com.cloud.exception.NetworkRuleConflictException;
3535
import com.cloud.exception.ResourceUnavailableException;
3636
import com.cloud.network.IpAddress;
37-
import com.cloud.network.vpc.Vpc;
38-
import com.cloud.vm.VirtualMachine;
3937

4038
@APICommand(name = "disableStaticNat", description = "Disables static rule for given ip address", responseObject = SuccessResponse.class,
41-
entityType = {IpAddress.class, VirtualMachine.class, Vpc.class},
4239
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
4340
public class DisableStaticNatCmd extends BaseAsyncCmd {
4441
public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName());
@@ -92,7 +89,7 @@ public void execute() throws ResourceUnavailableException, NetworkRuleConflictEx
9289

9390
if (result) {
9491
SuccessResponse response = new SuccessResponse(getCommandName());
95-
setResponseObject(response);
92+
this.setResponseObject(response);
9693
} else {
9794
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to disable static nat");
9895
}

0 commit comments

Comments
 (0)