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

Allow list of source CIDRs

This commit is contained in:
Pearl Dsilva 2025-06-25 10:10:11 -04:00
parent 6dd7e71e2e
commit fcbddd8b01
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisServiceImpl.java
View File

@ -402,42 +402,43 @@ public class NetrisServiceImpl implements NetrisService, Configurable {
String trafficType = baseNetworkRule.getTrafficType().toUpperCase(Locale.ROOT); String trafficType = baseNetworkRule.getTrafficType().toUpperCase(Locale.ROOT);
String sourcePrefix; String sourcePrefix;
String destinationPrefix; String destinationPrefix;
if ("INGRESS".equals(trafficType)) { boolean result = true;
sourcePrefix = baseNetworkRule.getSourceCidrList().get(0); List<String> sourceCidrs = baseNetworkRule.getSourceCidrList();
if (NetUtils.isValidIp4Cidr(sourcePrefix)) { int index = 1;
destinationPrefix = network.getCidr(); for (String sourceCidr : sourceCidrs) {
if ("INGRESS".equals(trafficType)) {
sourcePrefix = sourceCidr;
destinationPrefix = NetUtils.isValidIp4Cidr(sourcePrefix) ? network.getCidr() : network.getIp6Cidr();
} else { } else {
destinationPrefix = network.getIp6Cidr(); destinationPrefix = sourceCidr;
sourcePrefix = NetUtils.isValidIp4Cidr(destinationPrefix) ? network.getCidr() : network.getIp6Cidr();
} }
} else { String srcPort;
destinationPrefix = baseNetworkRule.getSourceCidrList().get(0); String dstPort;
if (NetUtils.isValidIp4Cidr(destinationPrefix)) { if (baseNetworkRule.getPrivatePort().contains("-")) {
sourcePrefix = network.getCidr(); srcPort = baseNetworkRule.getPrivatePort().split("-")[0];
dstPort = baseNetworkRule.getPrivatePort().split("-")[1];
} else { } else {
sourcePrefix = network.getIp6Cidr(); srcPort = dstPort = baseNetworkRule.getPrivatePort();
} }
CreateOrUpdateNetrisACLCommand cmd = new CreateOrUpdateNetrisACLCommand(zoneId, accountId, domainId, networkName, networkId,
vpcName, vpcId, Objects.nonNull(vpcId), rule.getAclAction().name().toLowerCase(Locale.ROOT), getPrefix(sourcePrefix), getPrefix(destinationPrefix),
"null".equals(srcPort) ? 1 : Integer.parseInt(srcPort),
"null".equals(dstPort) ? 65535 : Integer.parseInt(dstPort), baseNetworkRule.getProtocol());
String aclName = String.format("V%s-N%s-ACL%s", vpcId, networkId, rule.getBaseRule().getRuleId());
if (sourceCidrs.size() > 1) {
aclName = aclName + "-" + index++;
}
String netrisAclName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName);
cmd.setNetrisAclName(netrisAclName);
cmd.setReason(rule.getReason());
if ("ICMP".equals(baseNetworkRule.getProtocol())) {
cmd.setIcmpType(baseNetworkRule.getIcmpType());
}
NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
result = result && answer.getResult();
} }
String srcPort; return result;
String dstPort;
if (baseNetworkRule.getPrivatePort().contains("-")) {
srcPort = baseNetworkRule.getPrivatePort().split("-")[0];
dstPort = baseNetworkRule.getPrivatePort().split("-")[1];
} else {
srcPort = dstPort = baseNetworkRule.getPrivatePort();
}
CreateOrUpdateNetrisACLCommand cmd = new CreateOrUpdateNetrisACLCommand(zoneId, accountId, domainId, networkName, networkId,
vpcName, vpcId, Objects.nonNull(vpcId), rule.getAclAction().name().toLowerCase(Locale.ROOT), getPrefix(sourcePrefix), getPrefix(destinationPrefix),
"null".equals(srcPort) ? 1 : Integer.parseInt(srcPort),
"null".equals(dstPort) ? 65535 : Integer.parseInt(dstPort), baseNetworkRule.getProtocol());
String aclName = String.format("V%s-N%s-ACL%s", vpcId, networkId, rule.getBaseRule().getRuleId());
String netrisAclName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.ACL, aclName);
cmd.setNetrisAclName(netrisAclName);
cmd.setReason(rule.getReason());
if ("ICMP".equals(baseNetworkRule.getProtocol())) {
cmd.setIcmpType(baseNetworkRule.getIcmpType());
}
NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
return answer.getResult();
} }
public static String getPrefix(String prefix) { public static String getPrefix(String prefix) {