🐛 fix handling of invalid IDNA labels

jawah · Feb 5, 2025 · 407fadb · 407fadb
1 parent 7000bad
commit 407fadb
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+1.4.1 (2025-02-05)
+====================
+
+**Fixed**
+- Bad IDNA label raise inappropriate exception.
+
 1.4.0 (2025-02-05)
 ====================
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "qh3"
-version = "1.4.0"
+version = "1.4.1"
 edition = "2021"
 rust-version = "1.75"
 license = "BSD-3"

diff --git a/qh3/__init__.py b/qh3/__init__.py
@@ -13,7 +13,7 @@
 from .quic.packet import QuicProtocolVersion
 from .tls import CipherSuite, SessionTicket
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 
 __all__ = (
     "connect",

diff --git a/src/intldomain.rs b/src/intldomain.rs
@@ -1,5 +1,4 @@
-use pyo3::exceptions::PyUnicodeDecodeError;
-use pyo3::exceptions::PyUnicodeEncodeError;
+use pyo3::exceptions::PyValueError;
 use pyo3::pyfunction;
 use pyo3::types::PyBytesMethods;
 use pyo3::types::{PyBytes, PyString};
@@ -13,7 +12,7 @@ use idna::domain_to_unicode;
 pub fn idna_encode<'a>(py: Python<'a>, text: &str) -> PyResult<Bound<'a, PyBytes>> {
     let idna_domain = match domain_to_ascii(text) {
         Ok(s) => s,
-        Err(e) => return Err(PyUnicodeEncodeError::new_err(e.to_string())),
+        Err(e) => return Err(PyValueError::new_err(e.to_string())),
     };
 
     Ok(PyBytes::new(py, idna_domain.as_bytes()))
@@ -24,7 +23,7 @@ pub fn idna_decode<'a>(py: Python<'a>, src: Bound<'a, PyBytes>) -> PyResult<Boun
     let decode_res = domain_to_unicode(std::str::from_utf8(src.as_bytes())?);
 
     if decode_res.1.is_err() {
-        return Err(PyUnicodeDecodeError::new_err(""));
+        return Err(PyValueError::new_err("invalid IDNA input"));
     }
 
     Ok(PyString::new(py, decode_res.0.as_ref()))