Merge branch '18-ssl-WIP'

Cargo.toml

@@ -32,3 +32,4 @@ serde_json = "1.0"
 serde_yaml = "0.8"
 
 ratel = "0.7.0"
+tempdir = "0.3.7"

src/lib/bs.rs

@@ -21,6 +21,7 @@ extern crate serde_derive;
 
 #[macro_use]
 extern crate serde_json;
+extern crate tempdir;
 
 pub mod config;
 pub mod from_file;
@@ -33,5 +34,6 @@ pub mod proxy_utils;
 pub mod replacer;
 pub mod rewrites;
 pub mod setup;
+pub mod ssl;
 pub mod with_body;
 pub mod without_body;

src/lib/config.rs

@@ -36,6 +36,11 @@ pub enum ProgramStartError {
     ConfigCliError(ConfigError),
     InvalidArgs(Error),
     FromFile(FromFileError),
+    BindHttp(std::io::Error),
+    BindHttps(std::io::Error),
+    SslFailed,
+    SslTempDir,
+    SslTempDirClose,
 }
 
 impl std::fmt::Display for ProgramStartError {
@@ -58,6 +63,16 @@ impl std::fmt::Display for ProgramStartError {
             ProgramStartError::ConfigFileRead => write!(f, "config file content could not be read"),
             ProgramStartError::FromFile(e) => write!(f, "{}", e),
             ProgramStartError::InvalidArgs(e) => write!(f, "{}", e),
+            ProgramStartError::SslFailed => write!(f, "could not create self-signed ssl certs"),
+            ProgramStartError::SslTempDir => write!(
+                f,
+                "could not create the temp dir to hold self-signed ssl certs"
+            ),
+            ProgramStartError::SslTempDirClose => write!(f, "could not clean up the temp dir"),
+            ProgramStartError::BindHttp(e) => write!(f, "could not bind over http, reason: {}", e),
+            ProgramStartError::BindHttps(e) => {
+                write!(f, "could not bind over https, reason: {}", e)
+            }
         }
     }
 }

src/lib/ssl.rs

@@ -0,0 +1,84 @@
+use config::ProgramStartError;
+use openssl::ssl::{SslAcceptor, SslAcceptorBuilder, SslFiletype, SslMethod};
+use std::fs::File;
+use std::io::{Error, Write};
+use std::path::PathBuf;
+use tempdir::TempDir;
+
+const TMP_DIR_NAME: &'static str = "config-gen";
+
+const TMP_KEY: &'static [u8] = include_bytes!("../key.pem");
+const TMP_KEY_NAME: &'static str = "key.pem";
+
+const TMP_CERT: &'static [u8] = include_bytes!("../cert.pem");
+const TMP_CERT_NAME: &'static str = "cert.pem";
+
+///
+/// Create an SslAcceptorBuilder by using self-signed
+/// certificates that exist inside this binary
+///
+/// This is acceptable since this is a development only
+/// tool and nothing this runs should be anywhere near anything
+/// that's shared, or in production.
+///
+pub fn builder() -> Result<SslAcceptorBuilder, ProgramStartError> {
+    let (key_path, cert_path, tmp_dir) = ssl_paths().map_err(|_e| ProgramStartError::SslTempDir)?;
+
+    let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls())
+        .map_err(|_e| ProgramStartError::SslFailed)?;
+
+    builder
+        .set_private_key_file(key_path, SslFiletype::PEM)
+        .map_err(|_e| ProgramStartError::SslFailed)?;
+
+    builder
+        .set_certificate_chain_file(cert_path)
+        .map_err(|_e| ProgramStartError::SslFailed)?;
+
+    tmp_dir
+        .close()
+        .map_err(|_e| ProgramStartError::SslTempDirClose)?;
+
+    Ok(builder)
+}
+
+#[test]
+fn test_ssl_builder() {
+    builder().unwrap();
+}
+
+///
+/// Takes the self-signed bundled key & cert
+/// and places them in a temporary directory so that they
+/// can be used by openSSL
+///
+/// # Examples
+///
+/// ```
+/// use bs::ssl::*;
+/// let (key_path, cert_path, tmp_dir) = ssl_paths().unwrap();
+/// println!("key={:?}, cert={:?}", key_path, cert_path);
+/// tmp_dir.close().unwrap();
+/// ```
+///
+pub fn ssl_paths() -> Result<(PathBuf, PathBuf, TempDir), Error> {
+    let tmp_dir = TempDir::new(TMP_DIR_NAME)?;
+    let key_path = tmp_dir.path().join(TMP_KEY_NAME);
+    let cert_path = tmp_dir.path().join(TMP_CERT_NAME);
+
+    let mut key_file = File::create(&key_path)?;
+    key_file.write_all(TMP_KEY)?;
+    key_file.sync_all()?;
+
+    let mut cert_file = File::create(&cert_path)?;
+    cert_file.write_all(TMP_CERT)?;
+    cert_file.sync_all()?;
+
+    Ok((key_path, cert_path, tmp_dir))
+}
+
+#[test]
+fn test_ssl_paths() {
+    let (_file_key, _file_cert, tmp_dir) = ssl_paths().unwrap();
+    assert_eq!(tmp_dir.path().exists(), true);
+}

src/main.rs

@@ -11,20 +11,20 @@ extern crate mime;
 extern crate openssl;
 extern crate regex;
 extern crate serde_yaml;
+extern crate tempdir;
 extern crate url;
 
 use actix_web::{server, App};
-use openssl::ssl::{SslAcceptor, SslFiletype, SslMethod};
 
 use bs::config::{ProgramConfig, ProgramStartError};
 use bs::from_file::FromFile;
 use bs::options::{ProgramOptions, ProxyScheme};
 use bs::setup::{apply_presets, state_and_presets};
-use openssl::ssl::SslAcceptorBuilder;
+use bs::ssl;
 
 fn main() {
     match ProgramOptions::from_vec(&mut std::env::args_os()).and_then(run_with_opts) {
-        Ok(opts) => println!("Running!"),
+        Ok(..) => { /* Running! */ }
         Err(e) => {
             eprintln!("{}", e);
             std::process::exit(1);
@@ -87,31 +87,25 @@ fn run_with_opts(opts: ProgramOptions) -> Result<(), ProgramStartError> {
     // target URL's scheme
     //
     let s = match server_opts.scheme {
-        ProxyScheme::Http => s.bind(&local_addr),
-        ProxyScheme::Https => s.bind_ssl(&local_addr, get_ssl_builder()),
+        ProxyScheme::Http => s.bind(&local_addr).map_err(ProgramStartError::BindHttp)?,
+        ProxyScheme::Https => {
+            let builder = ssl::builder()?;
+            s.bind_ssl(&local_addr, builder)
+                .map_err(ProgramStartError::BindHttps)?
+        }
     };
 
-    s.expect("Couldn't start the application")
-        .shutdown_timeout(0)
-        .start();
+    //
+    // Start the server
+    //
+    s.shutdown_timeout(0).start();
 
+    //
+    // Output the proxy URL only
+    //
     println!("{}://{}", server_opts.scheme, local_addr);
 
     let _ = sys.run();
 
     Ok(())
 }
-
-///
-/// SSL builder
-///
-/// Todo: allow key/cert options
-///
-fn get_ssl_builder() -> SslAcceptorBuilder {
-    let mut builder = SslAcceptor::mozilla_intermediate(SslMethod::tls()).unwrap();
-    builder
-        .set_private_key_file("src/key.pem", SslFiletype::PEM)
-        .unwrap();
-    builder.set_certificate_chain_file("src/cert.pem").unwrap();
-    builder
-}