Merge pull request #1000 from iocage/NAS-102674

NAS-102674 / 11.3 / Bug fix for nat forwards prop validation
iocage · Jul 26, 2019 · c9c848f · c9c848f
2 parents d94ddaf + 4772ec7
commit c9c848f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/iocage_lib/ioc_json.py b/iocage_lib/ioc_json.py
@@ -2500,12 +2500,11 @@ def json_check_prop(self, key, value, conf, default=False):
 
                     if value != 'none':
                         regex = re.compile(
-                            r'(^tcp|^udp|^tcp\/udp)\(\d{1,5}((:|-?)'
-                            r'(\d{1,5}))\)'
+                            r'^(tcp|udp|tcp\/udp)\(\d{1,5}((:|-?)(\d{1,5}))\)'
                         )
                         for fwd in value.split(','):
                             # We assume TCP for simpler inputs
-                            fwd = f'tcp({fwd})'
+                            fwd = f'tcp({fwd})' if fwd.isdigit() else fwd
                             new_value.append(fwd)
 
                             match = regex.match(fwd)