YGGverse/ggemini
1
0
Fork 0
mirror of https://github.com/YGGverse/ggemini.git synced 2026-03-31 17:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for uri starts with double slash

Browse source
This commit is contained in:
yggverse 2025-03-15 13:16:14 +02:00
parent e3abd89c9d
commit 0523f67850
2 changed files with 82 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

123
src/client/connection/response/redirect.rs
View file

@ -54,8 +54,32 @@ impl Redirect {
// > it is up to the client which fragment to apply.
None, // @TODO
)
.parse_relative(self.target(), UriFlags::NONE)
{
.parse_relative(
&{
// URI started with double slash yet not supported by Glib function
// https://datatracker.ietf.org/doc/html/rfc3986#section-4.2
let t = self.target();
match t.strip_prefix("//") {
Some(p) => {
let postfix = p.trim_start_matches(":");
format!(
"{}://{}",
base.scheme(),
if postfix.is_empty() {
match base.host() {
Some(h) => format!("{h}/"),
None => return Err(Error::BaseHost),
}
} else {
postfix.to_string()
}
)
}
None => t.to_string(),
}
},
UriFlags::NONE,
) {
Ok(absolute) => Ok(absolute),
Err(e) => Err(Error::Uri(e)),
}
@ -127,50 +151,59 @@ fn target(value: Option<&GStringPtr>) -> Result<String, Error> {
}
#[test]
fn test_from_str() {
fn test() {
use std::str::FromStr;
{
let temporary = Redirect::from_str("30 /uri\r\n").unwrap();
assert_eq!(temporary.target(), "/uri");
assert_eq!(temporary.to_code(), TEMPORARY.0);
assert_eq!(temporary.to_string(), TEMPORARY.1);
let temporary = Redirect::from_str("30 /uri\r\n").unwrap();
assert_eq!(temporary.target(), "/uri");
assert_eq!(temporary.to_code(), TEMPORARY.0);
assert_eq!(temporary.to_string(), TEMPORARY.1);
let permanent = Redirect::from_str("31 /uri\r\n").unwrap();
assert_eq!(permanent.target(), "/uri");
assert_eq!(permanent.to_code(), PERMANENT.0);
assert_eq!(permanent.to_string(), PERMANENT.1);
}
{
let base = Uri::build(
UriFlags::NONE,
"gemini",
None,
Some("geminiprotocol.net"),
-1,
"/path/",
Some("query"),
Some("fragment"),
);
let permanent = Redirect::from_str("31 /uri\r\n").unwrap();
assert_eq!(permanent.target(), "/uri");
assert_eq!(permanent.to_code(), PERMANENT.0);
assert_eq!(permanent.to_string(), PERMANENT.1);
}
#[test]
fn test_to_uri() {
use std::str::FromStr;
let request = Uri::build(
UriFlags::NONE,
"gemini",
None,
Some("geminiprotocol.net"),
-1,
"/path/",
Some("query"),
Some("fragment"),
);
let resolve = Redirect::from_str("30 /uri\r\n").unwrap();
assert_eq!(
resolve.to_uri(&request).unwrap().to_string(),
"gemini://geminiprotocol.net/uri"
);
let resolve = Redirect::from_str("30 uri\r\n").unwrap();
assert_eq!(
resolve.to_uri(&request).unwrap().to_string(),
"gemini://geminiprotocol.net/path/uri"
);
let resolve = Redirect::from_str("30 gemini://test.host/uri\r\n").unwrap();
assert_eq!(
resolve.to_uri(&request).unwrap().to_string(),
"gemini://test.host/uri"
);
let resolve = Redirect::from_str("30 /uri\r\n").unwrap();
assert_eq!(
resolve.to_uri(&base).unwrap().to_string(),
"gemini://geminiprotocol.net/uri"
);
let resolve = Redirect::from_str("30 uri\r\n").unwrap();
assert_eq!(
resolve.to_uri(&base).unwrap().to_string(),
"gemini://geminiprotocol.net/path/uri"
);
let resolve = Redirect::from_str("30 gemini://test.host/uri\r\n").unwrap();
assert_eq!(
resolve.to_uri(&base).unwrap().to_string(),
"gemini://test.host/uri"
);
let resolve = Redirect::from_str("30 //\r\n").unwrap();
assert_eq!(
resolve.to_uri(&base).unwrap().to_string(),
"gemini://geminiprotocol.net/"
);
let resolve = Redirect::from_str("30 //:\r\n").unwrap();
assert_eq!(
resolve.to_uri(&base).unwrap().to_string(),
"gemini://geminiprotocol.net/"
);
}
}

4
src/client/connection/response/redirect/error.rs
View file

@ -5,6 +5,7 @@ use std::{
#[derive(Debug)]
pub enum Error {
BaseHost,
Uri(glib::Error),
Protocol,
Target,
@ -14,6 +15,9 @@ pub enum Error {
impl Display for Error {
fn fmt(&self, f: &mut Formatter) -> Result {
match self {
Self::BaseHost => {
write!(f, "Base host required")
}
Self::Uri(e) => {
write!(f, "URI error: {e}")
}