From 6b05499d3f42f3522fb549838b80148a4cbdce23 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 10 Aug 2020 15:21:53 +0200 Subject: [PATCH] url: reject empty host after toAscii conversion Per the change in https://github.com/whatwg/url/pull/497. --- src/host.rs | 3 +++ tests/setters_tests.json | 20 -------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/host.rs b/src/host.rs index 02bae9e25..67370a19a 100644 --- a/src/host.rs +++ b/src/host.rs @@ -82,6 +82,9 @@ impl Host { } let domain = percent_decode(input.as_bytes()).decode_utf8_lossy(); let domain = idna::domain_to_ascii(&domain)?; + if domain.is_empty() { + return Err(ParseError::EmptyHost); + } if domain .find(|c| { matches!( diff --git a/tests/setters_tests.json b/tests/setters_tests.json index db23d9247..3df1991f1 100644 --- a/tests/setters_tests.json +++ b/tests/setters_tests.json @@ -950,16 +950,6 @@ "port": "" } }, - { - "href": "file://hi/x", - "new_value": "", - "expected": { - "href": "file:///x", - "host": "", - "hostname": "", - "port": "" - } - }, { "href": "sc://test@test/", "new_value": "", @@ -1284,16 +1274,6 @@ "port": "" } }, - { - "href": "file://hi/x", - "new_value": "", - "expected": { - "href": "file:///x", - "host": "", - "hostname": "", - "port": "" - } - }, { "href": "sc://test@test/", "new_value": "",