vecna
/
lox_cli
mirror of https://git-crysp.uwaterloo.ca/vvecna/lox_cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Borrow server_addr rather than cloning it.

This commit is contained in:
Vecna 2023-03-12 10:56:29 -04:00
parent 589b2cc7f7
commit e0583d56a0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/lox_client_2.rs
View File

@ -27,7 +27,7 @@ async fn main() {
serde_json::from_reader(lox_auth_pubkeys_infile).unwrap()
} else {
// download from Lox Auth
let pubkeys = get_lox_auth_keys(server_addr.clone()).await;
let pubkeys = get_lox_auth_keys(&server_addr).await;
// save to file for next time
let mut lox_auth_pubkeys_outfile = File::create(lox_auth_pubkeys_filename).expect("Failed to create lox_auth pubkeys file");
write!(
@ -51,8 +51,8 @@ async fn main() {
serde_json::from_reader(lox_cred_infile).unwrap()
} else {
// get new credential based on an open invite
let open_invite = get_open_invitation(server_addr.clone()).await;
let cred = get_lox_credential(server_addr.clone(), open_invite, lox_pub).await;
let open_invite = get_open_invitation(&server_addr).await;
let cred = get_lox_credential(&server_addr, open_invite, lox_pub).await;
// save to file for next time
let mut lox_cred_outfile = File::create(lox_cred_filename).expect("Failed to create lox credential file");
write!(

16
src/client_lib.rs
View File

@ -30,24 +30,24 @@ fn today(time_offset: Duration) -> u32 {
}
// Download Lox Auth pubkeys
pub async fn get_lox_auth_keys(server_addr: String) -> Vec<IssuerPubKey> {
let lox_auth_pubkeys_resp = net_request(format!("{}/pubkeys", server_addr), [].to_vec()).await;
pub async fn get_lox_auth_keys(server_addr: &str) -> Vec<IssuerPubKey> {
let lox_auth_pubkeys_resp = net_request(server_addr.to_string() + "/pubkeys", [].to_vec()).await;
let lox_auth_pubkeys: Vec<IssuerPubKey> = serde_json::from_slice(&lox_auth_pubkeys_resp).unwrap();
lox_auth_pubkeys
}
// Get an open invitation
pub async fn get_open_invitation(server_addr: String) -> [u8; OPENINV_LENGTH] {
let open_invite_resp = net_request(format!("{}/invite", server_addr), [].to_vec()).await;
pub async fn get_open_invitation(server_addr: &str) -> [u8; OPENINV_LENGTH] {
let open_invite_resp = net_request(server_addr.to_string() + "/invite", [].to_vec()).await;
let open_invite: [u8; OPENINV_LENGTH] = serde_json::from_slice::<Invite>(&open_invite_resp).unwrap().invite;
open_invite
}
// Get a Lox Credential from an open invitation
pub async fn get_lox_credential(server_addr: String, open_invite: [u8; OPENINV_LENGTH], lox_pub: IssuerPubKey) -> lox::cred::Lox {
pub async fn get_lox_credential(server_addr: &str, open_invite: [u8; OPENINV_LENGTH], lox_pub: IssuerPubKey) -> lox::cred::Lox {
let (open_inv_req, state) = open_invite::request(&open_invite);
let encoded_open_inv_req: Vec<u8> = serde_json::to_vec(&open_inv_req).unwrap();
let encoded_open_inv_resp = net_request(format!("{}/openreq", server_addr), encoded_open_inv_req).await;
let encoded_open_inv_resp = net_request(server_addr.to_string() + "/openreq", encoded_open_inv_req).await;
let decoded_open_inv_resp: open_invite::Response = serde_json::from_slice(&encoded_open_inv_resp).unwrap();
let (cred, bridgeline) = open_invite::handle_response(state, decoded_open_inv_resp, &lox_pub).unwrap();
cred
@ -55,10 +55,10 @@ pub async fn get_lox_credential(server_addr: String, open_invite: [u8; OPENINV_L
}
// Get a migration credential to migrate to higher trust
pub async fn trust_promotion(server_addr: String, lox_cred: lox::cred::Lox, lox_pub: IssuerPubKey) -> lox::cred::Migration {
pub async fn trust_promotion(server_addr: &str, lox_cred: lox::cred::Lox, lox_pub: IssuerPubKey) -> lox::cred::Migration {
let (prom_req, state) = trust_promotion::request(&lox_cred, &lox_pub, today(Duration::ZERO)).unwrap();
let encoded_prom_req: Vec<u8> = serde_json::to_vec(&prom_req).unwrap();
let encoded_prom_resp = net_request(format!("{}/promreq", server_addr), encoded_prom_req).await;
let encoded_prom_resp = net_request(server_addr.to_string() + "/promreq", encoded_prom_req).await;
let decoded_prom_resp: trust_promotion::Response = serde_json::from_slice(&encoded_prom_resp).unwrap();
let migration_cred = trust_promotion::handle_response(state, decoded_prom_resp).unwrap();
migration_cred