fix multiple versions of rustls (#1513)

Fixes: #1509

Author: nikhilsinhaparseable

Cargo.lock

@@ -31,11 +31,11 @@ parquet = "57.1.0"
 # Web server and HTTP-related
 actix-cors = "0.7.0"
 actix-web-lab = "0.24.3"
-actix-web = { version = "4.9.0", features = ["rustls-0_22"] }
+actix-web = { version = "4.9.0", features = ["rustls-0_23"] }
 actix-web-httpauth = "0.8"
 actix-web-prometheus = { version = "0.1", default-features = false }
 actix-web-static-files = "4.0"
-http = "0.2.7"
+http = "1.0"
 http-auth-basic = "0.3.3"
 tonic = { version = "0.14.1", features = [
     "tls-aws-lc",
@@ -63,7 +63,7 @@ base64 = "0.22.0"
 cookie = "0.18.1"
 hex = "0.4"
 openid = { version = "0.18.3", default-features = false, features = ["rustls"] }
-rustls = "0.22.4"
+rustls = { version = "0.23", default-features = false, features = ["ring", "std"] }
 rustls-pemfile = "2.1.2"
 sha2 = "0.10.8"
 
@@ -147,13 +147,13 @@ once_cell = "1.20"
 rayon = "1.8"
 rand = "0.8.5"
 regex = "1.12.2"
-reqwest = { version = "0.11.27", default-features = false, features = [
+reqwest = { version = "0.12", default-features = false, features = [
     "rustls-tls",
     "json",
     "gzip",
     "brotli",
     "stream",
-] } # cannot update cause rustls is not latest `see rustls`
+] }
 semver = "1.0"
 static-files = "0.2"
 thiserror = "2.0"

Cargo.toml

@@ -16,6 +16,7 @@
  *
  */
 
+use actix_web::http::StatusCode;
 use actix_web::http::header::ContentType;
 use arrow_schema::{ArrowError, DataType, Schema};
 use async_trait::async_trait;
@@ -24,7 +25,6 @@ use datafusion::logical_expr::{LogicalPlan, Projection};
 use datafusion::prelude::Expr;
 use datafusion::sql::sqlparser::parser::ParserError;
 use derive_more::FromStrError;
-use http::StatusCode;
 use serde_json::{Error as SerdeError, Value as JsonValue};
 use std::collections::HashMap;
 use std::fmt::Debug;

src/alerts/mod.rs

@@ -18,10 +18,10 @@
 
 use std::collections::{HashMap, HashSet};
 
+use actix_web::http::StatusCode;
 use actix_web::{Error, http::header::ContentType};
 use chrono::Utc;
 use datafusion::error::DataFusionError;
-use http::StatusCode;
 use itertools::Itertools;
 use once_cell::sync::Lazy;
 use relative_path::RelativePathBuf;
@@ -335,7 +335,7 @@ pub enum CorrelationError {
 }
 
 impl actix_web::ResponseError for CorrelationError {
-    fn status_code(&self) -> http::StatusCode {
+    fn status_code(&self) -> StatusCode {
         match self {
             Self::ObjectStorage(_) => StatusCode::INTERNAL_SERVER_ERROR,
             Self::Serde(_) => StatusCode::BAD_REQUEST,

src/correlation.rs

@@ -26,11 +26,12 @@ use std::time::{Duration, Instant};
 use tokio::sync::{RwLock, Semaphore};
 
 use actix_web::Responder;
-use actix_web::http::header::{self, HeaderMap};
+use actix_web::http::StatusCode;
+use actix_web::http::header::HeaderMap;
 use actix_web::web::Path;
 use bytes::Bytes;
 use chrono::Utc;
-use http::{StatusCode, header as http_header};
+use http::header;
 use itertools::Itertools;
 use serde::de::{DeserializeOwned, Error};
 use serde_json::error::Error as SerdeError;
@@ -367,10 +368,15 @@ pub async fn sync_streams_with_ingestors(
     body: Bytes,
     stream_name: &str,
 ) -> Result<(), StreamError> {
-    let mut reqwest_headers = http_header::HeaderMap::new();
+    let mut reqwest_headers = reqwest::header::HeaderMap::new();
 
     for (key, value) in headers.iter() {
-        reqwest_headers.insert(key.clone(), value.clone());
+        // Convert actix header name/value to reqwest header name/value
+        if let Ok(name) = reqwest::header::HeaderName::from_bytes(key.as_str().as_bytes())
+            && let Ok(val) = reqwest::header::HeaderValue::from_bytes(value.as_bytes())
+        {
+            reqwest_headers.insert(name, val);
+        }
     }
 
     let body_clone = body.clone();

src/handlers/http/cluster/mod.rs

@@ -21,8 +21,8 @@ use crate::{
     handlers::http::{base_path_without_preceding_slash, modal::NodeType},
     prism::logstream::PrismLogstreamError,
 };
-use actix_web::http::header;
 use chrono::{DateTime, Utc};
+use http::header;
 use serde::{Deserialize, Serialize};
 use tracing::error;
 use url::Url;

src/handlers/http/cluster/utils.rs

@@ -18,6 +18,7 @@
 
 use std::sync::Arc;
 
+use actix_web::http::StatusCode;
 use actix_web::{
     HttpResponse,
     body::MessageBody,
@@ -26,7 +27,6 @@ use actix_web::{
     error::ErrorServiceUnavailable,
     middleware::Next,
 };
-use http::StatusCode;
 use once_cell::sync::Lazy;
 use tokio::{sync::Mutex, task::JoinSet};
 use tracing::{error, info};

src/handlers/http/health_check.rs

@@ -18,12 +18,12 @@
 
 use std::collections::{HashMap, HashSet};
 
+use actix_web::http::StatusCode;
 use actix_web::web::{self, Json, Path};
 use actix_web::{HttpRequest, HttpResponse, http::header::ContentType};
 use arrow_array::RecordBatch;
 use bytes::Bytes;
 use chrono::Utc;
-use http::StatusCode;
 
 use crate::event::error::EventError;
 use crate::event::format::known_schema::{self, KNOWN_SCHEMA_LIST};
@@ -508,7 +508,7 @@ pub enum PostError {
 }
 
 impl actix_web::ResponseError for PostError {
-    fn status_code(&self) -> http::StatusCode {
+    fn status_code(&self) -> StatusCode {
         use PostError::*;
         match self {
             SerdeError(_)

src/handlers/http/ingest.rs

@@ -16,8 +16,9 @@
  *
  */
 
+use actix_web::http::StatusCode;
 use actix_web::{HttpResponse, Result, http::header::ContentType, web};
-use http::{StatusCode, header};
+use http::header;
 use itertools::Itertools;
 use reqwest;
 use serde_json::{Value, json};
@@ -146,7 +147,7 @@ pub enum LLMError {
 }
 
 impl actix_web::ResponseError for LLMError {
-    fn status_code(&self) -> http::StatusCode {
+    fn status_code(&self) -> StatusCode {
         match self {
             Self::InvalidAPIKey => StatusCode::INTERNAL_SERVER_ERROR,
             Self::FailedRequest(_) => StatusCode::INTERNAL_SERVER_ERROR,

src/handlers/http/llm.rs

@@ -506,8 +506,8 @@ fn classify_json_error(kind: serde_json::error::Category) -> StatusCode {
 
 pub mod error {
 
+    use actix_web::http::StatusCode;
     use actix_web::http::header::ContentType;
-    use http::StatusCode;
 
     use crate::{
         hottier::HotTierError,
@@ -589,7 +589,7 @@ pub mod error {
     }
 
     impl actix_web::ResponseError for StreamError {
-        fn status_code(&self) -> http::StatusCode {
+        fn status_code(&self) -> StatusCode {
             match self {
                 StreamError::CreateStream(CreateStreamError::StreamNameValidation(_)) => {
                     StatusCode::BAD_REQUEST
@@ -615,9 +615,10 @@ pub mod error {
                 StreamError::InvalidRetentionConfig(_) => StatusCode::BAD_REQUEST,
                 StreamError::SerdeError(_) => StatusCode::BAD_REQUEST,
                 StreamError::Anyhow(_) => StatusCode::INTERNAL_SERVER_ERROR,
-                StreamError::Network(err) => {
-                    err.status().unwrap_or(StatusCode::INTERNAL_SERVER_ERROR)
-                }
+                StreamError::Network(err) => err
+                    .status()
+                    .and_then(|s| StatusCode::from_u16(s.as_u16()).ok())
+                    .unwrap_or(StatusCode::INTERNAL_SERVER_ERROR),
                 StreamError::HotTierNotEnabled(_) => StatusCode::FORBIDDEN,
                 StreamError::HotTierValidation(_) => StatusCode::BAD_REQUEST,
                 StreamError::HotTierError(_) => StatusCode::INTERNAL_SERVER_ERROR,