gsadmin/Firelink
1
0
Fork 0
mirror of https://github.com/nimbold/Firelink.git synced 2026-07-26 12:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(extension): align desktop handoff protocol

Browse Source
This commit is contained in:
NimBold
2026-06-22 11:55:58 +03:30
parent f1ee3812ed
commit db4adc7f89
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Extensions/Firefox
+1 -1
Submodule Extensions/Firefox updated: 330142590b...bde440f5e1
src-tauri/src/extension_server.rs
+40 -2
View File
@@ -1,7 +1,9 @@
use axum::{
body::Bytes,
body::{Body, Bytes},
extract::State,
http::{HeaderMap, Method, StatusCode},
http::{HeaderMap, HeaderValue, Method, Request, StatusCode},
middleware::{self, Next},
response::Response,
routing::{get, post},
Router,
};
@@ -23,6 +25,7 @@ pub const EXTENSION_SERVER_PORT: u16 = 6412;
pub const EXTENSION_SERVER_PORT_RANGE: std::ops::RangeInclusive<u16> = EXTENSION_SERVER_PORT..=6422;
const MAX_URL_COUNT: usize = 200;
const SIGNATURE_MAX_AGE_MS: u64 = 60_000;
const SERVER_HEADER: &str = "x-firelink-server";
type HmacSha256 = Hmac<Sha256>;
pub type SharedExtensionToken = Arc<RwLock<String>>;
@@ -90,6 +93,7 @@ pub async fn start_server(
.route("/ping", get(ping_handler))
.route("/download", post(download_handler))
.layer(cors)
.layer(middleware::from_fn(add_server_identity))
.with_state(state);
let (port, listener) = bind_extension_listener().await?;
@@ -116,6 +120,14 @@ pub async fn start_server(
server_result
}
async fn add_server_identity(request: Request<Body>, next: Next) -> Response {
let mut response = next.run(request).await;
response
.headers_mut()
.insert(SERVER_HEADER, HeaderValue::from_static("1"));
response
}
async fn bind_extension_listener() -> Result<(u16, tokio::net::TcpListener), String> {
let mut errors = Vec::new();
for port in EXTENSION_SERVER_PORT_RANGE {
@@ -359,3 +371,29 @@ fn is_allowed_origin(origin: &str) -> bool {
.ok()
.is_some_and(|url| matches!(url.scheme(), "moz-extension" | "chrome-extension"))
}
#[cfg(test)]
mod tests {
use super::{add_server_identity, SERVER_HEADER};
use axum::{http::StatusCode, middleware, routing::get, Router};
#[tokio::test]
async fn identifies_every_extension_server_response() {
let app = Router::new()
.route("/ping", get(|| async { StatusCode::FORBIDDEN }))
.layer(middleware::from_fn(add_server_identity));
let listener = tokio::net::TcpListener::bind(("127.0.0.1", 0))
.await
.unwrap();
let address = listener.local_addr().unwrap();
let server = tokio::spawn(async move {
axum::serve(listener, app).await.unwrap();
});
let response = reqwest::get(format!("http://{address}/ping")).await.unwrap();
assert_eq!(response.status(), StatusCode::FORBIDDEN);
assert_eq!(response.headers().get(SERVER_HEADER).unwrap(), "1");
server.abort();
}
}
src-tauri/src/lib.rs
+10
View File
@@ -3676,6 +3676,16 @@ pub fn run() {
let database = crate::db::init(app.handle())
.map_err(|error| format!("failed to initialize persistence: {error}"))?;
let initial_pairing_token = {
let mut connection = database.lock()?;
crate::db::hydrate_pairing_token(&mut connection)?.0
};
{
let mut pairing_token = extension_pairing_token
.write()
.map_err(|_| "extension pairing token lock is unavailable".to_string())?;
*pairing_token = initial_pairing_token;
}
app.manage(database);
let max_concurrent = {