Ryan/drop-app
1
0
Fork 0
mirror of https://github.com/Drop-OSS/drop-app.git synced 2025-11-16 17:51:23 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into download-manager

Browse Source
This commit is contained in:
DecDuck
2024-12-09 21:20:44 +11:00
parent 8d9234f82a 7a3841bf0c
commit bb60942558
9 changed files with 1104 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src-tauri/src/auth.rs
View File

@ -4,6 +4,7 @@ use std::{
time::{SystemTime, UNIX_EPOCH},
};
use chrono::Utc;
use log::{info, warn};
use openssl::{ec::EcKey, hash::MessageDigest, pkey::PKey, sign::Signer};
use serde::{Deserialize, Serialize};
@ -57,11 +58,7 @@ pub fn generate_authorization_header() -> String {
db.auth.clone().unwrap()
};
let start = SystemTime::now();
let timestamp = start
.duration_since(UNIX_EPOCH)
.expect("Time went backwards");
let nonce = timestamp.as_millis().to_string();
let nonce = Utc::now().timestamp_millis().to_string();
let signature = sign_nonce(certs.private, nonce.clone()).unwrap();
@ -139,8 +136,9 @@ pub fn recieve_handshake(app: AppHandle, path: String) {
app.emit("auth/processing", ()).unwrap();
let handshake_result = recieve_handshake_logic(&app, path);
if handshake_result.is_err() {
app.emit("auth/failed", ()).unwrap();
if let Err(e) = handshake_result {
warn!("error with authentication: {}", e);
app.emit("auth/failed", e.to_string()).unwrap();
return;
}
@ -200,7 +198,6 @@ pub fn retry_connect(state: tauri::State<'_, Mutex<AppState>>) -> Result<(), ()>
pub fn setup() -> Result<(AppStatus, Option<User>), ()> {
let data = DB.borrow_data().unwrap();
// If we have certs, exit for now
if data.auth.is_some() {
let user_result = fetch_user();
if user_result.is_err() {