Clone less

asonix · Dec 23, 2017 · d5dbc9a · d5dbc9a
1 parent f309b42
commit d5dbc9a
Show file tree

Hide file tree

Showing 9 changed files with 87 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ impl GetKey for MyKeyGetter {
     type Key = Cursor<Vec<u8>>;
     type Error = ..;
 
-    fn get_key(self, _key_id: String) -> Result<Self::Key, ..> {
+    fn get_key(self, _key_id: &str) -> Result<Self::Key, ..> {
         Ok(Cursor::new(self.key.clone()))
     }
 }
@@ -170,7 +170,7 @@ impl GetKey for MyKeyGetter {
     type Key = Cursor<Vec<u8>>;
     type Error = ..;
 
-    fn get_key(self, _key_id: String) -> Result<Self::Key, Self::Error> {
+    fn get_key(self, _key_id: &str) -> Result<Self::Key, Self::Error> {
         Ok(Cursor::new(self.key.clone()))
     }
 }

diff --git a/examples/hyper_server.rs b/examples/hyper_server.rs
@@ -51,7 +51,7 @@ impl GetKey for MyKeyGetter {
     type Key = Cursor<Vec<u8>>;
     type Error = Error;
 
-    fn get_key(self, _key_id: String) -> Result<Self::Key, Self::Error> {
+    fn get_key(self, _key_id: &str) -> Result<Self::Key, Self::Error> {
         Ok(Cursor::new(self.key.clone()))
     }
 }

diff --git a/examples/rocket.rs b/examples/rocket.rs
@@ -53,7 +53,7 @@ impl GetKey for MyKeyGetter {
     type Key = Cursor<Vec<u8>>;
     type Error = Error;
 
-    fn get_key(self, _key_id: String) -> Result<Self::Key, Self::Error> {
+    fn get_key(self, _key_id: &str) -> Result<Self::Key, Self::Error> {
         Ok(Cursor::new(self.key.clone()))
     }
 }

diff --git a/src/lib.rs b/src/lib.rs
@@ -14,6 +14,7 @@
 // along with HTTP Signatures  If not, see <http://www.gnu.org/licenses/>.
 
 #![feature(try_from)]
+#![feature(underscore_lifetimes)]
 
 #[cfg(feature = "use_hyper")]
 extern crate hyper;
@@ -44,6 +45,8 @@ pub use create::{AsHttpSignature, WithHttpSignature, HttpSignature, SigningStrin
 pub use verify::{AuthorizationHeader, VerifyAuthorizationHeader, GetKey};
 pub use error::{Error, DecodeError, VerificationError};
 
+const REQUEST_TARGET: &'static str = "(request-target)";
+
 #[derive(Debug)]
 pub enum ShaSize {
     TwoFiftySix,
@@ -103,13 +106,14 @@ mod tests {
     use std::io::Cursor;
     use std::fs::File;
 
-    use super::HttpSignature;
     use super::SignatureAlgorithm;
-    use super::SigningString;
-    use super::GetKey;
-    use super::AuthorizationHeader;
     use super::ShaSize;
-    use super::VerificationError;
+    use super::REQUEST_TARGET;
+    use create::HttpSignature;
+    use create::SigningString;
+    use verify::GetKey;
+    use verify::AuthorizationHeader;
+    use error::VerificationError;
     use create::Signature;
 
     struct HmacKeyGetter {
@@ -120,7 +124,7 @@ mod tests {
         type Key = Cursor<Vec<u8>>;
         type Error = VerificationError;
 
-        fn get_key(self, _: String) -> Result<Self::Key, Self::Error> {
+        fn get_key(self, _: &str) -> Result<Self::Key, Self::Error> {
             Ok(Cursor::new(self.key))
         }
     }
@@ -133,7 +137,7 @@ mod tests {
         type Key = File;
         type Error = VerificationError;
 
-        fn get_key(self, _: String) -> Result<Self::Key, Self::Error> {
+        fn get_key(self, _: &str) -> Result<Self::Key, Self::Error> {
             Ok(self.key)
         }
     }
@@ -187,7 +191,7 @@ mod tests {
         let mut headers_one: HashMap<String, Vec<String>> = HashMap::new();
         headers_one.insert("Accept".into(), vec!["application/json".into()]);
         headers_one.insert(
-            "(request-target)".into(),
+            REQUEST_TARGET.into(),
             vec![format!("{} {}?{}", method.to_lowercase(), path, query)],
         );
 
@@ -204,7 +208,7 @@ mod tests {
         let signature: Signature = signing_string.try_into().unwrap();
 
         let auth_header = signature.authorization();
-        let auth_header = AuthorizationHeader::new(auth_header).unwrap();
+        let auth_header = AuthorizationHeader::new(&auth_header).unwrap();
 
         auth_header
             .verify(&headers_two, method, path, Some(query), key_getter)
@@ -224,7 +228,7 @@ mod tests {
         let mut headers_one: HashMap<String, Vec<String>> = HashMap::new();
         headers_one.insert("Accept".into(), vec!["application/json".into()]);
         headers_one.insert(
-            "(request-target)".into(),
+            REQUEST_TARGET.into(),
             vec![format!("{} {}?{}", method.to_lowercase(), path, query)],
         );
 
@@ -240,7 +244,7 @@ mod tests {
         let signature: Signature = signing_string.try_into().unwrap();
 
         let auth_header = signature.authorization();
-        let auth_header = AuthorizationHeader::new(auth_header).unwrap();
+        let auth_header = AuthorizationHeader::new(&auth_header).unwrap();
 
         auth_header
             .verify(&headers_two, method, path, Some(query), key_getter)

diff --git a/src/use_hyper_client.rs b/src/use_hyper_client.rs
@@ -17,7 +17,7 @@ use std::io::Read;
 use std::collections::HashMap;
 
 use error::Error;
-use super::SignatureAlgorithm;
+use super::{SignatureAlgorithm, REQUEST_TARGET};
 use create::{AsHttpSignature, WithHttpSignature, HttpSignature};
 
 use hyper::Request as HyperRequest;
@@ -34,7 +34,7 @@ where
     ) -> Result<HttpSignature<T>, Error> {
         let mut headers = HashMap::new();
         headers.insert(
-            "(request-target)".into(),
+            REQUEST_TARGET.into(),
             vec![
                 if let Some(ref query) = self.uri().query() {
                     format!(

diff --git a/src/use_hyper_server.rs b/src/use_hyper_server.rs
@@ -28,17 +28,22 @@ impl VerifyAuthorizationHeader for Request {
             VerificationError::HeaderNotPresent,
         )?;
 
-        let auth_header = AuthorizationHeader::new(auth_header.clone())?;
+        let auth_header = AuthorizationHeader::new(auth_header)?;
 
-        let headers: Vec<(String, String)> = self.headers()
+        let headers: Vec<(&str, String)> = self.headers()
             .iter()
             .map(|header_view| {
-                (header_view.name().into(), header_view.value_string())
+                (header_view.name(), header_view.value_string())
             })
             .collect();
 
+        let headers_borrowed: Vec<(&str, &str)> = headers
+            .iter()
+            .map(|&(key, ref val)| (key, val.as_ref()))
+            .collect();
+
         auth_header.verify(
-            headers.as_ref(),
+            headers_borrowed.as_ref(),
             &self.method().as_ref().to_lowercase(),
             self.path(),
             self.query(),

diff --git a/src/use_reqwest.rs b/src/use_reqwest.rs
@@ -17,7 +17,7 @@ use std::io::Read;
 use std::collections::HashMap;
 
 use error::Error;
-use super::SignatureAlgorithm;
+use super::{SignatureAlgorithm, REQUEST_TARGET};
 use create::{AsHttpSignature, WithHttpSignature, HttpSignature};
 
 use reqwest::Request as ReqwestRequest;
@@ -34,7 +34,7 @@ where
     ) -> Result<HttpSignature<T>, Error> {
         let mut headers = HashMap::new();
         headers.insert(
-            "(request-target)".into(),
+            REQUEST_TARGET.into(),
             vec![
                 if let Some(ref query) = self.url().query() {
                     format!(

diff --git a/src/use_rocket.rs b/src/use_rocket.rs
@@ -27,15 +27,20 @@ impl<'r> VerifyAuthorizationHeader for Request<'r> {
             VerificationError::HeaderNotPresent,
         )?;
 
-        let auth_header = AuthorizationHeader::new(String::from(auth_header))?;
+        let auth_header = AuthorizationHeader::new(auth_header)?;
 
         let headers: Vec<(String, String)> = self.headers()
             .iter()
             .map(|header| (header.name().into(), header.value().into()))
             .collect();
 
+        let headers_borrowed: Vec<(&str, &str)> = headers
+            .iter()
+            .map(|&(ref key, ref val)| (key.as_ref(), val.as_ref()))
+            .collect();
+
         auth_header.verify(
-            headers.as_ref(),
+            headers_borrowed.as_ref(),
             self.method().as_str(),
             self.uri().path(),
             self.uri().query(),