Skip to content

Commit

Permalink
Remove openssl
Browse files Browse the repository at this point in the history
  • Loading branch information
rukai committed Apr 5, 2023
1 parent 50a84bf commit fc18505
Show file tree
Hide file tree
Showing 17 changed files with 240 additions and 485 deletions.
9 changes: 4 additions & 5 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion shotover-proxy/tests/cassandra_int_tests/cluster/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use cassandra_protocol::frame::message_startup::BodyReqStartup;
use cassandra_protocol::frame::Version;
use shotover::frame::{cassandra::Tracing, CassandraFrame, CassandraOperation, Frame};
use shotover::message::Message;
use shotover::tlsls::{TlsConnector, TlsConnectorConfig};
use shotover::tls::{TlsConnector, TlsConnectorConfig};
use shotover::transforms::cassandra::sink_cluster::{
node::{CassandraNode, ConnectionFactory},
topology::{create_topology_task, TaskConnectionInfo},
Expand Down
1 change: 0 additions & 1 deletion shotover/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,5 @@ mod server;
pub mod sources;
pub mod tcp;
pub mod tls;
pub mod tlsls;
pub mod tracing_panic_handler;
pub mod transforms;
9 changes: 7 additions & 2 deletions shotover/src/server.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
use crate::codec::{CodecBuilder, CodecReadError};
use crate::message::Messages;
use crate::tlsls::{AcceptError, TlsAcceptor};
use crate::tls::{AcceptError, TlsAcceptor};
use crate::transforms::chain::{TransformChain, TransformChainBuilder};
use crate::transforms::Wrapper;
use anyhow::{anyhow, Context, Result};
use futures::future::join_all;
use futures::{SinkExt, StreamExt};
use metrics::{register_gauge, Gauge};
use std::io::ErrorKind;
use std::net::SocketAddr;
use std::sync::Arc;
use tokio::io::{AsyncRead, AsyncWrite};
Expand Down Expand Up @@ -363,7 +364,11 @@ fn spawn_read_write_tasks<
return;
}
Err(CodecReadError::Io(err)) => {
warn!("failed to receive message on tcp stream: {:?}", err);
// I suspect (but have not confirmed) that UnexpectedEof occurs here when the ssl client does not send "close notify" before terminating the connection.
// We shouldnt report that as a warning because its common for clients to do that for performance reasons.
if !matches!(err.kind(), ErrorKind::UnexpectedEof) {
warn!("failed to receive message on tcp stream: {:?}", err);
}
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion shotover/src/sources/cassandra.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::codec::Direction;
use crate::codec::{cassandra::CassandraCodecBuilder, CodecBuilder};
use crate::server::TcpCodecListener;
use crate::sources::Sources;
use crate::tlsls::{TlsAcceptor, TlsAcceptorConfig};
use crate::tls::{TlsAcceptor, TlsAcceptorConfig};
use crate::transforms::chain::TransformChainBuilder;
use anyhow::Result;
use serde::Deserialize;
Expand Down
2 changes: 1 addition & 1 deletion shotover/src/sources/kafka.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::codec::{kafka::KafkaCodecBuilder, CodecBuilder, Direction};
use crate::server::TcpCodecListener;
use crate::sources::Sources;
use crate::tlsls::{TlsAcceptor, TlsAcceptorConfig};
use crate::tls::{TlsAcceptor, TlsAcceptorConfig};
use crate::transforms::chain::TransformChainBuilder;
use anyhow::Result;
use serde::Deserialize;
Expand Down
2 changes: 1 addition & 1 deletion shotover/src/sources/redis.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::codec::{redis::RedisCodecBuilder, CodecBuilder, Direction};
use crate::server::TcpCodecListener;
use crate::sources::Sources;
use crate::tlsls::{TlsAcceptor, TlsAcceptorConfig};
use crate::tls::{TlsAcceptor, TlsAcceptorConfig};
use crate::transforms::chain::TransformChainBuilder;
use anyhow::Result;
use serde::Deserialize;
Expand Down
Loading

0 comments on commit fc18505

Please sign in to comment.