vecna
/
lox
mirror of https://gitlab.torproject.org/vecna/lox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change keys to string to be handled properly in index.js

This commit is contained in:
onyinyang 2023-02-01 00:44:18 -05:00
parent 77d4f8b164
commit 04b4d50ef9
No known key found for this signature in database
GPG Key ID: 156A6435430C2036
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/lox-distributor/src/main.rs
View File

@ -6,7 +6,8 @@ use std::{
}; };
use hyper::{ use hyper::{
body, body::Bytes, body,
body::Bytes,
header::HeaderValue, header::HeaderValue,
server::conn::AddrStream, server::conn::AddrStream,
service::{make_service_fn, service_fn}, service::{make_service_fn, service_fn},
@ -130,12 +131,12 @@ fn generate_invite(db: Arc<Mutex<lox::BridgeDb>>) -> Response<Body> {
fn send_keys(pubkeys_filename: &str) -> Response<Body> { fn send_keys(pubkeys_filename: &str) -> Response<Body> {
let data = fs::read_to_string(pubkeys_filename).expect("Unable to read file"); let data = fs::read_to_string(pubkeys_filename).expect("Unable to read file");
let json_keys = serde_json::to_string(&data).expect("JSON was not well-formatted"); let mut resp = Response::new(Body::from(serde_json::to_string(&data).unwrap()));
let mut resp = Response::new(Body::from(json_keys));
resp.headers_mut() resp.headers_mut()
.insert("Access-Control-Allow-Origin", HeaderValue::from_static("*")); .insert("Access-Control-Allow-Origin", HeaderValue::from_static("*"));
resp resp
} }
fn verify_and_send_open_cred(request: Bytes, ba: Arc<Mutex<BridgeAuth>>) -> Response<Body> { fn verify_and_send_open_cred(request: Bytes, ba: Arc<Mutex<BridgeAuth>>) -> Response<Body> {
let req: proto::open_invite::Request = serde_json::from_slice(&request).unwrap(); let req: proto::open_invite::Request = serde_json::from_slice(&request).unwrap();
let mut ba_obj = ba.lock().unwrap(); let mut ba_obj = ba.lock().unwrap();