ti-nuage/gemserv
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'openssl' into revproxy-openssl

Browse Source
This commit is contained in:
int 80h
2020-05-09 20:56:58 -04:00
parent 839c6bbf81 5a90aaffc1
commit ae2d7e0092
6 changed files with 68 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.rs
View File

@@ -22,10 +22,8 @@ use tokio::net::TcpListener;
use tokio::net::TcpStream;
use tokio::prelude::*;
use tokio::runtime;
use tokio_rustls::rustls::internal::pemfile::{certs, pkcs8_private_keys};
use tokio_rustls::rustls::{Certificate, NoClientAuth, PrivateKey, ServerConfig};
use tokio_rustls::server::TlsStream;
use tokio_rustls::TlsAcceptor;
use tokio_openssl::SslStream;
use openssl::ssl::NameType;
use url::Url;
use chrono::{DateTime, Utc};
use mime_guess;
@@ -139,9 +137,9 @@ async fn handle_connection(mut con: conn::Connection, srv: &config::ServerCfg) -
con.send_status(status::Status::ProxyRequestRefused, "Url doesn't match certificate!").await?;
return Ok(());
}
// TODO get port from config
match url.port() {
Some(p) => { if p != 1965 {
Some(p) => { if p != srv.port {
con.send_status(status::Status::ProxyRequestRefused, "Wrong Port!").await?;
}},
None => {}
@@ -268,9 +266,8 @@ fn main() -> io::Result<()> {
.build()?;
let handle = runtime.handle().clone();
let config = tls::get_tls_config(cfg.clone());
let acceptor = TlsAcceptor::from(Arc::new(config));
let acceptor = tls::acceptor_conf(cfg.clone())?;
let fut = async {
let mut listener = TcpListener::bind(&addr).await?;
@@ -280,13 +277,12 @@ fn main() -> io::Result<()> {
let cmap = cmap.clone();
let fut = async move {
let mut stream = acceptor.accept(stream).await?;
let (_, sni) = TlsStream::get_mut(&mut stream);
let sni = match sni.get_sni_hostname() {
let mut stream = tokio_openssl::accept(&acceptor, stream).await.expect("Couldn't accept");
let sni = match stream.ssl().servername(NameType::HOST_NAME) {
Some(s) => s,
None => return Ok(()),
};
let srv = match cmap.get(sni) {
Some(h) => h,
None => {