Refresh Rust dependencies and replace abandoned crates
This commit is contained in:
parent
722c673d1e
commit
e5c24f7c71
2 changed files with 602 additions and 711 deletions
|
|
@ -8,12 +8,12 @@ version.workspace = true
|
|||
|
||||
[dependencies]
|
||||
base64.workspace = true
|
||||
jsonwebtoken = { version = "9.3.1", default-features = false, features = ["use_pem"] }
|
||||
jsonwebtoken = { version = "11.0.0", default-features = false, features = ["aws_lc_rs", "use_pem"] }
|
||||
remora-domain.workspace = true
|
||||
remora-durable.workspace = true
|
||||
reqwest = { version = "0.12.28", default-features = false, features = [
|
||||
reqwest = { version = "0.13.4", default-features = false, features = [
|
||||
"json",
|
||||
"rustls-tls-webpki-roots",
|
||||
"rustls",
|
||||
] }
|
||||
serde = { workspace = true, features = ["derive"] }
|
||||
serde_json.workspace = true
|
||||
|
|
@ -24,8 +24,6 @@ time.workspace = true
|
|||
tokio.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
pkcs8 = { version = "0.10.2", features = ["pem"] }
|
||||
rand = "0.8.5"
|
||||
rcgen = { version = "0.14.9", default-features = false, features = ["aws_lc_rs", "pem"] }
|
||||
remora-schema.workspace = true
|
||||
rsa = { version = "0.9.8", default-features = false, features = ["std", "pem"] }
|
||||
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "sync", "time"] }
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@ use std::collections::HashMap;
|
|||
use std::sync::LazyLock;
|
||||
|
||||
use jsonwebtoken::{Algorithm, DecodingKey, EncodingKey, Header, encode};
|
||||
use rcgen::{KeyPair, PKCS_RSA_SHA256, RsaKeySize};
|
||||
use remora_domain::{BucketName, StorageScope, TargetPrefix, TargetStoreId};
|
||||
use remora_identity::{
|
||||
OidcConfig, OidcIdentityProvider, ZITADEL_PROJECT_ROLES_CLAIM, encode_admin_role,
|
||||
encode_storage_role,
|
||||
};
|
||||
use rsa::RsaPrivateKey;
|
||||
use rsa::pkcs8::{EncodePrivateKey, EncodePublicKey, LineEnding};
|
||||
use serde_json::json;
|
||||
|
||||
struct EphemeralRsa {
|
||||
|
|
@ -17,15 +16,10 @@ struct EphemeralRsa {
|
|||
}
|
||||
|
||||
static EPHEMERAL_RSA: LazyLock<EphemeralRsa> = LazyLock::new(|| {
|
||||
let mut rng = rand::thread_rng();
|
||||
let private = RsaPrivateKey::new(&mut rng, 2048).expect("generate ephemeral RSA key");
|
||||
let private_pem = private
|
||||
.to_pkcs8_pem(LineEnding::LF)
|
||||
.expect("encode private pem");
|
||||
let public_pem = private
|
||||
.to_public_key()
|
||||
.to_public_key_pem(LineEnding::LF)
|
||||
.expect("encode public pem");
|
||||
let key_pair = KeyPair::generate_rsa_for(&PKCS_RSA_SHA256, RsaKeySize::_2048)
|
||||
.expect("generate ephemeral RSA key");
|
||||
let private_pem = key_pair.serialize_pem();
|
||||
let public_pem = key_pair.public_key_pem();
|
||||
EphemeralRsa {
|
||||
encoding: EncodingKey::from_rsa_pem(private_pem.as_bytes()).expect("encoding key"),
|
||||
decoding: DecodingKey::from_rsa_pem(public_pem.as_bytes()).expect("decoding key"),
|
||||
|
|
|
|||
Loading…
Reference in a new issue