From 605a4f38e87fb4adaf3153635d16790a1a827377 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 09:23:13 +0000 Subject: [PATCH 1/2] Bump url from 2.5.2 to 2.5.4 Bumps [url](https://github.com/servo/rust-url) from 2.5.2 to 2.5.4. - [Release notes](https://github.com/servo/rust-url/releases) - [Commits](https://github.com/servo/rust-url/compare/v2.5.2...v2.5.4) --- updated-dependencies: - dependency-name: url dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 48 ++++-------------------------------------------- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba9644655..47488f7e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,16 +251,6 @@ dependencies = [ "syn", ] -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "1.0.3" @@ -440,7 +430,7 @@ dependencies = [ "base64", "enum_dispatch", "hex", - "idna 1.0.3", + "idna", "jiter", "num-bigint", "pyo3", @@ -714,42 +704,12 @@ dependencies = [ "zerovec", ] -[[package]] -name = "tinyvec" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - [[package]] name = "unindent" version = "0.2.3" @@ -758,12 +718,12 @@ checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna", "percent-encoding", ] diff --git a/Cargo.toml b/Cargo.toml index 9b32263da..72b57d994 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,7 @@ serde = { version = "1.0.215", features = ["derive"] } speedate = "0.15.0" smallvec = "1.13.2" ahash = "0.8.10" -url = "2.5.0" +url = "2.5.4" # idna is already required by url, added here to be explicit idna = "1.0.3" base64 = "0.22.1" From 571fbcadf780432d0a0bd7cee6e70ca5836ccd12 Mon Sep 17 00:00:00 2001 From: David Hewitt Date: Wed, 12 Feb 2025 14:52:30 +0000 Subject: [PATCH 2/2] update URL error messages --- tests/validators/test_url.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/validators/test_url.py b/tests/validators/test_url.py index e8534a26a..595e501dc 100644 --- a/tests/validators/test_url.py +++ b/tests/validators/test_url.py @@ -125,9 +125,9 @@ def url_test_case_helper( ('http://1...1', Err('invalid IPv4 address')), ('https://[2001:0db8:85a3:0000:0000:8a2e:0370:7334[', Err('invalid IPv6 address')), ('https://[', Err('invalid IPv6 address')), - ('https://example com', Err('invalid domain character')), - ('http://exam%ple.com', Err('invalid domain character')), - ('http:// /', Err('invalid domain character')), + ('https://example com', Err('invalid international domain name')), + ('http://exam%ple.com', Err('invalid international domain name')), + ('http:// /', Err('invalid international domain name')), ('/more', Err('relative URL without a base')), ('http://example.com./foobar', {'str()': 'http://example.com./foobar'}), # works since we're in lax mode @@ -172,7 +172,7 @@ def url_test_case_helper( ('https:more', {'str()': 'https://more/', 'host': 'more'}), ('file:///foobar', {'str()': 'file:///foobar', 'host': None, 'unicode_host()': None}), ('file:///:80', {'str()': 'file:///:80'}), - ('file://:80', Err('invalid domain character')), + ('file://:80', Err('invalid international domain name')), ('foobar://:80', Err('empty host')), # with bashslashes ('file:\\\\foobar\\more', {'str()': 'file://foobar/more', 'host': 'foobar', 'path': '/more'}), @@ -383,7 +383,7 @@ def strict_url_validator_fixture(): ('https:/more', Err('expected //', 'url_syntax_violation')), ('https:more', Err('expected //', 'url_syntax_violation')), ('file:///foobar', {'str()': 'file:///foobar', 'host': None, 'unicode_host()': None}), - ('file://:80', Err('invalid domain character', 'url_parsing')), + ('file://:80', Err('invalid international domain name', 'url_parsing')), ('file:/xx', Err('expected // after file:', 'url_syntax_violation')), ('foobar://:80', Err('empty host', 'url_parsing')), ('mongodb+srv://server.example.com/', 'mongodb+srv://server.example.com/'), @@ -1046,7 +1046,7 @@ def test_zero_schemas(): ( 'http://127.0.0.1%0d%0aConnection%3a%20keep-alive', # dict(scheme='http', host='127.0.0.1%0d%0aconnection%3a%20keep-alive'), CHANGED - Err('Input should be a valid URL, invalid domain character [type=url_parsing,'), + Err('Input should be a valid URL, invalid international domain name [type=url_parsing,'), ), # NodeJS unicode -> double dot ('http://google.com/\uff2e\uff2e/abc', dict(scheme='http', host='google.com', path='/%EF%BC%AE%EF%BC%AE/abc')),