Merge pull request #1152 from sarthurdev/firewall_validators

firewall: validators: T4148: Improve validators and firewall validator usage

1 files changed, 12 insertions, 7 deletions

diff --git a/src/validators/port-range b/src/validators/port-range
index abf0b09d5..657a21e20 100755
--- a/src/validators/port-range
+++ b/src/validators/port-range
@@ -3,16 +3,21 @@
 import sys
 import re
 
+def error(port_range):
+    print(f'Error: {port_range} is not a valid port or port range')
+    sys.exit(1)
+
 if __name__ == '__main__':
     if len(sys.argv)>1:
         port_range = sys.argv[1]
-        if re.search('[0-9]{1,5}-[0-9]{1,5}', port_range):
-            for tmp in port_range.split('-'):
-                if int(tmp) not in range(1, 65535):
-                    sys.exit(1)
-        else:
-            if int(port_range) not in range(1, 65535):
-                sys.exit(1)
+        if re.match('^[0-9]{1,5}-[0-9]{1,5}$', port_range):
+            port_1, port_2 = port_range.split('-')
+            if int(port_1) not in range(1, 65535) or int(port_2) not in range(1, 65535):
+                error(port_range)
+            if int(port_1) > int(port_2):
+                error(port_range)
+        elif not port_range.isnumeric() or int(port_range) not in range(1, 65535):
+                error(port_range)
     else:
         sys.exit(2)