etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5145 : Added permission checks while deleting network ACLs

This commit is contained in:
Kishan Kavala 2013-12-16 18:12:44 +05:30
parent 3a3fec3cb6
commit e2915c6ce5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -579,10 +579,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
@Override
public boolean revokeNetworkACLItem(long ruleId) {
NetworkACLItemVO aclItem = _networkACLItemDao.findById(ruleId);
<<<<<<< HEAD
if (aclItem != null) {
if ((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)) {
=======
if(aclItem != null){
NetworkACL acl = _networkAclMgr.getNetworkACL(aclItem.getAclId());
@ -593,7 +589,6 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
_accountMgr.checkAccess(caller, null, true, vpc);
if((aclItem.getAclId() == NetworkACL.DEFAULT_ALLOW) || (aclItem.getAclId() == NetworkACL.DEFAULT_DENY)){
>>>>>>> e2805b8... CLOUDSTACK-5145 : Added permission checks while deleting network ACLs
throw new InvalidParameterValueException("ACL Items in default ACL cannot be deleted");
}
}