Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

login: improve response handling

Browse Source 
we have use cases where we have bytes, and serde_json has a from_slice
method, doing the utf-8 check unnecessarily is pointless, while going
from &str to &[u8] is free...

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2023-08-01 15:16:07 +02:00
parent 5859017061
commit d6a550b71c
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxmox-login/src/lib.rs
View File

@ -128,10 +128,17 @@ impl Login {
///
/// On success, this will either yield an [`Authentication`] or a [`SecondFactorChallenge`] if
/// Two-Factor-Authentication is required.
pub fn response(&self, body: &str) -> Result<TicketResult, ResponseError> {
pub fn response<T: ?Sized + AsRef<[u8]>>(
&self,
body: &T,
) -> Result<TicketResult, ResponseError> {
self.response_bytes(body.as_ref())
}
fn response_bytes(&self, body: &[u8]) -> Result<TicketResult, ResponseError> {
use ticket::TicketResponse;
let response: api::ApiResponse<api::CreateTicketResponse> = serde_json::from_str(body)?;
let response: api::ApiResponse<api::CreateTicketResponse> = serde_json::from_slice(body)?;
let response = response.data.ok_or("missing response data")?;
if response.username != self.userid {
@ -271,8 +278,15 @@ impl SecondFactorChallenge {
}
/// Deal with the API's response object to extract the ticket.
pub fn response(&self, body: &str) -> Result<Authentication, ResponseError> {
let response: api::ApiResponse<api::CreateTicketResponse> = serde_json::from_str(body)?;
pub fn response<T: ?Sized + AsRef<[u8]>>(
&self,
body: &T,
) -> Result<Authentication, ResponseError> {
self.response_bytes(body.as_ref())
}
fn response_bytes(&self, body: &[u8]) -> Result<Authentication, ResponseError> {
let response: api::ApiResponse<api::CreateTicketResponse> = serde_json::from_slice(body)?;
let response = response.data.ok_or("missing response data")?;
if response.username != self.userid {