Compare commits

..

1 Commits

Author SHA1 Message Date
1740e254dc Update Rust crate reqwest to v0.12.16
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2025-05-28 00:09:42 +00:00
3 changed files with 546 additions and 1102 deletions

1630
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -6,14 +6,14 @@ edition = "2024"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
light-openid = { version = "1.1.0", features=["crypto-wrapper"] }
light-openid = { version = "1.0.4", features=["crypto-wrapper"] }
log = "0.4.21"
env_logger = "0.11.7"
clap = { version = "4.5.34", features = ["derive", "env"] }
lazy_static = "1.4.0"
actix-web = "4.5.1"
askama = "0.15.0"
askama = "0.14.0"
serde = { version = "1.0.198", features = ["derive"] }
serde_json = "1.0.140"
reqwest = { version = "0.13.0", features = ["json"] }
actix-remote-ip = "1.0.0"
reqwest = { version = "0.12.15", features = ["json"] }
actix-remote-ip = "0.1.0"

View File

@@ -120,7 +120,7 @@ async fn start(remote_ip: RemoteIP, state_manager: web::Data<BasicStateManager>)
let state = match state_manager.gen_state(remote_ip.0) {
Ok(s) => s,
Err(e) => {
log::error!("Failed to generate state! {e:?}");
log::error!("Failed to generate state! {:?}", e);
return ErrorTemplate::build("Failed to generate state!");
}
};
@@ -175,7 +175,7 @@ async fn redirect(
{
Ok(t) => t,
Err(e) => {
log::error!("Failed to retrieve token! {e}");
log::error!("Failed to retrieve token! {}", e);
return ErrorTemplate::build("Failed to retrieve access token!");
}
};
@@ -184,7 +184,7 @@ async fn redirect(
let (_user_info, user_info_str) = match config.request_user_info(&token).await {
Ok(t) => t,
Err(e) => {
log::error!("Failed to retrieve user info! {e}");
log::error!("Failed to retrieve user info! {}", e);
return ErrorTemplate::build("Failed to retrieve user info!");
}
};
@@ -217,7 +217,9 @@ async fn main() -> std::io::Result<()> {
HttpServer::new(move || {
App::new()
.wrap(Logger::default())
.app_data(web::Data::new(RemoteIPConfig::parse_opt(CONF.proxy_ip.clone())))
.app_data(web::Data::new(RemoteIPConfig {
proxy: CONF.proxy_ip.clone(),
}))
.app_data(state_manager.clone())
.service(bootstrap)
.service(cover)