Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix certs for unicode domains (#6796) 

* fix certs for unicode domains

fix #6729

* [autofix.ci] apply automated fixes

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
This commit is contained in:
Maximilian Hils 2024-04-12 17:22:19 +02:00 committed by GitHub
parent 61b094ac36
commit bfbd777cbb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -35,6 +35,8 @@
([#6767](https://github.com/mitmproxy/mitmproxy/pull/6767), @txrp0x9) ([#6767](https://github.com/mitmproxy/mitmproxy/pull/6767), @txrp0x9)
* Fix compatibility with older cryptography versions and silence a DeprecationWarning on Python <3.11. * Fix compatibility with older cryptography versions and silence a DeprecationWarning on Python <3.11.
([#6790](https://github.com/mitmproxy/mitmproxy/pull/6790), @mhils) ([#6790](https://github.com/mitmproxy/mitmproxy/pull/6790), @mhils)
* Fix a bug when proxying unicode domains.
([#6796](https://github.com/mitmproxy/mitmproxy/pull/6796), @mhils)
## 07 March 2024: mitmproxy 10.2.4 ## 07 March 2024: mitmproxy 10.2.4

2
mitmproxy/addons/tlsconfig.py
View File

@ -525,6 +525,6 @@ def _ip_or_dns_name(val: str) -> x509.GeneralName:
try: try:
ip = ipaddress.ip_address(val) ip = ipaddress.ip_address(val)
except ValueError: except ValueError:
return x509.DNSName(val) return x509.DNSName(val.encode("idna").decode())
else: else:
return x509.IPAddress(ip) return x509.IPAddress(ip)

4
test/mitmproxy/addons/test_tlsconfig.py
View File

@ -138,12 +138,12 @@ class TestTlsConfig:
) )
# And now we also incorporate SNI. # And now we also incorporate SNI.
ctx.client.sni = "sni.example" ctx.client.sni = "🌈.sni.example"
entry = ta.get_cert(ctx) entry = ta.get_cert(ctx)
assert entry.cert.altnames == x509.GeneralNames( assert entry.cert.altnames == x509.GeneralNames(
[ [
x509.DNSName("example.mitmproxy.org"), x509.DNSName("example.mitmproxy.org"),
x509.DNSName("sni.example"), x509.DNSName("xn--og8h.sni.example"),
x509.DNSName("server-address.example"), x509.DNSName("server-address.example"),
] ]
) )