Fix more feedback from PR

elpiel · elpiel · commit 7d415ca87ebc · 2019-11-11T12:41:25.000+02:00
diff --git a/sentry/src/lib.rs b/sentry/src/lib.rs
@@ -2,7 +2,7 @@
 #![deny(rust_2018_idioms)]
 
 use crate::middleware::auth;
-use crate::middleware::cors::{cors, CorsResult};
+use crate::middleware::cors::{cors, Cors};
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Error, Method, Request, Response, Server, StatusCode};
 use primitives::adapter::Adapter;
@@ -77,7 +77,12 @@ impl<A: Adapter + 'static> Application<A> {
                 Ok::<_, Error>(service_fn(move |req| {
                     let adapter_config = adapter_config.clone();
                     let redis = redis.clone();
-                    async move { Ok::<_, Error>(handle_routing(req, (&adapter_config.0, &adapter_config.1), redis).await) }
+                    async move {
+                        Ok::<_, Error>(
+                            handle_routing(req, (&adapter_config.0, &adapter_config.1), redis)
+                                .await,
+                        )
+                    }
                 }))
             }
         });
@@ -111,10 +116,10 @@ async fn handle_routing(
     redis: SharedConnection,
 ) -> Response<Body> {
     let headers = match cors(&req) {
-        CorsResult::Simple(headers) => headers,
+        Some(Cors::Simple(headers)) => headers,
         // if we have a Preflight, just return the response directly
-        CorsResult::Preflight(response) => return response,
-        CorsResult::None => Default::default(),
+        Some(Cors::Preflight(response)) => return response,
+        None => Default::default(),
     };
 
     let req = match auth::for_request(req, adapter, redis.clone()).await {
diff --git a/sentry/src/middleware/auth.rs b/sentry/src/middleware/auth.rs
@@ -22,7 +22,7 @@ pub(crate) async fn for_request(
             hv.to_str()
                 .map(|token_str| {
                     if token_str.starts_with(prefix) {
-                        Some(token_str.replacen(prefix, "", 1))
+                        Some(token_str[prefix.len()..].to_string())
                     } else {
                         None
                     }
diff --git a/sentry/src/middleware/cors.rs b/sentry/src/middleware/cors.rs
@@ -1,26 +1,16 @@
 use hyper::header::{ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_REQUEST_HEADERS};
 use hyper::{Body, HeaderMap, Method, Request, Response, StatusCode};
 
-pub enum CorsResult {
+pub enum Cors {
     Preflight(Response<Body>),
     Simple(HeaderMap),
-    None,
-}
-
-impl CorsResult {
-    pub fn is_none(&self) -> bool {
-        match self {
-            Self::None => true,
-            _ => false,
-        }
-    }
 }
 
 /// Cross-Origin Resource Sharing request handler
 /// Allows all origins and methods and supports Preflighted `OPTIONS` requests.
 /// On Simple CORS requests sets initial `HeaderMap` to be used in the routes handlers.
 /// Otherwise returns a `OPTION` Response.
-pub(crate) fn cors(req: &Request<Body>) -> CorsResult {
+pub(crate) fn cors(req: &Request<Body>) -> Option<Cors> {
     use hyper::header::{
         HeaderValue, ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN, CONTENT_LENGTH,
         ORIGIN,
@@ -62,11 +52,11 @@ pub(crate) fn cors(req: &Request<Body>) -> CorsResult {
         // set the headers of the Request
         *response.headers_mut() = headers;
 
-        CorsResult::Preflight(response)
+        Some(Cors::Preflight(response))
     } else if !headers.is_empty() {
-        CorsResult::Simple(headers)
+        Some(Cors::Simple(headers))
     } else {
-        CorsResult::None
+        None
     }
 }
 
@@ -87,7 +77,7 @@ mod test {
             .unwrap();
 
         let allowed_origin_headers = match cors(&cors_req) {
-            CorsResult::Simple(headers) => headers,
+            Some(Cors::Simple(headers)) => headers,
             _ => panic!("Simple CORS headers were expected"),
         };
         assert_eq!(
@@ -120,7 +110,7 @@ mod test {
             .unwrap();
 
         let response = match cors(&cors_req) {
-            CorsResult::Preflight(headers) => headers,
+            Some(Cors::Preflight(headers)) => headers,
             _ => panic!("Preflight CORS response was expected"),
         };
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ pub(crate) async fn for_request(`
`22`	`22`	`hv.to_str()`
`23`	`23`	`.map(\|token_str\| {`
`24`	`24`	`if token_str.starts_with(prefix) {`
`25`		`- Some(token_str.replacen(prefix, "", 1))`
	`25`	`+ Some(token_str[prefix.len()..].to_string())`
`26`	`26`	`} else {`
`27`	`27`	`None`
`28`	`28`	`}`