konevsa/proxmox-proxmox-perl-rs
1
0
Fork 0
forked from Proxmox/proxmox-perl-rs
Code Pull Requests Activity

notify: use new HttpError type

Browse Source 
Use `proxmox-http-error::HttpError` instead of
`proxmox-notify::api::ApiError`.

Also factoring out the digest decoding into a small helper.

Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Lukas Wagner 2023-07-26 16:18:24 +02:00 committed by Wolfgang Bumiller
parent 2be21ff9fa
commit 76b63ed6a8
2 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
common/src/notify.rs
View File

@ -5,6 +5,7 @@ mod export {
use serde_json::Value as JSONValue; use serde_json::Value as JSONValue;
use std::sync::Mutex; use std::sync::Mutex;
use proxmox_http_error::HttpError;
use proxmox_notify::endpoints::gotify::{ use proxmox_notify::endpoints::gotify::{
DeleteableGotifyProperty, GotifyConfig, GotifyConfigUpdater, GotifyPrivateConfig, DeleteableGotifyProperty, GotifyConfig, GotifyConfigUpdater, GotifyPrivateConfig,
GotifyPrivateConfigUpdater, GotifyPrivateConfigUpdater,
@ -16,7 +17,7 @@ mod export {
DeleteableFilterProperty, FilterConfig, FilterConfigUpdater, FilterModeOperator, DeleteableFilterProperty, FilterConfig, FilterConfigUpdater, FilterModeOperator,
}; };
use proxmox_notify::group::{DeleteableGroupProperty, GroupConfig, GroupConfigUpdater}; use proxmox_notify::group::{DeleteableGroupProperty, GroupConfig, GroupConfigUpdater};
use proxmox_notify::{api, api::ApiError, Config, Notification, Severity}; use proxmox_notify::{api, Config, Notification, Severity};
pub struct NotificationConfig { pub struct NotificationConfig {
config: Mutex<Config>, config: Mutex<Config>,
@ -91,7 +92,7 @@ mod export {
title: String, title: String,
body: String, body: String,
properties: Option<JSONValue>, properties: Option<JSONValue>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
let notification = Notification { let notification = Notification {
@ -108,13 +109,15 @@ mod export {
fn test_target( fn test_target(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
target: &str, target: &str,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::common::test_target(&config, target) api::common::test_target(&config, target)
} }
#[export(serialize_error)] #[export(serialize_error)]
fn get_groups(#[try_from_ref] this: &NotificationConfig) -> Result<Vec<GroupConfig>, ApiError> { fn get_groups(
#[try_from_ref] this: &NotificationConfig,
) -> Result<Vec<GroupConfig>, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::group::get_groups(&config) api::group::get_groups(&config)
} }
@ -123,7 +126,7 @@ mod export {
fn get_group( fn get_group(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
id: &str, id: &str,
) -> Result<GroupConfig, ApiError> { ) -> Result<GroupConfig, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::group::get_group(&config, id) api::group::get_group(&config, id)
} }
@ -135,7 +138,7 @@ mod export {
endpoints: Vec<String>, endpoints: Vec<String>,
comment: Option<String>, comment: Option<String>,
filter: Option<String>, filter: Option<String>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::group::add_group( api::group::add_group(
&mut config, &mut config,
@ -157,11 +160,9 @@ mod export {
filter: Option<String>, filter: Option<String>,
delete: Option<Vec<DeleteableGroupProperty>>, delete: Option<Vec<DeleteableGroupProperty>>,
digest: Option<&str>, digest: Option<&str>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
let digest = digest.map(hex::decode).transpose().map_err(|e| { let digest = decode_digest(digest)?;
ApiError::internal_server_error(format!("invalid digest: {e}"), Some(Box::new(e)))
})?;
api::group::update_group( api::group::update_group(
&mut config, &mut config,
@ -177,7 +178,10 @@ mod export {
} }
#[export(serialize_error)] #[export(serialize_error)]
fn delete_group(#[try_from_ref] this: &NotificationConfig, name: &str) -> Result<(), ApiError> { fn delete_group(
#[try_from_ref] this: &NotificationConfig,
name: &str,
) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::group::delete_group(&mut config, name) api::group::delete_group(&mut config, name)
} }
@ -185,7 +189,7 @@ mod export {
#[export(serialize_error)] #[export(serialize_error)]
fn get_sendmail_endpoints( fn get_sendmail_endpoints(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
) -> Result<Vec<SendmailConfig>, ApiError> { ) -> Result<Vec<SendmailConfig>, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::sendmail::get_endpoints(&config) api::sendmail::get_endpoints(&config)
} }
@ -194,7 +198,7 @@ mod export {
fn get_sendmail_endpoint( fn get_sendmail_endpoint(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
id: &str, id: &str,
) -> Result<SendmailConfig, ApiError> { ) -> Result<SendmailConfig, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::sendmail::get_endpoint(&config, id) api::sendmail::get_endpoint(&config, id)
} }
@ -210,7 +214,7 @@ mod export {
author: Option<String>, author: Option<String>,
comment: Option<String>, comment: Option<String>,
filter: Option<String>, filter: Option<String>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::sendmail::add_endpoint( api::sendmail::add_endpoint(
@ -240,11 +244,9 @@ mod export {
filter: Option<String>, filter: Option<String>,
delete: Option<Vec<DeleteableSendmailProperty>>, delete: Option<Vec<DeleteableSendmailProperty>>,
digest: Option<&str>, digest: Option<&str>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
let digest = digest.map(hex::decode).transpose().map_err(|e| { let digest = decode_digest(digest)?;
ApiError::internal_server_error(format!("invalid digest: {e}"), Some(Box::new(e)))
})?;
api::sendmail::update_endpoint( api::sendmail::update_endpoint(
&mut config, &mut config,
@ -266,7 +268,7 @@ mod export {
fn delete_sendmail_endpoint( fn delete_sendmail_endpoint(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
name: &str, name: &str,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::sendmail::delete_endpoint(&mut config, name) api::sendmail::delete_endpoint(&mut config, name)
} }
@ -274,7 +276,7 @@ mod export {
#[export(serialize_error)] #[export(serialize_error)]
fn get_gotify_endpoints( fn get_gotify_endpoints(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
) -> Result<Vec<GotifyConfig>, ApiError> { ) -> Result<Vec<GotifyConfig>, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::gotify::get_endpoints(&config) api::gotify::get_endpoints(&config)
} }
@ -283,7 +285,7 @@ mod export {
fn get_gotify_endpoint( fn get_gotify_endpoint(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
id: &str, id: &str,
) -> Result<GotifyConfig, ApiError> { ) -> Result<GotifyConfig, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::gotify::get_endpoint(&config, id) api::gotify::get_endpoint(&config, id)
} }
@ -296,7 +298,7 @@ mod export {
token: String, token: String,
comment: Option<String>, comment: Option<String>,
filter: Option<String>, filter: Option<String>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::gotify::add_endpoint( api::gotify::add_endpoint(
&mut config, &mut config,
@ -321,11 +323,9 @@ mod export {
filter: Option<String>, filter: Option<String>,
delete: Option<Vec<DeleteableGotifyProperty>>, delete: Option<Vec<DeleteableGotifyProperty>>,
digest: Option<&str>, digest: Option<&str>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
let digest = digest.map(hex::decode).transpose().map_err(|e| { let digest = decode_digest(digest)?;
ApiError::internal_server_error(format!("invalid digest: {e}"), Some(Box::new(e)))
})?;
api::gotify::update_endpoint( api::gotify::update_endpoint(
&mut config, &mut config,
@ -345,7 +345,7 @@ mod export {
fn delete_gotify_endpoint( fn delete_gotify_endpoint(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
name: &str, name: &str,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::gotify::delete_gotify_endpoint(&mut config, name) api::gotify::delete_gotify_endpoint(&mut config, name)
} }
@ -353,7 +353,7 @@ mod export {
#[export(serialize_error)] #[export(serialize_error)]
fn get_filters( fn get_filters(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
) -> Result<Vec<FilterConfig>, ApiError> { ) -> Result<Vec<FilterConfig>, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::filter::get_filters(&config) api::filter::get_filters(&config)
} }
@ -362,7 +362,7 @@ mod export {
fn get_filter( fn get_filter(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
id: &str, id: &str,
) -> Result<FilterConfig, ApiError> { ) -> Result<FilterConfig, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::filter::get_filter(&config, id) api::filter::get_filter(&config, id)
} }
@ -376,7 +376,7 @@ mod export {
mode: Option<FilterModeOperator>, mode: Option<FilterModeOperator>,
invert_match: Option<bool>, invert_match: Option<bool>,
comment: Option<String>, comment: Option<String>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::filter::add_filter( api::filter::add_filter(
&mut config, &mut config,
@ -401,11 +401,9 @@ mod export {
comment: Option<String>, comment: Option<String>,
delete: Option<Vec<DeleteableFilterProperty>>, delete: Option<Vec<DeleteableFilterProperty>>,
digest: Option<&str>, digest: Option<&str>,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
let digest = digest.map(hex::decode).transpose().map_err(|e| { let digest = decode_digest(digest)?;
ApiError::internal_server_error(format!("invalid digest: {e}"), Some(Box::new(e)))
})?;
api::filter::update_filter( api::filter::update_filter(
&mut config, &mut config,
@ -425,7 +423,7 @@ mod export {
fn delete_filter( fn delete_filter(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
name: &str, name: &str,
) -> Result<(), ApiError> { ) -> Result<(), HttpError> {
let mut config = this.config.lock().unwrap(); let mut config = this.config.lock().unwrap();
api::filter::delete_filter(&mut config, name) api::filter::delete_filter(&mut config, name)
} }
@ -434,8 +432,15 @@ mod export {
fn get_referenced_entities( fn get_referenced_entities(
#[try_from_ref] this: &NotificationConfig, #[try_from_ref] this: &NotificationConfig,
name: &str, name: &str,
) -> Result<Vec<String>, ApiError> { ) -> Result<Vec<String>, HttpError> {
let config = this.config.lock().unwrap(); let config = this.config.lock().unwrap();
api::common::get_referenced_entities(&config, name) api::common::get_referenced_entities(&config, name)
} }
fn decode_digest(digest: Option<&str>) -> Result<Option<Vec<u8>>, HttpError> {
digest
.map(hex::decode)
.transpose()
.map_err(|e| api::http_err!(BAD_REQUEST, "invalid digest: {e}"))
}
} }

1
pve-rs/Cargo.toml
View File

@ -35,6 +35,7 @@ perlmod = { version = "0.13", features = [ "exporter" ] }
proxmox-apt = "0.10" proxmox-apt = "0.10"
proxmox-http = { version = "0.9", features = ["client-sync", "client-trait"] } proxmox-http = { version = "0.9", features = ["client-sync", "client-trait"] }
proxmox-http-error = "0.1.0"
proxmox-notify = "0.1" proxmox-notify = "0.1"
proxmox-openid = "0.10" proxmox-openid = "0.10"
proxmox-resource-scheduling = "0.3.0" proxmox-resource-scheduling = "0.3.0"