Upgrade dependencies

This commit is contained in:
Ethan O'Brien
2026-02-19 10:33:15 -06:00
parent 0ef0a83685
commit b35aa35b1a
9 changed files with 574 additions and 307 deletions

846
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -4,12 +4,12 @@ version = "1.0.0"
edition = "2024" edition = "2024"
[dependencies] [dependencies]
actix-web = "4.12" actix-web = "4.13"
rusqlite = { version = "0.37.0", features = ["bundled"] } rusqlite = { version = "0.38.0", features = ["bundled"] }
clap = { version = "4.5.37", features = ["derive"]} clap = { version = "4.5.59", features = ["derive"]}
base64 = "0.22.1" base64 = "0.22.1"
json = "0.12.4" json = "0.12.4"
rand = "0.9.2" rand = "0.10.0"
lazy_static = "1.5.0" lazy_static = "1.5.0"
hex = "0.4.3" hex = "0.4.3"
hmac = "0.12.1" hmac = "0.12.1"
@@ -17,8 +17,8 @@ md5 = "0.8.0"
urlencoding = "2.1.3" urlencoding = "2.1.3"
sha1 = "0.10.6" sha1 = "0.10.6"
substring = "1.4.5" substring = "1.4.5"
uuid = { version = "1.18.1", features = ["v7"] } uuid = { version = "1.21.0", features = ["v7"] }
rsa = { version = "0.9.9", features = ["sha1"] } rsa = { version = "0.9.10", features = ["sha1"] }
mime = "0.3.17" mime = "0.3.17"
sha2 = "0.10.9" sha2 = "0.10.9"
include-flate-codegen = "0.3.1" include-flate-codegen = "0.3.1"
@@ -26,19 +26,19 @@ libflate = "2.2.1"
cbc = { version = "0.1.2", features = ["alloc"] } cbc = { version = "0.1.2", features = ["alloc"] }
aes = "0.8.4" aes = "0.8.4"
pem = "3.0.6" pem = "3.0.6"
ureq = "3.1.4" ureq = "3.2.0"
mime_guess = "2.0.5" mime_guess = "2.0.5"
include_dir = "0.7.4" include_dir = "0.7.4"
[target.aarch64-linux-android.dependencies] [target.aarch64-linux-android.dependencies]
jni = { version = "0.21.1", features = ["invocation", "default"], optional = true } jni = { version = "0.22.0", features = ["invocation", "default"], optional = true }
[target.aarch64-apple-ios.dependencies] [target.aarch64-apple-ios.dependencies]
objc2 = { version = "0.6.3", optional = true } objc2 = { version = "0.6.3", optional = true }
objc2-foundation = { version = "0.3.2", features = ["NSFileManager"], optional = true } objc2-foundation = { version = "0.3.2", features = ["NSFileManager"], optional = true }
[build-dependencies] [build-dependencies]
cc = "1.0" cc = "1.2"
# To enable this library you MUST comment out lib block below and add --features library # To enable this library you MUST comment out lib block below and add --features library
[features] [features]

View File

@@ -1,5 +1,5 @@
use base64::{Engine as _, engine::general_purpose}; use base64::{Engine as _, engine::general_purpose};
use rand::Rng; use rand::RngExt;
use aes::cipher::BlockEncryptMut; use aes::cipher::BlockEncryptMut;
use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, KeyIvInit}; use aes::cipher::{block_padding::Pkcs7, BlockDecryptMut, KeyIvInit};

View File

@@ -1,6 +1,6 @@
use json::{JsonValue, object, array}; use json::{JsonValue, object, array};
use actix_web::HttpRequest; use actix_web::HttpRequest;
use rand::Rng; use rand::RngExt;
use crate::encryption; use crate::encryption;
use crate::include_file; use crate::include_file;

View File

@@ -1,5 +1,5 @@
use json::{array, object, JsonValue}; use json::{array, object, JsonValue};
use rand::Rng; use rand::RngExt;
use actix_web::{HttpRequest, http::header::{HeaderMap, HeaderValue}}; use actix_web::{HttpRequest, http::header::{HeaderMap, HeaderValue}};
use crate::encryption; use crate::encryption;

View File

@@ -1,6 +1,6 @@
use json::{object, array, JsonValue}; use json::{object, array, JsonValue};
use actix_web::{HttpRequest}; use actix_web::{HttpRequest};
use rand::Rng; use rand::RngExt;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use crate::router::{global, userdata, items, databases}; use crate::router::{global, userdata, items, databases};

View File

@@ -1,6 +1,6 @@
use json::{array, object, JsonValue}; use json::{array, object, JsonValue};
use actix_web::{HttpRequest}; use actix_web::{HttpRequest};
use rand::Rng; use rand::RngExt;
use crate::router::{global, userdata, items, databases}; use crate::router::{global, userdata, items, databases};
use crate::encryption; use crate::encryption;

View File

@@ -3,7 +3,7 @@ pub mod user;
use rusqlite::params; use rusqlite::params;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use json::{JsonValue, array, object}; use json::{JsonValue, array, object};
use rand::Rng; use rand::RngExt;
use crate::router::global; use crate::router::global;
use crate::router::items; use crate::router::items;
@@ -430,7 +430,8 @@ pub fn webui_login(uid: i64, password: &str) -> Result<String, String> {
let new_token = create_webui_token(); let new_token = create_webui_token();
DATABASE.lock_and_exec("DELETE FROM webui WHERE user_id=?1", params!(uid)); DATABASE.lock_and_exec("DELETE FROM webui WHERE user_id=?1", params!(uid));
DATABASE.lock_and_exec("INSERT INTO webui (user_id, token, last_login) VALUES (?1, ?2, ?3)", params!(uid, new_token, global::timestamp())); // This could overflow given enough time... though rusqlite doesnt currently support ToSql on a u64...... maybe someday
DATABASE.lock_and_exec("INSERT INTO webui (user_id, token, last_login) VALUES (?1, ?2, ?3)", params!(uid, new_token, global::timestamp() as i64));
Ok(new_token) Ok(new_token)
} }

View File

@@ -1,7 +1,7 @@
use rusqlite::params; use rusqlite::params;
use json::{JsonValue, object}; use json::{JsonValue, object};
use crate::router::userdata; use crate::router::userdata;
use rand::Rng; use rand::RngExt;
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use base64::{Engine as _, engine::general_purpose}; use base64::{Engine as _, engine::general_purpose};