apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Validate port ranges in PF rule only when startPort != endPort in private or public range

Browse Source
This commit is contained in:
Alena Prokharchyk 2012-09-14 15:22:25 -07:00
parent bbbccc0a7b
commit 6875f48966
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/network/rules/RulesManagerImpl.java
View File

@ -245,13 +245,22 @@ public class RulesManagerImpl implements RulesManager, RulesService, Manager {
dstIp = new Ip(guestNic.getIp4Address()); dstIp = new Ip(guestNic.getIp4Address());
} }
//source start port and source dest port should be the same. The same applies to dest ports //if start port and end port are passed in, and they are not equal to each other, perform the validation
if (rule.getSourcePortStart().intValue() != rule.getDestinationPortStart()) { boolean validatePortRange = false;
throw new InvalidParameterValueException("Private port start should be equal to public port start", null); if (rule.getSourcePortStart().intValue() != rule.getSourcePortEnd().intValue()
|| rule.getDestinationPortStart() != rule.getDestinationPortEnd()) {
validatePortRange = true;
} }
if (rule.getSourcePortEnd().intValue() != rule.getDestinationPortEnd()) { if (validatePortRange) {
throw new InvalidParameterValueException("Private port end should be equal to public port end", null); //source start port and source dest port should be the same. The same applies to dest ports
if (rule.getSourcePortStart().intValue() != rule.getDestinationPortStart()) {
throw new InvalidParameterValueException("Private port start should be equal to public port start", null);
}
if (rule.getSourcePortEnd().intValue() != rule.getDestinationPortEnd()) {
throw new InvalidParameterValueException("Private port end should be equal to public port end", null);
}
} }
Transaction txn = Transaction.currentTxn(); Transaction txn = Transaction.currentTxn();