mirror/lldap
1
0
Fork 0
mirror of https://github.com/nitnelave/lldap.git synced 2023-04-12 14:25:13 +00:00
Code Issues Projects Releases Wiki Activity

errors: use anyhow::Context everywhere

Browse Source
This commit is contained in:
Valentin Tolmer 2021-08-26 21:56:42 +02:00
parent 9e5a8572fb
commit c0f564cef2
5 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/api.rs
View File

@ -1,5 +1,5 @@
use crate::cookies::set_cookie;
use anyhow::{anyhow, Result};
use anyhow::{anyhow, Context, Result};
use lldap_model::*;
use yew::callback::Callback;
@ -33,7 +33,7 @@ where
Callback::once(move |response: Response<Result<Resp>>| {
let (meta, maybe_data) = response.into_parts();
let message = maybe_data
.map_err(|e| anyhow!("Could not reach server: {}", e))
.context("Could not reach server")
.and_then(|data| handler(meta.status, data));
callback.emit(message)
})
@ -100,7 +100,7 @@ where
callback,
move |status: http::StatusCode, data: String| {
if status.is_success() {
serde_json::from_str(&data).map_err(|e| anyhow!("Could not parse response: {}", e))
serde_json::from_str(&data).context("Could not parse response")
} else {
Err(anyhow!("{}[{}]: {}", error_message, status, data))
}
@ -148,7 +148,7 @@ impl HostService {
|status, data: String| {
if status.is_success() {
get_claims_from_jwt(&data)
.map_err(|e| anyhow!("Could not parse response: {}", e))
.context("Could not parse response")
.and_then(|jwt_claims| {
let is_admin = jwt_claims.groups.contains("lldap_admin");
set_cookie("user_id", &jwt_claims.user, &jwt_claims.exp)
@ -156,7 +156,7 @@ impl HostService {
set_cookie("is_admin", &is_admin.to_string(), &jwt_claims.exp)
})
.map(|_| (jwt_claims.user.clone(), is_admin))
.map_err(|e| anyhow!("Error clearing cookie: {}", e))
.context("Error clearing cookie")
})
} else {
Err(anyhow!(

8
app/src/create_user.rs
View File

@ -1,5 +1,5 @@
use crate::api::HostService;
use anyhow::{anyhow, Result};
use anyhow::{anyhow, Context, Result};
use lldap_model::*;
use yew::prelude::*;
use yew::services::{fetch::FetchTask, ConsoleService};
@ -48,7 +48,7 @@ impl CreateUserForm {
};
self._task = Some(
HostService::create_user(req, self.link.callback(Msg::CreateUserResponse))
.map_err(|e| anyhow!("Error trying to create user: {}", e))?,
.context("Error trying to create user")?,
);
}
Msg::CreateUserResponse(r) => {
@ -73,7 +73,7 @@ impl CreateUserForm {
req,
self.link.callback(Msg::RegistrationStartResponse),
)
.map_err(|e| anyhow!("Error trying to create user: {}", e))?,
.context("Error trying to create user")?,
);
} else {
self.update(Msg::SuccessfulCreation);
@ -97,7 +97,7 @@ impl CreateUserForm {
req,
self.link.callback(Msg::RegistrationFinishResponse),
)
.map_err(|e| anyhow!("Error trying to register user: {}", e))?,
.context("Error trying to register user")?,
);
}
Msg::RegistrationFinishResponse(response) => {

7
app/src/login.rs
View File

@ -1,5 +1,5 @@
use crate::api::HostService;
use anyhow::{anyhow, Result};
use anyhow::{anyhow, Context, Result};
use lldap_model::*;
use wasm_bindgen::JsCast;
use yew::prelude::*;
@ -61,9 +61,8 @@ impl LoginForm {
let password = get_form_field("password")
.ok_or_else(|| anyhow!("Could not get password from form"))?;
let mut rng = rand::rngs::OsRng;
let login_start_request =
opaque::client::login::start_login(&password, &mut rng)
.map_err(|e| anyhow!("Could not initialize login: {}", e))?;
let login_start_request = opaque::client::login::start_login(&password, &mut rng)
.context("Could not initialize login")?;
self.login_start = Some(login_start_request.state);
let req = login::ClientLoginStartRequest {
username,

17
src/infra/configuration.rs
View File

@ -1,4 +1,4 @@
use anyhow::{anyhow, Result};
use anyhow::{Context, Result};
use figment::{
providers::{Env, Format, Serialized, Toml},
Figment,
@ -93,19 +93,16 @@ fn get_server_setup(file_path: &str) -> Result<ServerSetup> {
use std::path::Path;
let path = Path::new(file_path);
if path.exists() {
let bytes = std::fs::read(file_path)
.map_err(|e| anyhow!("Could not read key file `{}`: {}", file_path, e))?;
let bytes =
std::fs::read(file_path).context(format!("Could not read key file `{}`", file_path))?;
Ok(ServerSetup::deserialize(&bytes)?)
} else {
let mut rng = rand::rngs::OsRng;
let server_setup = ServerSetup::new(&mut rng);
std::fs::write(path, server_setup.serialize()).map_err(|e| {
anyhow!(
"Could not write the generated server setup to file `{}`: {}",
file_path,
e
)
})?;
std::fs::write(path, server_setup.serialize()).context(format!(
"Could not write the generated server setup to file `{}`",
file_path,
))?;
Ok(server_setup)
}
}

8
src/main.rs
View File

@ -9,7 +9,7 @@ use crate::{
infra::{cli::*, configuration::Configuration, db_cleaner::Scheduler},
};
use actix::Actor;
use anyhow::{anyhow, Result};
use anyhow::{Context, Result};
use futures_util::TryFutureExt;
use log::*;
@ -24,20 +24,20 @@ async fn create_admin_user(handler: &SqlBackendHandler, config: &Configuration)
})
.and_then(|_| register_password(handler, &config.ldap_user_dn, &config.ldap_user_pass))
.await
.map_err(|e| anyhow!("Error creating admin user: {}", e))?;
.context("Error creating admin user")?;
let admin_group_id = handler
.create_group(lldap_model::CreateGroupRequest {
display_name: "lldap_admin".to_string(),
})
.await
.map_err(|e| anyhow!("Error creating admin group: {}", e))?;
.context("Error creating admin group")?;
handler
.add_user_to_group(lldap_model::AddUserToGroupRequest {
user_id: config.ldap_user_dn.clone(),
group_id: admin_group_id,
})
.await
.map_err(|e| anyhow!("Error adding admin user to group: {}", e))
.context("Error adding admin user to group")
}
async fn run_server(config: Configuration) -> Result<()> {