Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 18 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ zstd = "0.13"
toml = "0.8"

# TLS dependencies
rustls = { version = "0.21", features = ["dangerous_configuration"] }
tokio-rustls = "0.24"
rustls = { version = "0.22" }
tokio-rustls = "0.25"
rcgen = { version = "0.14.5", features = ["pem"] }
rustls-pemfile = "1.0"
rustls-native-certs = "0.6"
rustls-pemfile = "2.1"
rustls-native-certs = "0.7"
time = "0.3.47"

[dev-dependencies]
Expand Down
12 changes: 9 additions & 3 deletions src/service/tls_client.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use futures::{SinkExt, StreamExt};
use rustls::pki_types::ServerName;
use std::sync::Arc;
use tokio::net::TcpStream;
use tokio_rustls::client::TlsStream;
Expand All @@ -7,7 +8,7 @@ use tracing::{debug, instrument};

use crate::core::codec::PacketCodec;
use crate::core::packet::Packet;
use crate::error::Result;
use crate::error::{ProtocolError, Result};
use crate::protocol::message::Message;
use crate::transport::session_cache::SessionCache;
use crate::transport::tls::TlsClientConfig;
Expand Down Expand Up @@ -48,7 +49,6 @@ impl TlsClient {
/// Some(Arc::new(cache))
/// ).await?;
/// ```
#[instrument(skip(config, session_cache))]
pub async fn connect_with_session(
addr: &str,
config: TlsClientConfig,
Expand All @@ -58,7 +58,13 @@ impl TlsClient {
let connector = tokio_rustls::TlsConnector::from(std::sync::Arc::new(tls_config));

let stream = TcpStream::connect(addr).await?;
let domain = config.server_name()?;

// Create ServerName from owned string to ensure 'static lifetime
// Note: Box::leak() is used here to satisfy tokio_rustls' 'static requirement
let server_name_str = config.server_name_string();
let domain_static: &'static str = Box::leak(server_name_str.into_boxed_str());
let domain = ServerName::try_from(domain_static)
.map_err(|_| ProtocolError::TlsError("Invalid server name".into()))?;

let tls_stream = connector.connect(domain, stream).await?;
let framed = Framed::new(tls_stream, PacketCodec);
Expand Down
5 changes: 1 addition & 4 deletions src/transport/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,7 @@ fn convert_to_pipe_name(path: &str) -> String {
}

// Extract a meaningful name from the path
let name = path
.trim_start_matches('/')
.replace('/', "_")
.replace('\\', "_");
let name = path.trim_start_matches('/').replace(['/', '\\'], "_");

// Use a default if empty
let name = if name.is_empty() {
Expand Down
Loading