YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-08 12:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

handle "empty" domain

Browse source
This commit is contained in:
yggverse 2026-03-31 16:57:26 +03:00
parent aa799a482e
commit 0cbf702aba
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/main.rs
View file

@ -570,24 +570,35 @@ where
return Err((BAD_REQUEST, "URL contains fragment or userinfo"));
}
// correct host
let Some(domain) = url.domain() else {
return Err((BAD_REQUEST, "URL does not contain a domain"));
let host = match url.domain() {
Some(domain) => {
// because the gemini scheme is not special enough for WHATWG, normalize
// it ourselves
let host = Host::parse(
&percent_decode_str(domain)
.decode_utf8()
.or(Err((BAD_REQUEST, "Invalid URL")))?,
)
.or(Err((BAD_REQUEST, "Invalid URL")))?;
// TODO: simplify when <https://github.com/servo/rust-url/issues/586> resolved
url.set_host(Some(&host.to_string()))
.expect("invalid domain?");
Some(host)
}
None => {
url.set_host(None).expect("invalid domain?");
None
}
};
// because the gemini scheme is not special enough for WHATWG, normalize
// it ourselves
let host = Host::parse(
&percent_decode_str(domain)
.decode_utf8()
.or(Err((BAD_REQUEST, "Invalid URL")))?,
)
.or(Err((BAD_REQUEST, "Invalid URL")))?;
// TODO: simplify when <https://github.com/servo/rust-url/issues/586> resolved
url.set_host(Some(&host.to_string()))
.expect("invalid domain?");
// do not use "contains" here since it requires the same type and does
// not allow to check for Host<&str> if the vec contains Hostname<String>
if !ARGS.hostnames.is_empty() && !ARGS.hostnames.iter().any(|h| h == &host) {
if !ARGS.hostnames.is_empty()
&& !ARGS
.hostnames
.iter()
.any(|h| host.as_ref().is_some_and(|this| this == h))
{
return Err((PROXY_REQUEST_REFUSED, "Proxy request refused"));
}