Scheme-relative URLs are no longer allowed

https://lists.orbitalfox.eu/archives/gemini/2020/003646.html
This commit is contained in:
Matt Brubeck 2021-01-01 20:09:52 -08:00
parent c563f27b1a
commit 1361f07467

View file

@ -147,15 +147,10 @@ async fn parse_request(stream: &mut TlsStream<TcpStream>) -> std::result::Result
} }
buf = &mut request[len..]; buf = &mut request[len..];
} }
let request = std::str::from_utf8(&request[..len - 2]).or(Err((59, "Invalid URL")))?; let request = std::str::from_utf8(&request[..len - 2]).or(Err((59, "Non-UTF-8 request")))?;
log::info!("Got request for {:?}", request); log::info!("Got request for {:?}", request);
// Handle scheme-relative URLs. let url = Url::parse(request).or(Err((59, "Invalid URL")))?;
let url = if request.starts_with("//") {
Url::parse(&format!("gemini:{}", request))
} else {
Url::parse(request)
}.or(Err((59, "Invalid URL")))?;
// Validate the URL, host and port. // Validate the URL, host and port.
if url.scheme() != "gemini" { if url.scheme() != "gemini" {