diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-01-28 09:56:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-28 09:56:59 +0000 |
commit | d840019192769f900f6a1a5c768368a080e651cd (patch) | |
tree | b0b495c61a0f69dbecd32259249274e726b968b6 /contrib | |
parent | Merge pull request #4470 from matrix-org/erikj/require_format_version (diff) | |
download | synapse-d840019192769f900f6a1a5c768368a080e651cd.tar.xz |
Fix idna and ipv6 literal handling in MatrixFederationAgent (#4487)
Turns out that the library does a better job of parsing URIs than our reinvented wheel. Who knew. There are two things going on here. The first is that, unlike parse_server_name, URI.fromBytes will strip off square brackets from IPv6 literals, which means that it is valid input to ClientTLSOptionsFactory and HostnameEndpoint. The second is that we stay in `bytes` throughout (except for the argument to ClientTLSOptionsFactory), which avoids the weirdness of (sometimes) ending up with idna-encoded values being held in `unicode` variables. TBH it probably would have been ok but it made the tests fragile.
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions