client_subnet_authority non-strict mode

- `generator/client_subnet_authority`: Add `nonstrict` mode to skip bad data

Author: jelu

dsc_datatool/generator/client_subnet_authority.py

@@ -36,6 +36,7 @@
 
 class client_subnet_authority(Generator):
     auth = None
+    nonstrict = False
 
 
     def _read(self, input):
@@ -89,6 +90,9 @@ def __init__(self, opts):
         csvs = opts.get('csv', None)
         urlv4 = opts.get('urlv4', 'https://www.iana.org/assignments/ipv4-address-space/ipv4-address-space.csv')
         urlv6 = opts.get('urlv6', 'https://www.iana.org/assignments/ipv6-unicast-address-assignments/ipv6-unicast-address-assignments.csv')
+        if opts.get('nonstrict', False):
+            self.nonstrict = True
+
         if csvs:
             if not isinstance(csvs, list):
                 csvs = [ csvs ]
@@ -130,7 +134,12 @@ def process(self, datasets):
 
             auth = {}
             for subnet in subnets:
-                ip = ipaddress.ip_address(subnet)
+                try:
+                    ip = ipaddress.ip_address(subnet)
+                except Exception as e:
+                    if not self.nonstrict:
+                        raise e
+                    continue
                 if ip.version == 4:
                     idx = ipaddress.ip_network('%s/8' % ip, strict=False)
                     ip = ipaddress.ip_network('%s/32' % ip)

man/man7/dsc-datatool-generator-client_subnet_authority.7

@@ -34,6 +34,11 @@ URL for IANA IPv4 address space registry, default to
 .BR urlv6 =url
 URL for IANA IPv6 address space registry, default to
 .IR https://www.iana.org/assignments/ipv6-unicast-address-assignments/ipv6-unicast-address-assignments.csv .
+.TP
+.BR nonstrict =<value>
+If set (to any value) then a non-strict mode is enabled which will disregard
+any bad data in the dataset, skipping it completely.
+Default is strict mode.
 .LP
 .SH "SEE ALSO"
 .BR dsc-datatool (1)