TheLanc3/lan-mouse
1
0
Fork 0
mirror of https://github.com/feschber/lan-mouse.git synced 2026-04-20 21:13:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

use certificate when connecting

Browse Source
This commit is contained in:
Ferdinand Schober
2024-09-27 18:14:26 +02:00
parent 790e1b927f
commit c75a085e78
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/connect.rs
View File

@@ -37,13 +37,13 @@ pub(crate) enum LanMouseConnectionError {
async fn connect( async fn connect(
addr: SocketAddr, addr: SocketAddr,
cert: Certificate,
) -> Result<(Arc<dyn Conn + Sync + Send>, SocketAddr), LanMouseConnectionError> { ) -> Result<(Arc<dyn Conn + Sync + Send>, SocketAddr), LanMouseConnectionError> {
log::info!("connecting to {addr} ..."); log::info!("connecting to {addr} ...");
let conn = Arc::new(UdpSocket::bind("0.0.0.0:0").await?); let conn = Arc::new(UdpSocket::bind("0.0.0.0:0").await?);
conn.connect(addr).await?; conn.connect(addr).await?;
let certificate = Certificate::generate_self_signed(["localhost".to_owned()])?;
let config = Config { let config = Config {
certificates: vec![certificate], certificates: vec![cert],
insecure_skip_verify: true, insecure_skip_verify: true,
extended_master_secret: ExtendedMasterSecretType::Require, extended_master_secret: ExtendedMasterSecretType::Require,
..Default::default() ..Default::default()
@@ -55,10 +55,11 @@ async fn connect(
async fn connect_any( async fn connect_any(
addrs: &[SocketAddr], addrs: &[SocketAddr],
cert: Certificate,
) -> Result<(Arc<dyn Conn + Send + Sync>, SocketAddr), LanMouseConnectionError> { ) -> Result<(Arc<dyn Conn + Send + Sync>, SocketAddr), LanMouseConnectionError> {
let mut joinset = JoinSet::new(); let mut joinset = JoinSet::new();
for &addr in addrs { for &addr in addrs {
joinset.spawn_local(connect(addr)); joinset.spawn_local(connect(addr, cert.clone()));
} }
let conn = joinset.join_next().await; let conn = joinset.join_next().await;
conn.expect("no addrs to connect").expect("failed to join") conn.expect("no addrs to connect").expect("failed to join")
@@ -66,6 +67,7 @@ async fn connect_any(
pub(crate) struct LanMouseConnection { pub(crate) struct LanMouseConnection {
server: Server, server: Server,
cert: Certificate,
conns: Rc<Mutex<HashMap<SocketAddr, Arc<dyn Conn + Send + Sync>>>>, conns: Rc<Mutex<HashMap<SocketAddr, Arc<dyn Conn + Send + Sync>>>>,
connecting: Rc<Mutex<HashSet<ClientHandle>>>, connecting: Rc<Mutex<HashSet<ClientHandle>>>,
recv_rx: Receiver<(ClientHandle, ProtoEvent)>, recv_rx: Receiver<(ClientHandle, ProtoEvent)>,
@@ -73,10 +75,11 @@ pub(crate) struct LanMouseConnection {
} }
impl LanMouseConnection { impl LanMouseConnection {
pub(crate) fn new(server: Server) -> Self { pub(crate) fn new(server: Server, cert: Certificate) -> Self {
let (recv_tx, recv_rx) = channel(); let (recv_tx, recv_rx) = channel();
Self { Self {
server, server,
cert,
conns: Default::default(), conns: Default::default(),
connecting: Default::default(), connecting: Default::default(),
recv_rx, recv_rx,
@@ -119,6 +122,7 @@ impl LanMouseConnection {
// connect in the background // connect in the background
spawn_local(connect_to_handle( spawn_local(connect_to_handle(
self.server.clone(), self.server.clone(),
self.cert.clone(),
handle, handle,
self.conns.clone(), self.conns.clone(),
self.connecting.clone(), self.connecting.clone(),
@@ -131,6 +135,7 @@ impl LanMouseConnection {
async fn connect_to_handle( async fn connect_to_handle(
server: Server, server: Server,
cert: Certificate,
handle: ClientHandle, handle: ClientHandle,
conns: Rc<Mutex<HashMap<SocketAddr, Arc<dyn Conn + Send + Sync>>>>, conns: Rc<Mutex<HashMap<SocketAddr, Arc<dyn Conn + Send + Sync>>>>,
connecting: Rc<Mutex<HashSet<ClientHandle>>>, connecting: Rc<Mutex<HashSet<ClientHandle>>>,
@@ -148,7 +153,7 @@ async fn connect_to_handle(
.map(|a| SocketAddr::new(a, port)) .map(|a| SocketAddr::new(a, port))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
log::info!("client ({handle}) connecting ... (ips: {addrs:?})"); log::info!("client ({handle}) connecting ... (ips: {addrs:?})");
let res = connect_any(&addrs).await; let res = connect_any(&addrs, cert).await;
let (conn, addr) = match res { let (conn, addr) = match res {
Ok(c) => c, Ok(c) => c,
Err(e) => { Err(e) => {

5
src/server.rs
View File

@@ -131,8 +131,9 @@ impl Server {
// listener + connection // listener + connection
let listener = let listener =
LanMouseListener::new(self.config.port, cert, self.authorized_keys.clone()).await?; LanMouseListener::new(self.config.port, cert.clone(), self.authorized_keys.clone())
let conn = LanMouseConnection::new(self.clone()); .await?;
let conn = LanMouseConnection::new(self.clone(), cert);
// input capture + emulation // input capture + emulation
let mut capture = Capture::new(self.clone(), conn); let mut capture = Capture::new(self.clone(), conn);