yindo/drop-app
1
0
Fork 0
forked from Drop-OSS/archived-drop-app
Code Pull Requests Actions Activity

Merge remote-tracking branch 'origin/store' into release-prep

Browse Source
This commit is contained in:
DecDuck
2026-01-29 20:44:09 +11:00
parent 7092800159 285e5e4c51
commit 43e58bbb87
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/drop-base

Submodule libs/drop-base updated: 14f4e3e20b...04125e89be

2
src-tauri/process/src/process_manager.rs
View File

@@ -453,7 +453,7 @@ impl ProcessManager<'_> {
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
let mut command = Command::new("cmd"); let mut command = Command::new("cmd");
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
command.raw_arg(format!("/C \"{}\"", &launch_string)); command.raw_arg(format!("/C \"{}\"", &launch_parameters.0));
info!( info!(
"launching (in {}): {}", "launching (in {}): {}",

13
src-tauri/remote/src/server_proto.rs
View File

@@ -1,6 +1,6 @@
use database::borrow_db_checked; use database::borrow_db_checked;
use http::{ use http::{
HeaderMap, HeaderValue, Request, Response, StatusCode, Uri, header::USER_AGENT, HeaderMap, HeaderValue, Request, Response, StatusCode, Uri, header::{CONTENT_SECURITY_POLICY, USER_AGENT, X_FRAME_OPTIONS},
}; };
use log::{error, warn}; use log::{error, warn};
use tauri::UriSchemeResponder; use tauri::UriSchemeResponder;
@@ -30,7 +30,7 @@ pub async fn handle_server_proto_wrapper(request: Request<Vec<u8>>, responder: U
match handle_server_proto(request).await { match handle_server_proto(request).await {
Ok(r) => responder.respond(r), Ok(r) => responder.respond(r),
Err(e) => { Err(e) => {
warn!("Cache error: {e}"); warn!("server proto error: {e}");
responder.respond( responder.respond(
Response::builder() Response::builder()
.status(e) .status(e)
@@ -84,12 +84,13 @@ async fn handle_server_proto(request: Request<Vec<u8>>) -> Result<Response<Vec<u
let response = match DROP_CLIENT_ASYNC let response = match DROP_CLIENT_ASYNC
.request(request.method().clone(), new_uri.to_string()) .request(request.method().clone(), new_uri.to_string())
.headers(headers) .headers(headers)
.body(request.body().clone()) // TODO: refactor this into a move
.send() .send()
.await .await
{ {
Ok(response) => response, Ok(response) => response,
Err(e) => { Err(e) => {
warn!("Could not send response. Got {e} when sending"); warn!("Could not send response. Got {e:?} when sending");
return Err(e.status().unwrap_or(StatusCode::BAD_REQUEST)); return Err(e.status().unwrap_or(StatusCode::BAD_REQUEST));
} }
}; };
@@ -102,6 +103,12 @@ async fn handle_server_proto(request: Request<Vec<u8>>) -> Result<Response<Vec<u
{ {
let client_response_headers = client_http_response.headers_mut().unwrap(); let client_response_headers = client_http_response.headers_mut().unwrap();
for (header, header_value) in response.headers() { for (header, header_value) in response.headers() {
if header == CONTENT_SECURITY_POLICY {
continue;
}
if header == X_FRAME_OPTIONS {
continue;
}
client_response_headers.insert(header, header_value.clone()); client_response_headers.insert(header, header_value.clone());
} }
}; };