dependency updates, fix changed method name, add base64

This commit is contained in:
Mario Voigt 2025-03-07 01:41:27 +01:00
parent bd46188d6e
commit de0deaa638
10 changed files with 2166 additions and 1120 deletions

3064
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,8 @@
[package] [package]
name = "difluoroborane" name = "difluoroborane"
version = "0.4.2" version = "0.4.4"
authors = [ "dequbed <me@dequbed.space>" authors = [ "Jonathan Krebs <jonathan.krebs@bruckbu.de>"
, "dequbed <me@dequbed.space>"
, "Kai Jan Kriegel <kai@kjkriegel.de>" , "Kai Jan Kriegel <kai@kjkriegel.de>"
, "Joseph Langosch <thejoklla@gmail.com>" , "Joseph Langosch <thejoklla@gmail.com>"
, "Jannis Rieger <omniskopus@gmail.com>" , "Jannis Rieger <omniskopus@gmail.com>"
@ -29,24 +30,24 @@ path = "bin/bffhd/main.rs"
test = false test = false
[dependencies] [dependencies]
libc = "0.2.101" libc = "0.2.169"
nix = "0.23.1" nix = "0.29.0"
uuid = { version = "0.8.2", features = ["serde", "v4"] } uuid = { version = "1.13.1", features = ["serde", "v4"] }
async-trait = "0.1.51" async-trait = "0.1.86"
pin-utils = "0.1.0" pin-utils = "0.1.0"
futures-util = "0.3" futures-util = "0.3.31"
futures-lite = "1.12.0" futures-lite = "2.6.0"
async-net = "1.6.1" async-net = "2.0.0"
async-io = "1.7.0" async-io = "2.4.0"
async-process = "1.4.0" async-process = "2.3.0"
backtrace = "0.3.65" backtrace = "0.3.74"
miette = { version = "4.7.1", features = ["fancy"] } base64 = "0.22.1"
thiserror = "1.0.31" miette = { version = "7.5.0", features = ["fancy"] }
toml = "0.5.8" thiserror = "2.0.11"
base64 = "0.21" toml = "0.5.11"
# Well-known paths/dirs for e.g. cache # Well-known paths/dirs for e.g. cache
dirs = "4.0.0" dirs = "6.0.0"
# Runtime # Runtime
executor = { path = "runtime/executor" } executor = { path = "runtime/executor" }
@ -54,64 +55,64 @@ lightproc = { path = "runtime/lightproc" }
console = { path = "runtime/console" } console = { path = "runtime/console" }
# Catch&Handle POSIX process signals # Catch&Handle POSIX process signals
signal-hook = "0.3.13" signal-hook = "0.3.17"
signal-hook-async-std = "0.2.2" signal-hook-async-std = "0.2.2"
# Argument parsing for bin/bffhd.rs # Argument parsing for bin/bffhd.rs
clap = { version = "3.1.6", features = ["cargo"] } clap = { version = "3.2.22", features = ["cargo"] }
# Internal Databases # Internal Databases
lmdb-rkv = "0.14.0" lmdb-rkv = "0.14.0"
rkyv = { version = "0.7", features = [] } rkyv = { version = "0.7.45", features = [] }
ptr_meta = "0.1" ptr_meta = "0.1.4"
rkyv_typename = "0.7" rkyv_typename = "0.7.44"
rkyv_dyn = "0.7" rkyv_dyn = "0.7.44"
inventory = "0.1" inventory = "0.3.19"
linkme = "0.3" linkme = "0.3.31"
chrono = { version = "0.4", features = ["serde"] } chrono = { version = "0.4.39", features = ["serde"] }
# Password hashing for internal users # Password hashing for internal users
rust-argon2 = "0.8.3" rust-argon2 = "2.1.0"
rand = "0.8.4" rand = "0.8.4"
# Async aware logging and tracing # Async aware logging and tracing
tracing = "0.1" tracing = "0.1.41"
tracing-subscriber = { version = "0.3", features = ["env-filter", "registry", "std"] } tracing-subscriber = { version = "0.3.19", features = ["env-filter", "registry", "std"] }
tracing-futures = { version = "0.2", features = ["futures-03"] } tracing-futures = { version = "0.2.5", features = ["futures-03"] }
# API # API
api = { path = "api" } api = { path = "api" }
capnp = "0.14" capnp = "0.16.1"
capnp-rpc = "0.14.1" capnp-rpc = "0.16.2"
# API Authentication # API Authentication
desfire = "0.2.0-alpha3" desfire = "0.2.0-alpha3"
hex = { version = "0.4.3", features = ["serde"] } hex = { version = "0.4.3", features = ["serde"] }
futures-signals = "0.3.22" futures-signals = "0.3.34"
async-oneshot = "0.5" async-oneshot = "0.5.9"
async-channel = "1.6" async-channel = "2.3.1"
# Config and Database (De)Serialization # Config and Database (De)Serialization
serde = { version = "1.0.130", features = ["derive"] } serde = { version = "1.0.217", features = ["derive"] }
erased-serde = "0.3" erased-serde = "0.4.5"
serde_dhall = { version = "0.10.1", default-features = false } serde_dhall = { version = "0.12.1", default-features = false }
serde_json = "1.0" serde_json = "1.0.138"
once_cell = "1.8" once_cell = "1.20.3"
lazy_static = "1.4.0" lazy_static = "1.5.0"
rustls = "0.20" rustls = "0.20.9"
rustls-pemfile = "0.3.0" rustls-pemfile = "1.0.4"
futures-rustls = "0.22" futures-rustls = "0.22.2"
rumqttc = "0.11.0" rumqttc = "0.11.0"
async-compat = "0.2.1" async-compat = "0.2.4"
url = "2.2.2" url = "2.5.4"
rustls-native-certs = "0.6.1" rustls-native-certs = "0.6.3"
shadow-rs = "0.11" shadow-rs = "0.38.1"
[dependencies.rsasl] [dependencies.rsasl]
version = "2.2.0" version = "2.2.0"
@ -119,11 +120,11 @@ default-features = false
features = ["unstable_custom_mechanism", "provider", "registry_static", "config_builder", "plain"] features = ["unstable_custom_mechanism", "provider", "registry_static", "config_builder", "plain"]
[dev-dependencies] [dev-dependencies]
futures-test = "0.3.16" futures-test = "0.3.31"
tempfile = "3.2" tempfile = "3.16"
[build-dependencies] [build-dependencies]
shadow-rs = "0.11" shadow-rs = "0.38.1"
[workspace] [workspace]
members = ["runtime/*", "modules/*", "api", "fabfire_provision"] members = ["runtime/*", "modules/*", "api", "fabfire_provision"]

View File

@ -10,10 +10,11 @@ generated = []
gen_static = [] gen_static = []
[dependencies] [dependencies]
capnp = "0.14.3" capnp = "0.16.1"
capnpc = "0.14.4" capnpc = "0.16.5"
[build-dependencies] [build-dependencies]
capnpc = "0.14.4" capnpc = "0.16.5"
# Used in build.rs to iterate over all files in schema/ # Used in build.rs to iterate over all files in schema/
walkdir = "2.3.2" walkdir = "2.5.0"

View File

@ -363,7 +363,7 @@ impl Authentication for FabFire {
let data = data.get(..16).ok_or(FabFireError::ParseError)?; let data = data.get(..16).ok_or(FabFireError::ParseError)?;
let authid = uuid::Uuid::from_slice(data) let authid = uuid::Uuid::from_slice(data)
.unwrap() .unwrap()
.to_hyphenated() .hyphenated()
.encode_lower(&mut Uuid::encode_buffer()) .encode_lower(&mut Uuid::encode_buffer())
.to_string(); .to_string();
let prov = ThisProvider::<AuthId>::with(&authid); let prov = ThisProvider::<AuthId>::with(&authid);

View File

@ -229,7 +229,7 @@ impl card_d_e_s_fire_e_v2::Server for User {
let token: Cow<'_, str> = if let Ok(uuid) = Uuid::from_slice(token) { let token: Cow<'_, str> = if let Ok(uuid) = Uuid::from_slice(token) {
Cow::Owned( Cow::Owned(
uuid.to_hyphenated() uuid.hyphenated()
.encode_lower(&mut Uuid::encode_buffer()) .encode_lower(&mut Uuid::encode_buffer())
.to_string(), .to_string(),
) )
@ -309,7 +309,7 @@ impl card_d_e_s_fire_e_v2::Server for User {
let token: Cow<'_, str> = if let Ok(uuid) = Uuid::from_slice(token) { let token: Cow<'_, str> = if let Ok(uuid) = Uuid::from_slice(token) {
Cow::Owned( Cow::Owned(
uuid.to_hyphenated() uuid.hyphenated()
.encode_lower(&mut Uuid::encode_buffer()) .encode_lower(&mut Uuid::encode_buffer())
.to_string(), .to_string(),
) )

View File

@ -7,5 +7,5 @@ edition = "2021"
[dependencies] [dependencies]
sdk-proc = { path = "sdk_proc" } sdk-proc = { path = "sdk_proc" }
futures-util = "0.3" futures-util = "0.3.31"
difluoroborane = { path = "../.." } difluoroborane = { path = "../.." }

View File

@ -14,9 +14,9 @@ name = "tests"
path = "tests/progress.rs" path = "tests/progress.rs"
[dev-dependencies] [dev-dependencies]
trybuild = "1.0" trybuild = "1.0.103"
[dependencies] [dependencies]
proc-macro2 = "1.0" proc-macro2 = "1.0.93"
syn = "1.0" syn = "2.0.98"
quote = "1.0" quote = "1.0.38"

View File

@ -6,25 +6,25 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
console-api = "0.3" console-api = "0.3.0"
prost-types = "0.10" prost-types = "0.10.1"
tonic = { version = "0.7.2", default-features = false, features = [] } tonic = { version = "0.7.2", default-features = false, features = [] }
hyper = { version = "0.14", default-features = false, features = ["http2", "server", "stream"] } hyper = { version = "0.14.32", default-features = false, features = ["http2", "server", "stream"] }
thread_local = "1.1" thread_local = "1.1.8"
tracing = "0.1" tracing = "0.1.41"
tracing-core = "0.1" tracing-core = "0.1.33"
tracing-subscriber = { version = "0.3", default-features = false, features = ["registry"] } tracing-subscriber = { version = "0.3.19", default-features = false, features = ["registry"] }
crossbeam-utils = "0.8" crossbeam-utils = "0.8.21"
crossbeam-channel = "0.5" crossbeam-channel = "0.5.14"
async-net = "1.6" async-net = "2.0.0"
async-compat = "0.2" async-compat = "0.2.4"
async-channel = "1.6" async-channel = "1.9.0"
async-oneshot = "0.5" async-oneshot = "0.5.9"
async-io = "1.7" async-io = "2.4.0"
tokio-util = "0.7" tokio-util = "0.7.13"
futures-util = "0.3" futures-util = "0.3.31"
tokio = { version = "1.19", default-features = false, features = []} tokio = { version = "1.43.0", default-features = false, features = []}
hdrhistogram = "7.5" hdrhistogram = "7.5.4"
[dev-dependencies] [dev-dependencies]
tracing-subscriber = "0.3" tracing-subscriber = "0.3.19"

View File

@ -31,34 +31,34 @@ path = "benches/stats.rs"
[dependencies] [dependencies]
lightproc = { path = "../lightproc" } lightproc = { path = "../lightproc" }
crossbeam-utils = "0.8" crossbeam-utils = "0.8.21"
crossbeam-channel = "0.5" crossbeam-channel = "0.5.14"
crossbeam-epoch = "0.9" crossbeam-epoch = "0.9.18"
crossbeam-deque = "0.8.1" crossbeam-deque = "0.8.6"
lazy_static = "1.4" lazy_static = "1.5.0"
libc = "0.2" libc = "0.2.169"
num_cpus = "1.13" num_cpus = "1.16.0"
pin-utils = "0.1.0" pin-utils = "0.1.0"
parking_lot = "0.12" parking_lot = "0.12.3"
# Allocator # Allocator
arrayvec = { version = "0.7.0" } arrayvec = { version = "0.7.6" }
futures-timer = "3.0.2" futures-timer = "3.0.3"
once_cell = "1.4.0" once_cell = "1.20.3"
crossbeam-queue = "0.3.0" crossbeam-queue = "0.3.12"
hdrhistogram = "7.5" hdrhistogram = "7.5.4"
# Stats & Tracing # Stats & Tracing
tracing = "0.1" tracing = "0.1.41"
# Supervision trees # Supervision trees
sharded-slab = "0.1" sharded-slab = "0.1.7"
thread_local = "1.1" thread_local = "1.1.8"
[dev-dependencies] [dev-dependencies]
async-std = "1.10.0" async-std = "1.10.0"
tracing = { version = "0.1.19", features = ["max_level_trace"]} tracing = { version = "0.1.41", features = ["max_level_trace"]}
tracing-subscriber = "0.3.1" tracing-subscriber = "0.3.19"
futures-util = "0.3" futures-util = "0.3.31"
rand = "0.8" rand = "0.9.0"
criterion = "0.3" criterion = "0.5.1"

View File

@ -11,14 +11,14 @@ license = "Apache-2.0/MIT"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
crossbeam-utils = "0.8" crossbeam-utils = "0.8.21"
pin-utils = "0.1.0" pin-utils = "0.1.0"
bitfield = "0.13.2" bitfield = "0.18.1"
bitflags = "1.3.2" bitflags = "1.3.2"
tracing = "0.1" tracing = "0.1.41"
[dev-dependencies] [dev-dependencies]
crossbeam = "0.8" crossbeam = "0.8.4"
futures-executor = "0.3" futures-executor = "0.3.31"
lazy_static = "1.4.0" lazy_static = "1.5.0"
async-std = "1.5" async-std = "1.13.0"