actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-27 17:22:57 +01:00
Code Issues Releases Wiki Activity

Add test and fix for panic in Bearer::to_bytes (#1)

Browse Source
This commit is contained in:
Brian Olsen 2018-06-18 09:21:20 +02:00 committed by svartalf
parent 716bffeb8e
commit 488b7bf653
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/headers/www_authenticate/challenge/bearer.rs
View File

@ -55,11 +55,13 @@ pub struct Bearer {
impl Challenge for Bearer { impl Challenge for Bearer {
fn to_bytes(&self) -> Bytes { fn to_bytes(&self) -> Bytes {
let desc_uri_required =
self.error_description.as_ref().map_or(0, |desc| desc.len() + 20) +
self.error_uri.as_ref().map_or(0, |url| url.len() + 12);
let capacity = 6 + let capacity = 6 +
self.realm.as_ref().map_or(0, |realm| realm.len() + 9) + self.realm.as_ref().map_or(0, |realm| realm.len() + 9) +
self.scope.as_ref().map_or(0, |scope| scope.len() + 9) + self.scope.as_ref().map_or(0, |scope| scope.len() + 9) +
self.error_description.as_ref().map_or(0, |desc| desc.len() + 20) + desc_uri_required;
self.error_uri.as_ref().map_or(0, |url| url.len() + 12);
let mut buffer = BytesMut::with_capacity(capacity); let mut buffer = BytesMut::with_capacity(capacity);
buffer.put("Bearer"); buffer.put("Bearer");
@ -78,9 +80,9 @@ impl Challenge for Bearer {
if let Some(ref error) = self.error { if let Some(ref error) = self.error {
let error_repr = error.as_str(); let error_repr = error.as_str();
let remaining = buffer.remaining_mut(); let remaining = buffer.remaining_mut();
let required = error_repr.len() + 9; // 9 is for `" error=\"\""` let required = desc_uri_required + error_repr.len() + 9; // 9 is for `" error=\"\""`
if remaining < required { if remaining < required {
buffer.reserve(required - remaining); buffer.reserve(required);
} }
buffer.put(" error=\""); buffer.put(" error=\"");
buffer.put(error_repr); buffer.put(error_repr);
@ -134,3 +136,21 @@ impl IntoHeaderValue for Bearer {
HeaderValue::from_shared(self.to_bytes()) HeaderValue::from_shared(self.to_bytes())
} }
} }
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn to_bytes() {
let b = Bearer {
scope: None,
realm: None,
error: Some(Error::InvalidToken),
error_description: Some(String::from("Subject 8740827c-2e0a-447b-9716-d73042e4039d not found")),
error_uri: None,
};
assert_eq!("Bearer error=\"invalid_token\" error_description=\"Subject 8740827c-2e0a-447b-9716-d73042e4039d not found\"",
format!("{}", b));
}
}