Skip to content

feat(http): allow setting origin for unsafe headers #1392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amrbashir merged 5 commits into from
May 30, 2024
Merged

feat(http): allow setting origin for unsafe headers #1392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
daf19f2
feat(http): allow setting `origin` for unsafe headers
amrbashir May 30, 2024
6a5e6a0
clippy
amrbashir May 30, 2024
d3d3f80
Update .changes/http-origin-unsafe.md
amrbashir May 30, 2024
633a2e9
Update commands.rs
amrbashir May 30, 2024
9a55862
set origin not full url
amrbashir May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/http-origin-unsafe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"http": "patch"
"http-js": "patch"
---

Allow setting `Origin` header when `unsafe-headers` feature flag is active.
63 changes: 39 additions & 24 deletions plugins/http/src/commands.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,29 +201,7 @@ pub async fn fetch<R: Runtime>(
for (name, value) in &headers {
let name = HeaderName::from_bytes(name.as_bytes())?;
#[cfg(not(feature = "unsafe-headers"))]
if matches!(
name,
// forbidden headers per fetch spec https://fetch.spec.whatwg.org/#terminology-headers
header::ACCEPT_CHARSET
| header::ACCEPT_ENCODING
| header::ACCESS_CONTROL_REQUEST_HEADERS
| header::ACCESS_CONTROL_REQUEST_METHOD
| header::CONNECTION
| header::CONTENT_LENGTH
| header::COOKIE
| header::DATE
| header::DNT
| header::EXPECT
| header::HOST
| header::ORIGIN
| header::REFERER
| header::SET_COOKIE
| header::TE
| header::TRAILER
| header::TRANSFER_ENCODING
| header::UPGRADE
| header::VIA
) {
if is_unsafe_header(&name) {
continue;
}

Expand All @@ -246,7 +224,14 @@ pub async fn fetch<R: Runtime>(
request = request.header(header::USER_AGENT, "tauri-plugin-http");
}

request = request.header(header::ORIGIN, webview.url()?.as_str());
if !(cfg!(feature = "unsafe-headers")
&& headers.contains_key(header::ORIGIN.as_str()))
{
if let Ok(url) = webview.url() {
request =
request.header(header::ORIGIN, url.origin().ascii_serialization());
}
}

if let Some(data) = data {
request = request.body(data);
Expand Down Expand Up @@ -343,3 +328,33 @@ pub(crate) async fn fetch_read_body<R: Runtime>(
let res = Arc::into_inner(res).unwrap().0;
Ok(tauri::ipc::Response::new(res.bytes().await?.to_vec()))
}

// forbidden headers per fetch spec https://fetch.spec.whatwg.org/#terminology-headers
#[cfg(not(feature = "unsafe-headers"))]
fn is_unsafe_header(header: &HeaderName) -> bool {
matches!(
*header,
header::ACCEPT_CHARSET
| header::ACCEPT_ENCODING
| header::ACCESS_CONTROL_REQUEST_HEADERS
| header::ACCESS_CONTROL_REQUEST_METHOD
| header::CONNECTION
| header::CONTENT_LENGTH
| header::COOKIE
| header::DATE
| header::DNT
| header::EXPECT
| header::HOST
| header::ORIGIN
| header::REFERER
| header::SET_COOKIE
| header::TE
| header::TRAILER
| header::TRANSFER_ENCODING
| header::UPGRADE
| header::VIA
) || {
let lower = header.as_str().to_lowercase();
lower.starts_with("proxy-") || lower.starts_with("sec-")
}
}