tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-11-28 03:47:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): use entire request URL on dev server proxy (#5819)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2022-12-12 17:59:39 -08:00 committed by GitHub
parent 8f47825aac
commit a9b4cf20a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/fix-dev-server-proxy-path.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri": patch
---
Properly proxy dev server requests with query strings and fragments.

31
core/tauri/src/manager.rs
View File

@ -886,18 +886,26 @@ impl<R: Runtime> WindowManager<R> {
) -> Box<dyn Fn(&HttpRequest) -> Result<HttpResponse, Box<dyn std::error::Error>> + Send + Sync>
{
#[cfg(dev)]
let url = self.get_url().into_owned();
let url = {
let mut url = self.get_url().as_str().to_string();
if url.ends_with('/') {
url.pop();
}
url
};
#[cfg(not(dev))]
let manager = self.clone();
let window_origin = window_origin.to_string();
Box::new(move |request| {
let path = request
.uri()
.split(&['?', '#'][..])
// ignore query string and fragment
.next()
.unwrap()
// use the entire URI as we are going to proxy the request
#[cfg(dev)]
let path = request.uri();
// ignore query string and fragment
#[cfg(not(dev))]
let path = request.uri().split(&['?', '#'][..]).next().unwrap();
let path = path
.strip_prefix("tauri://localhost")
.map(|p| p.to_string())
// the `strip_prefix` only returns None when a request is made to `https://tauri.$P` on Windows
@ -910,9 +918,12 @@ impl<R: Runtime> WindowManager<R> {
#[cfg(dev)]
let mut response = {
use attohttpc::StatusCode;
let mut url = url.clone();
url.set_path(&path);
let mut proxy_builder = attohttpc::get(url.as_str()).danger_accept_invalid_certs(true);
let decoded_path = percent_encoding::percent_decode(path.as_bytes())
.decode_utf8_lossy()
.to_string();
let url = format!("{url}{decoded_path}");
println!("request url {url}, original path {path}, decoded {decoded_path}");
let mut proxy_builder = attohttpc::get(&url).danger_accept_invalid_certs(true);
for (name, value) in request.headers() {
proxy_builder = proxy_builder.header(name, value);
}