From da370b63b266254d9a7a7ae15274a9a70bcf5417 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Sun, 9 Jan 2022 23:37:12 +0100
Subject: validators: T4148: Add text output when validators fail

---
 src/validators/port-range | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/validators/port-range')

diff --git a/src/validators/port-range b/src/validators/port-range
index abf0b09d5..6e68c8733 100755
--- a/src/validators/port-range
+++ b/src/validators/port-range
@@ -9,9 +9,11 @@ if __name__ == '__main__':
         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):
+                    print(f'Error: {port_range} is not a valid port range')
                     sys.exit(1)
         else:
             if int(port_range) not in range(1, 65535):
+                print(f'Error: {port_range} is not a valid port')
                 sys.exit(1)
     else:
         sys.exit(2)
-- 
cgit v1.2.3


From 0a0e7d789e7e482b65cbca47bff1dcb427891a88 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Sun, 9 Jan 2022 23:45:04 +0100
Subject: validators: Stricter checking on port-range validator

---
 src/validators/port-range | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/validators/port-range')

diff --git a/src/validators/port-range b/src/validators/port-range
index 6e68c8733..657a21e20 100755
--- a/src/validators/port-range
+++ b/src/validators/port-range
@@ -3,18 +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):
-                    print(f'Error: {port_range} is not a valid port range')
-                    sys.exit(1)
-        else:
-            if int(port_range) not in range(1, 65535):
-                print(f'Error: {port_range} is not a valid port')
-                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)
 
-- 
cgit v1.2.3