ms2k/remora
SHA256
Watch
0
Code Releases Activity

Refresh Rust dependencies and replace abandoned crates

Browse source
This commit is contained in:
ms2k 2026-08-19 23:33:58 +09:00
commit e5c24f7c71
2 changed files with 602 additions and 711 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/remora-api/Cargo.toml
View file

@ -8,10 +8,10 @@ version.workspace = true
[dependencies]
actix-ws = "=0.4.0"
actix-web = { version = "=4.14.0", features = ["rustls-0_23"] }
actix-web = { version = "=4.14.1", features = ["rustls-0_23"] }
actix-tls = "=3.5.0"
futures-util = "=0.3.32"
getrandom = "0.3.4"
futures-util = "=0.3.34"
getrandom = "0.4.3"
remora-admission = { path = "../remora-admission" }
remora-attempt = { path = "../remora-attempt" }
remora-contracts = { path = "../remora-contracts" }
@ -25,8 +25,8 @@ remora-result = { path = "../remora-result" }
remora-runtime = { path = "../remora-runtime" }
remora-schema.workspace = true
remora-target = { path = "../remora-target" }
rustls = "=0.23.42"
rustls-pemfile = "=2.2.0"
rustls = "=0.23.43"
rustls-pki-types = "=1.15.1"
serde.workspace = true
serde_json.workspace = true
sha2.workspace = true
@ -37,9 +37,9 @@ tokio.workspace = true
tracing.workspace = true
[dev-dependencies]
base64 = "=0.22.1"
jsonwebtoken = "=9.3.1"
rcgen = "=0.14.8"
base64 = "=0.23.1"
jsonwebtoken = { version = "=11.0.0", features = ["aws_lc_rs"] }
rcgen = "=0.14.9"
remora-coordination = { path = "../remora-coordination" }
reqwest = { version = "=0.13.4", default-features = false, features = ["form", "json", "rustls"] }
tokio-tungstenite = "=0.30.0"

10
crates/remora-api/src/application.rs
View file

@ -1,6 +1,5 @@
use std::{
fs,
io::{self, BufReader},
fs, io,
net::{SocketAddr, TcpListener},
path::{Path, PathBuf},
sync::Arc,
@ -28,6 +27,7 @@ use rustls::{
pki_types::{CertificateDer, PrivateKeyDer},
server::WebPkiClientVerifier,
};
use rustls_pki_types::pem::PemObject;
use sqlx::PgPool;
use tokio::task::JoinHandle;
@ -611,7 +611,7 @@ fn server_tls(config: &WorkerTlsConfig) -> Result<ServerConfig, RuntimeError> {
fn certificates(path: &Path) -> Result<Vec<CertificateDer<'static>>, RuntimeError> {
let file = fs::File::open(path).map_err(|error| path_error(path, error))?;
let certificates = rustls_pemfile::certs(&mut BufReader::new(file))
let certificates = CertificateDer::pem_reader_iter(file)
.collect::<Result<Vec<_>, _>>()
.map_err(runtime_error)?;
if certificates.is_empty() {
@ -625,7 +625,9 @@ fn certificates(path: &Path) -> Result<Vec<CertificateDer<'static>>, RuntimeErro
fn private_key(path: &Path) -> Result<PrivateKeyDer<'static>, RuntimeError> {
let file = fs::File::open(path).map_err(|error| path_error(path, error))?;
rustls_pemfile::private_key(&mut BufReader::new(file))
PrivateKeyDer::pem_reader_iter(file)
.next()
.transpose()
.map_err(runtime_error)?
.ok_or_else(|| RuntimeError::message(format!("{} contains no private key", path.display())))
}