Added tls.rs and resolver for sni
This commit is contained in:
@@ -9,6 +9,7 @@ edition = "2018"
|
||||
[dependencies]
|
||||
tokio = { version = "0.2", features = [ "net", "io-util", "rt-threaded" ] }
|
||||
tokio-rustls = "*"
|
||||
rustls = "*"
|
||||
futures-util = "*"
|
||||
toml = "*"
|
||||
serde = "*"
|
||||
|
||||
20
src/main.rs
20
src/main.rs
@@ -1,3 +1,4 @@
|
||||
#![allow(unused_imports)]
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
||||
@@ -20,20 +21,7 @@ use std::error::Error;
|
||||
|
||||
|
||||
mod config;
|
||||
|
||||
fn load_certs(path: &String) -> io::Result<Vec<Certificate>> {
|
||||
certs(&mut BufReader::new(File::open(path)?))
|
||||
.map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid cert"))
|
||||
}
|
||||
|
||||
fn load_keys(path: &String) -> PrivateKey {
|
||||
let keyfile = File::open(path)
|
||||
.expect("cannot open private key file");
|
||||
let mut reader = BufReader::new(keyfile);
|
||||
let key = pkcs8_private_keys(&mut reader)
|
||||
.expect("file contains invalid rsa private key");
|
||||
return key[0].clone();
|
||||
}
|
||||
mod tls;
|
||||
|
||||
fn get_content(request: String) -> String {
|
||||
|
||||
@@ -75,8 +63,8 @@ fn main() -> io::Result<()> {
|
||||
.next()
|
||||
.ok_or_else(|| io::Error::from(io::ErrorKind::AddrNotAvailable))?;
|
||||
|
||||
let certs = load_certs(&cfg.server[0].cert)?;
|
||||
let keys = load_keys(&cfg.server[0].key);
|
||||
let certs = tls::load_certs(&cfg.server[0].cert)?;
|
||||
let keys = tls::load_key(&cfg.server[0].key);
|
||||
|
||||
let mut runtime = runtime::Builder::new()
|
||||
.threaded_scheduler()
|
||||
|
||||
77
src/tls.rs
Normal file
77
src/tls.rs
Normal file
@@ -0,0 +1,77 @@
|
||||
use std::fs::File;
|
||||
use std::io::{ self, BufReader };
|
||||
use std::error::Error;
|
||||
use std::collections::HashMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
use rustls::{ResolvesServerCert, SignatureScheme};
|
||||
use rustls::ClientHello;
|
||||
use rustls::sign::CertifiedKey;
|
||||
use rustls::sign::{Signer, SigningKey, RSASigningKey};
|
||||
use tokio_rustls::rustls::{ Certificate, NoClientAuth, PrivateKey, ServerConfig };
|
||||
use tokio_rustls::rustls::internal::pemfile::{ certs, pkcs8_private_keys };
|
||||
|
||||
use crate::config;
|
||||
|
||||
pub fn load_certs(path: &String) -> io::Result<Vec<Certificate>> {
|
||||
certs(&mut BufReader::new(File::open(path)?))
|
||||
.map_err(|_| io::Error::new(io::ErrorKind::InvalidInput, "invalid cert"))
|
||||
}
|
||||
|
||||
pub fn load_key(path: &String) -> PrivateKey {
|
||||
let keyfile = File::open(path)
|
||||
.expect("cannot open private key file");
|
||||
let mut reader = BufReader::new(keyfile);
|
||||
let key = pkcs8_private_keys(&mut reader)
|
||||
.expect("file contains invalid rsa private key");
|
||||
return key[0].clone();
|
||||
}
|
||||
|
||||
pub struct CertResolver {
|
||||
map: HashMap<String, Box<CertifiedKey>>
|
||||
}
|
||||
|
||||
impl CertResolver {
|
||||
pub fn from_config(cfg: config::Config) -> Result<Self,()> {
|
||||
let mut map = HashMap::new();
|
||||
|
||||
for server in cfg.server.iter() {
|
||||
let key = load_key(&server.key);
|
||||
// .chain_err(|| format!("Failed to load private key from {}", https.key_file))?;
|
||||
let certs = load_certs(&server.cert).unwrap();
|
||||
// .chain_err(|| format!("Failed to load certificate from {}", server.cert));
|
||||
/*
|
||||
let signer: Arc<Box<CertifiedKey>> = Arc::new(Box::new(
|
||||
CertifiedKey::new(&key).map_err(|_| format!("Failed to create signer for {}", server.url))
|
||||
));
|
||||
*/
|
||||
let signing_key = RSASigningKey::new(
|
||||
&key).unwrap();
|
||||
|
||||
let signing_key_boxed: Arc<Box<dyn SigningKey>> = Arc::new(
|
||||
Box::new(signing_key));
|
||||
map.insert(server.url.clone(), Box::new(rustls::sign::CertifiedKey::new(
|
||||
certs, signing_key_boxed)));
|
||||
}
|
||||
|
||||
println!("Successfully loaded {} HTTPS configurations", map.len());
|
||||
|
||||
Ok(CertResolver{ map })
|
||||
}
|
||||
}
|
||||
|
||||
impl ResolvesServerCert for CertResolver {
|
||||
fn resolve(
|
||||
&self,
|
||||
client_hello: ClientHello,
|
||||
) -> Option<CertifiedKey> {
|
||||
if let Some(server_name) = client_hello.server_name() {
|
||||
if let Some(cert) = self.map.get(server_name.into()) {
|
||||
return Some(*cert.clone())
|
||||
}
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user