allow leading zeros in ipv4 addresses

Author: OCBender

synapse/models/inet.py

@@ -242,12 +242,16 @@ def _normPyStr(self, text):
 
             try:
                 byts = socket.inet_pton(socket.AF_INET, valu)
-                addr = (4, int.from_bytes(byts, 'big'))
-                ipaddr = ipaddress.IPv4Address(addr[1])
-                subs['version'] = 4
-            except OSError as e:
-                mesg = f'Invalid IP address: {text}'
-                raise s_exc.BadTypeValu(mesg=mesg) from None
+            except OSError:
+                try:
+                    byts = socket.inet_aton(valu)
+                except OSError as e:
+                    mesg = f'Invalid IP address: {text}'
+                    raise s_exc.BadTypeValu(mesg=mesg) from None
+
+            addr = (4, int.from_bytes(byts, 'big'))
+            ipaddr = ipaddress.IPv4Address(addr[1])
+            subs['version'] = 4
 
         subs['type'] = getAddrType(ipaddr)
 

synapse/tests/test_model_inet.py

@@ -3070,3 +3070,21 @@ async def test_model_inet_service(self):
             self.len(1, await core.nodes('inet:service:subscription -> inet:service:subscription:level:taxonomy'))
             self.len(1, await core.nodes('inet:service:subscription :pay:instrument -> econ:bank:account'))
             self.len(1, await core.nodes('inet:service:subscription :subscriber -> inet:service:tenant'))
+
+    async def test_ipv4_fallback(self):
+
+        async with self.getTestCore() as core:
+            self.len(1, await core.nodes('[inet:ip=192.168.1.1]'))
+
+            self.len(1, await core.nodes('[inet:ip=3.0.000.115]'))
+            self.len(1, await core.nodes('[inet:ip=192.168.001.001]'))
+            self.len(1, await core.nodes('[inet:ip=10.0.0.001]'))
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[inet:ip=256.256.256.256]')
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[inet:ip=192.168.001.001.001]')
+
+            with self.raises(s_exc.BadTypeValu):
+                await core.nodes('[inet:ip=192.168.001.001.abc]')