Add TLS/TCP and DTLS/UDP support for both server and client #70
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| use std::io::{Read, Write, Result}; | ||
| use std::net::{TcpStream, UdpSocket, SocketAddr}; | ||
| use std::sync::Arc; | ||
|
|
||
| use rustls::{ClientConfig, ServerConfig, StreamOwned, ServerConnection, ClientConnection}; | ||
| use rustls::pki_types::ServerName; | ||
| use udp_dtls::{DtlsAcceptor, DtlsConnector, Identity, Certificate, DtlsStream}; | ||
|
|
||
| // Minimal wrapper to adapt UdpSocket to Read/Write for udp-dtls | ||
| #[derive(Debug)] | ||
| pub struct UdpSocketChannel(pub UdpSocket); | ||
|
|
||
| impl Read for UdpSocketChannel { | ||
| fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> { | ||
| self.0.recv(buf) | ||
| } | ||
| } | ||
|
|
||
| impl Write for UdpSocketChannel { | ||
| fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> { | ||
| self.0.send(buf) | ||
| } | ||
| fn flush(&mut self) -> std::io::Result<()> { | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| pub fn accept_tls(stream: TcpStream, config: Arc<ServerConfig>) -> Result<StreamOwned<ServerConnection, TcpStream>> { | ||
| let conn = ServerConnection::new(config).map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?; | ||
| Ok(StreamOwned::new(conn, stream)) | ||
| } | ||
|
|
||
| pub fn connect_tls(stream: TcpStream, config: Arc<ClientConfig>, server_name: &str) -> Result<StreamOwned<ClientConnection, TcpStream>> { | ||
| let server_name = ServerName::try_from(server_name.to_owned()) | ||
| .map_err(|_| std::io::Error::new(std::io::ErrorKind::InvalidInput, "Invalid server name"))?; | ||
| let conn = ClientConnection::new(config, server_name) | ||
| .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?; | ||
| Ok(StreamOwned::new(conn, stream)) | ||
| } | ||
|
|
||
| pub fn accept_dtls(socket: UdpSocket, identity: Identity) -> Result<DtlsStream<UdpSocketChannel>> { | ||
| let acceptor = DtlsAcceptor::builder(identity) | ||
| .build() | ||
| .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?; | ||
| let channel = UdpSocketChannel(socket); | ||
| let stream = acceptor.accept(channel) | ||
| .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, format!("{:?}", e)))?; | ||
| Ok(stream) | ||
| } | ||
|
|
||
| pub fn connect_dtls(socket: UdpSocket, addr: SocketAddr, identity: Identity, peer_cert: Certificate) -> Result<DtlsStream<UdpSocketChannel>> { | ||
| let connector = DtlsConnector::builder() | ||
| .identity(identity) | ||
| .add_root_certificate(peer_cert) | ||
| .build() | ||
| .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?; | ||
| let channel = UdpSocketChannel(socket); | ||
| let stream = connector.connect(&addr.to_string(), channel) | ||
| .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, format!("{:?}", e)))?; | ||
| Ok(stream) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion:
Establish a standard location for these files (analogous to of
$HOME/.ssh/), preferably in a path like$XDG_CONFIG_DIR/rustcat1. The files.../server-cert.der2 and.../server-key.der, stored in that directory, could be loaded automatically if--protocol tlsis used but no--certand/or no--keyargument (respectively) is given. To save the user having to type them every time.(Another command line flag could disable automatic file loading even in the absence of
--certor--key, for the paranoid or in scripts. Something like--no-user-defaults,--ignore-user-keys, etc.)Notes
$XDG_CONFIG_DIRas either the contents of that envvar, or$HOME/.config/if no such environment variable is set.default-cert.der/default-key.der, you get the idea.)