Requested changes

Author: DanCodedThis

crates/api-snowflake-rest/src/server/error.rs

@@ -72,13 +72,13 @@ pub enum Error {
     #[snafu(transparent)]
     Execution { source: executor::Error },
 
-    #[snafu(display("No JWT secret set"))]
+    #[snafu(display("JWT secret is not set"))]
     NoJwtSecret {
         #[snafu(implicit)]
         location: Location,
     },
 
-    #[snafu(display("JWT create error: {error}"))]
+    #[snafu(display("Failed to create JWT: {error}"))]
     CreateJwt {
         #[snafu(source)]
         error: JwtError,

crates/api-snowflake-rest/src/server/layer.rs

@@ -40,16 +40,6 @@ pub async fn require_auth(
     // Record the result as part of the current span.
     tracing::Span::current().record("session_id", jwt_claims.session_id.as_str());
 
-    // let sessions = state.execution_svc.get_sessions(); // `get_sessions` returns an RwLock
-    //
-    // let sessions = sessions.read().await;
-    //
-    // if !sessions.contains_key(&session_id) {
-    //     return error::InvalidAuthTokenSnafu.fail()?;
-    // }
-    // //Dropping the lock guard before going to the next request
-    // drop(sessions);
-
     let response = next.run(req).await;
 
     // Record the result as part of the current span.

crates/embucket-lambda/src/main.rs

@@ -144,10 +144,6 @@ impl LambdaApp {
             );
         }
 
-        // if let Err(err) = ensure_session_header(&mut parts.headers, &self.state).await {
-        //     return Ok(snowflake_error_response(&err));
-        // }
-
         let mut axum_request = to_axum_request(parts, body_bytes);
         if let Some(addr) = extract_socket_addr(axum_request.headers()) {
             axum_request.extensions_mut().insert(ConnectInfo(addr));
@@ -209,52 +205,6 @@ fn extract_socket_addr(headers: &HeaderMap) -> Option<SocketAddr> {
         .map(|ip| SocketAddr::new(ip, 0))
 }
 
-// async fn ensure_session_header(
-//     headers: &mut HeaderMap,
-//     state: &AppState,
-// ) -> Result<(), SnowflakeError> {
-//     if let Some(token) = extract_token_from_auth(headers) {
-//         ensure_session(state, &token).await
-//     } else {
-//         let session_id = Uuid::new_v4().to_string();
-//         state.execution_svc.create_session(&session_id).await?;
-//         let header_value = HeaderValue::from_str(&format!("Snowflake Token=\"{session_id}\""))
-//             .map_err(|_| SnowflakeError::invalid_auth_data())?;
-//         headers.insert(AUTHORIZATION, header_value);
-//         Ok(())
-//     }
-// }
-//
-// async fn ensure_session(state: &AppState, session_id: &str) -> Result<(), SnowflakeError> {
-//     if !state
-//         .execution_svc
-//         .update_session_expiry(session_id)
-//         .await?
-//     {
-//         let _ = state.execution_svc.create_session(session_id).await?;
-//     }
-//     Ok(())
-// }
-//
-// fn snowflake_error_response(err: &SnowflakeError) -> Response<LambdaBody> {
-//     let (status, axum::Json(body)) = err.prepare_response();
-//     let payload =
-//         serde_json::to_string(&body).unwrap_or_else(|_| "{\"success\":false}".to_string());
-//     let body_preview = payload.clone();
-//     let mut response = Response::new(LambdaBody::Text(payload));
-//     *response.status_mut() = status;
-//     response
-//         .headers_mut()
-//         .insert(CONTENT_TYPE, HeaderValue::from_static("application/json"));
-//     info!(
-//         status = %response.status(),
-//         headers = ?response.headers(),
-//         body = %body_preview,
-//         "Sending HTTP error response"
-//     );
-//     response
-// }
-
 fn init_tracing() {
     let filter = std::env::var("RUST_LOG").unwrap_or_else(|_| "info".to_string());
     let emit_ansi = std::io::stdout().is_terminal();