Skip to content

fix(deps): update rust crate pyo3 to 0.29.0 [security] #40

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

Merged
jkerestes-r7 merged 3 commits into from
Sep 9, 2026
Merged

fix(deps): update rust crate pyo3 to 0.29.0 [security] #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5aaa9c
fix(deps): update rust crate pyo3 to 0.29.0 [security]
dependency-automation-app[bot] Sep 2, 2026
6e029f8
fix(deps): Address PyO3 breaking changes
jkerestes-r7 Sep 9, 2026
ee9596e
chore(): Address clippy issues
jkerestes-r7 Sep 9, 2026
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ arraystring = "0.3.0"
typenum = "1"

[dependencies.pyo3]
version = "0.17.3"
version = "0.29.0"
features = ["extension-module"]

[profile.release]
Expand Down
43 changes: 22 additions & 21 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ struct DomainExtractor {
#[pymethods]
impl DomainExtractor {
#[new]
#[pyo3(signature = (suffix_list=None))]
fn new(
suffix_list: Option<&str>,
) -> Self {
Expand Down Expand Up @@ -113,18 +114,18 @@ impl DomainExtractor {
} else {
Ok((domain, "", ""))
}
} else if current_suffixes.len() > 0 && current_suffixes.contains_key(current_fraction) {
} else if !current_suffixes.is_empty() && current_suffixes.contains_key(current_fraction) {
Ok((domain, "", ""))
} else {
Ok((suffix_part, current_fraction, ""))
}
}

fn extract(
fn extract<'py>(
&self,
py: Python,
domain: &PyString,
) -> PyResult<PyObject> {
py: Python<'py>,
domain: &Bound<'_, PyString>,
) -> PyResult<Bound<'py, PyAny>> {
if domain.len().unwrap() > 255 {
return Err(PyValueError::new_err("Invalid domain detected"));
}
Expand All @@ -139,9 +140,9 @@ impl DomainExtractor {
unsafe {
let dict = pyo3::ffi::PyDict_New();
for (fraction_key, fraction) in [
(intern!(py, "suffix").into_ptr(), suffix_part),
(intern!(py, "domain").into_ptr(), domain_part),
(intern!(py, "subdomain").into_ptr(), subdomain_part),
(intern!(py, "suffix").as_ptr(), suffix_part),
(intern!(py, "domain").as_ptr(), domain_part),
(intern!(py, "subdomain").as_ptr(), subdomain_part),
] {
if !fraction.is_empty() {
let substr = pyo3::ffi::PyUnicode_FromStringAndSize(
Expand All @@ -159,18 +160,18 @@ impl DomainExtractor {
pyo3::ffi::PyDict_SetItem(
dict,
fraction_key,
intern!(py, "").into_ptr(),
intern!(py, "").as_ptr(),
);
}
}

Ok(pyo3::PyObject::from_owned_ptr(py, dict))
Ok(Bound::from_owned_ptr(py, dict))
}
}

fn is_valid_domain(
&self,
domain: &PyString,
domain: &Bound<'_, PyString>,
) -> bool {
let domain_len = domain.len().unwrap();
if domain_len == 0 || domain_len > 255 {
Expand Down Expand Up @@ -221,11 +222,11 @@ impl DomainExtractor {
self.tld_list.clone()
}

fn extract_from_url(
fn extract_from_url<'py>(
&self,
py: Python,
url: &PyString,
) -> PyResult<PyObject> {
py: Python<'py>,
url: &Bound<'_, PyString>,
) -> PyResult<Bound<'py, PyAny>> {
let mut url_str = url.to_str().unwrap();

match memchr::memmem::find(url_str.as_bytes(), b"//") {
Expand Down Expand Up @@ -268,9 +269,9 @@ impl DomainExtractor {
unsafe {
let dict = pyo3::ffi::PyDict_New();
for (fraction_key, fraction) in [
(intern!(py, "suffix").into_ptr(), suffix_part),
(intern!(py, "domain").into_ptr(), domain_part),
(intern!(py, "subdomain").into_ptr(), subdomain_part),
(intern!(py, "suffix").as_ptr(), suffix_part),
(intern!(py, "domain").as_ptr(), domain_part),
(intern!(py, "subdomain").as_ptr(), subdomain_part),
] {
if !fraction.is_empty() {
let substr = pyo3::ffi::PyUnicode_FromStringAndSize(
Expand All @@ -288,12 +289,12 @@ impl DomainExtractor {
pyo3::ffi::PyDict_SetItem(
dict,
fraction_key,
intern!(py, "").into_ptr(),
intern!(py, "").as_ptr(),
);
}
}

Ok(pyo3::PyObject::from_owned_ptr(py, dict))
Ok(Bound::from_owned_ptr(py, dict))
}
}
}
Expand Down Expand Up @@ -353,7 +354,7 @@ fn parse_suffix_list(
#[pymodule]
fn pydomainextractor(
_py: Python,
m: &PyModule,
m: &Bound<'_, PyModule>,
) -> PyResult<()> {
m.add_class::<DomainExtractor>()?;
Ok(())
Expand Down
Loading