api: Prevent modifying acl rules order for default ACLs (#6187)

Pearl1594 · web-flow · commit c1c381fcd16a · 2022-04-07T21:31:29.000-03:00
diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -1145,6 +1145,9 @@ protected void validateMoveAclRulesData(NetworkACLItemVO ruleBeingMoved, Network
         }
         NetworkACLVO acl = _networkACLDao.findById(aclId);
         Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId());
+        if (vpc == null) {
+            throw new InvalidParameterValueException("Re-ordering rules for a default ACL is prohibited");
+        }
         Account caller = CallContext.current().getCallingAccount();
         _accountMgr.checkAccess(caller, null, true, vpc);
     }

Original file line number	Diff line number	Diff line change
`@@ -1145,6 +1145,9 @@ protected void validateMoveAclRulesData(NetworkACLItemVO ruleBeingMoved, Network`
`1145`	`1145`	`}`
`1146`	`1146`	`NetworkACLVO acl = _networkACLDao.findById(aclId);`
`1147`	`1147`	`Vpc vpc = _entityMgr.findById(Vpc.class, acl.getVpcId());`
	`1148`	`+ if (vpc == null) {`
	`1149`	`+ throw new InvalidParameterValueException("Re-ordering rules for a default ACL is prohibited");`
	`1150`	`+ }`
`1148`	`1151`	`Account caller = CallContext.current().getCallingAccount();`
`1149`	`1152`	`_accountMgr.checkAccess(caller, null, true, vpc);`
`1150`	`1153`	`}`