tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update api macro example usage 

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-11-29 09:51:27 +01:00
parent 8b130e71da
commit 2905f2b5e6
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/api2/access.rs
View File

@ -4,8 +4,7 @@ use serde_json::{json, Value};
use proxmox::sortable; use proxmox::sortable;
use proxmox::api::{http_err, list_subdirs_api_method}; use proxmox::api::{http_err, list_subdirs_api_method};
use proxmox::api::{ApiMethod, Router, RpcEnvironment}; use proxmox::api::router::{Router, SubdirMap};
use proxmox::api::router::SubdirMap;
use proxmox::api::api; use proxmox::api::api;
use crate::tools; use crate::tools;
@ -71,21 +70,13 @@ fn authenticate_user(username: &str, password: &str) -> Result<(), Error> {
/// Create or verify authentication ticket. /// Create or verify authentication ticket.
/// ///
/// Returns: An authentication ticket with additional infos. /// Returns: An authentication ticket with additional infos.
fn create_ticket( fn create_ticket(username: String, password: String) -> Result<Value, Error> {
param: Value, match authenticate_user(&username, &password) {
_info: &ApiMethod,
_rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> {
let username = tools::required_string_param(&param, "username")?;
let password = tools::required_string_param(&param, "password")?;
match authenticate_user(username, password) {
Ok(_) => { Ok(_) => {
let ticket = assemble_rsa_ticket( private_auth_key(), "PBS", Some(username), None)?; let ticket = assemble_rsa_ticket( private_auth_key(), "PBS", Some(&username), None)?;
let token = assemble_csrf_prevention_token(csrf_secret(), username); let token = assemble_csrf_prevention_token(csrf_secret(), &username);
log::info!("successful auth for user '{}'", username); log::info!("successful auth for user '{}'", username);