Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tuple norm to SockAddr type (SYN-8987) #4219

Merged
merged 2 commits into from
Apr 1, 2025
Merged

Add tuple norm to SockAddr type (SYN-8987) #4219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69d95bd
Add tuple norm to SockAddr type (SYN-8987)
Cisphyx Apr 1, 2025
f08aee7
coverage
Cisphyx Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions synapse/models/inet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ class SockAddr(s_types.Str):
def postTypeInit(self):
s_types.Str.postTypeInit(self)
self.setNormFunc(str, self._normPyStr)
self.setNormFunc(list, self._normPyTuple)
self.setNormFunc(tuple, self._normPyTuple)

self.iptype = self.modl.type('inet:ip')
self.porttype = self.modl.type('inet:port')
Expand Down Expand Up @@ -458,6 +460,11 @@ def _normPyStr(self, valu):
virts['port'] = (port, self.porttype.stortype)
portstr = f':{port}'

elif self.defport:
subs['port'] = self.defport
virts['port'] = (self.defport, self.porttype.stortype)
portstr = f':{self.defport}'

return f'{proto}://[{host}]{portstr}', {'subs': subs, 'virts': virts}

mesg = f'Invalid IPv6 w/port ({orig})'
Expand All @@ -468,6 +475,12 @@ def _normPyStr(self, valu):
host = self.iptype.repr(ipv6)
subs['ip'] = ipv6
virts['ip'] = (ipv6, self.iptype.stortype)

if self.defport:
subs['port'] = self.defport
virts['port'] = (self.defport, self.porttype.stortype)
return f'{proto}://[{host}]:{self.defport}', {'subs': subs, 'virts': virts}

return f'{proto}://{host}', {'subs': subs, 'virts': virts}

# Otherwise treat as IPv4
Expand All @@ -483,6 +496,25 @@ def _normPyStr(self, valu):

return f'{proto}://{ipv4_repr}{pstr}', {'subs': subs, 'virts': virts}

def _normPyTuple(self, valu):
ipaddr = self.iptype.norm(valu)[0]

(vers, ip_int) = ipaddr
ip_repr = self.iptype.repr(ipaddr)
subs = {}
virts = {}
proto = self.defproto

if self.defport:
subs['port'] = self.defport
virts['port'] = (self.defport, self.porttype.stortype)
if vers == 6:
return f'{proto}://[{ip_repr}]:{self.defport}', {'subs': subs, 'virts': virts}
else:
return f'{proto}://{ip_repr}:{self.defport}', {'subs': subs, 'virts': virts}

return f'{proto}://{ip_repr}', {'subs': subs, 'virts': virts}

class Cidr(s_types.Str):

def postTypeInit(self):
Expand Down
16 changes: 16 additions & 0 deletions synapse/tests/test_model_inet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,10 @@ async def test_server(self):
'port': 12345,
'proto': 'host',
}),
((4, 2130706433), 'tcp://127.0.0.1', {
'ip': (4, 2130706433),
'proto': 'tcp',
}),
)

async with self.getTestCore() as core:
Expand All @@ -1348,6 +1352,18 @@ async def test_server(self):
for p, v in props.items():
self.eq(node.get(p), v)

nodes = await core.nodes('[ it:network=* :dns:resolvers=(([4, 1]),)]')
self.eq(nodes[0].get('dns:resolvers'), ('udp://0.0.0.1:53',))

nodes = await core.nodes('[ it:network=* :dns:resolvers=(([6, 1]),)]')
self.eq(nodes[0].get('dns:resolvers'), ('udp://[::1]:53',))

nodes = await core.nodes('[ it:network=* :dns:resolvers=("::1",)]')
self.eq(nodes[0].get('dns:resolvers'), ('udp://[::1]:53',))

nodes = await core.nodes('[ it:network=* :dns:resolvers=("[::1]",)]')
self.eq(nodes[0].get('dns:resolvers'), ('udp://[::1]:53',))

async def test_servfile(self):
async with self.getTestCore() as core:
valu = ('tcp://127.0.0.1:4040', 64 * 'f')
Expand Down