refactor

Author: Devdutt Shenoi

src/audit.rs

@@ -160,10 +160,10 @@ const DROP_HEADERS: [&str; 4] = ["authorization", "cookie", "user-agent", "x-p-s
 
 pub struct AuditLogBuilder {
     version: AuditLogVersion,
-    pub deployment_id: Ulid,
+    deployment_id: Ulid,
     audit_id: Ulid,
     start_time: DateTime<Utc>,
-    pub stream: String,
+    stream: String,
     pub actor: ActorLog,
     pub request: RequestLog,
     pub response: ResponseLog,
@@ -198,7 +198,23 @@ impl AuditLogBuilder {
     }
 
     pub fn update_from_http(&mut self, req: &mut ServiceRequest) {
-        let (username, authorization_method) = get_auth_details(req);
+        let mut username = "Unknown".to_owned();
+        let mut authorization_method = "None".to_owned();
+
+        // Extract authorization details from request, either from basic auth
+        // header or cookie, else use default value.
+        if let Ok(creds) = req.extract::<BasicAuth>().into_inner() {
+            username = creds.user_id().trim().to_owned();
+            authorization_method = "Basic Auth".to_owned();
+        } else if let Some(cookie) = req.cookie("session") {
+            authorization_method = "Session Cookie".to_owned();
+            if let Some(user_id) = Ulid::from_string(cookie.value())
+                .ok()
+                .and_then(|ulid| Users.get_username_from_session(&SessionKey::SessionId(ulid)))
+            {
+                username = user_id;
+            }
+        }
 
         let conn = req.connection_info();
         self.request = RequestLog {
@@ -235,27 +251,6 @@ impl AuditLogBuilder {
     }
 }
 
-fn get_auth_details(req: &mut ServiceRequest) -> (String, String) {
-    let mut username = "Unknown".to_owned();
-    let mut auth_method = "None".to_owned();
-
-    if let Ok(creds) = req.extract::<BasicAuth>().into_inner() {
-        return (creds.user_id().trim().to_owned(), "Basic Auth".to_owned());
-    }
-
-    if let Some(cookie) = req.cookie("session") {
-        auth_method = "Session Cookie".to_owned();
-        if let Some(user_id) = Ulid::from_string(cookie.value())
-            .ok()
-            .and_then(|ulid| Users.get_username_from_session(&SessionKey::SessionId(ulid)))
-        {
-            username = user_id;
-        }
-    }
-
-    (username, auth_method)
-}
-
 impl Drop for AuditLogBuilder {
     fn drop(&mut self) {
         let audit_json = json!({

src/handlers/http/middleware.rs

@@ -139,11 +139,8 @@ where
 
          ## Section start */
         let mut stream_name = None;
-        if let Some((_, kinesis_common_attributes)) = req
-            .request()
-            .headers()
-            .iter()
-            .find(|&(key, _)| key == KINESIS_COMMON_ATTRIBUTES_KEY)
+        if let Some(kinesis_common_attributes) =
+            req.request().headers().get(KINESIS_COMMON_ATTRIBUTES_KEY)
         {
             let attribute_value: &str = kinesis_common_attributes.to_str().unwrap();
             let message: Message = serde_json::from_str(attribute_value).unwrap();
@@ -159,14 +156,12 @@ where
                 HeaderName::from_static(LOG_SOURCE_KEY),
                 header::HeaderValue::from_static(LOG_SOURCE_KINESIS),
             );
-            stream_name = Some(message.common_attributes.x_p_stream);
-        }
-
-        if let Some(stream) = req.match_info().get("logstream") {
-            stream_name = Some(stream.to_owned());
+            stream_name.replace(message.common_attributes.x_p_stream);
+        } else if let Some(stream) = req.match_info().get("logstream") {
+            stream_name.replace(stream.to_owned());
         } else if let Some(value) = req.headers().get(STREAM_NAME_HEADER_KEY) {
             if let Ok(stream) = value.to_str() {
-                stream_name = Some(stream.to_owned())
+                stream_name.replace(stream.to_owned());
             }
         }
 
@@ -223,11 +218,7 @@ pub fn auth_stream_context(
     let creds = extract_session_key(req);
     let mut stream = req.match_info().get("logstream");
     if stream.is_none() {
-        if let Some((_, stream_name)) = req
-            .headers()
-            .iter()
-            .find(|&(key, _)| key == STREAM_NAME_HEADER_KEY)
-        {
+        if let Some(stream_name) = req.headers().get(STREAM_NAME_HEADER_KEY) {
             stream = Some(stream_name.to_str().unwrap());
         }
     }