YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2025-03-13 06:01:21 +00:00
Code Issues Projects Releases Wiki Activity

update relative redirection links resolver

Browse Source
This commit is contained in:
yggverse 2025-01-23 09:31:25 +02:00
parent b0c4cae517
commit b437a9d190
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/browser/window/tab/item/client/driver/gemini.rs
View File

@ -404,7 +404,26 @@ fn handle(
// Expected target URL in response meta // Expected target URL in response meta
match response.meta.data { match response.meta.data {
Some(data) => match uri.parse_relative(data.as_str(), UriFlags::NONE) { Some(data) => match uri.parse_relative(data.as_str(), UriFlags::NONE) {
Ok(target) => { Ok(absolute) => {
// Base donor scheme could be `titan`, rewrite new relative links resolved with `gemini`
// otherwise, keep original scheme to handle external redirect rules properly
// * in this case, `titan` scheme redirects unexpected
let scheme = absolute.scheme();
let target = Uri::build(
UriFlags::NONE,
&if "titan" == scheme {
scheme.replace("titan", "gemini")
} else {
scheme.to_string()
},
absolute.userinfo().as_deref(),
absolute.host().as_deref(),
absolute.port(),
absolute.path().as_str(),
absolute.query().as_deref(),
absolute.fragment().as_deref(),
);
// Increase client redirection counter
let total = redirects.take() + 1; let total = redirects.take() + 1;
// Validate total redirects by protocol specification // Validate total redirects by protocol specification
if total > 5 { if total > 5 {
@ -415,10 +434,10 @@ fn handle(
subject.tab_page.set_loading(false); subject.tab_page.set_loading(false);
redirects.replace(0); // reset redirects.replace(0); // reset
// Disallow external redirection // Disallow external redirection by protocol restrictions
} else if (target.scheme() != "titan" && target.scheme() != "gemini") } else if "gemini" != target.scheme()
|| uri.port() != target.port() || uri.port() != target.port()
|| uri.host() != target.host() { || uri.host() != target.host() {
let status = subject.page.content.to_status_failure(); let status = subject.page.content.to_status_failure();
status.set_description(Some("External redirects not allowed by protocol specification")); status.set_description(Some("External redirects not allowed by protocol specification"));
subject.page.title.replace(status.title()); subject.page.title.replace(status.title());
@ -435,18 +454,7 @@ fn handle(
.set_text(&uri.to_string()); .set_text(&uri.to_string());
} }
redirects.replace(total); redirects.replace(total);
subject.page.tab_action.load.activate(Some( subject.page.tab_action.load.activate(Some(&target.to_string()), false);
&Uri::build(
UriFlags::NONE,
"gemini",
target.userinfo().as_deref(),
target.host().as_deref(),
target.port(),
target.path().as_str(),
target.query().as_deref(),
target.fragment().as_deref(),
).to_string()
), false);
} }
} }
Err(e) => { Err(e) => {