Merge pull request #32 from lucid-kv/https-support

Implement HTTPS support

.gitignore

@@ -19,4 +19,7 @@
 #**/*.rs.bk
 
 **/resource.rc
-**/resource.lib
+**/resource.lib
+
+# Ignore SSL certificate folder
+tls

Cargo.toml

@@ -36,7 +36,6 @@ app_dirs = "*"
 ring = "*"
 uuid = "*"
 rand = "*"
-warp = "*"
 chashmap = "*"
 plugin = "*"
 tree_magic = "*"
@@ -49,3 +48,7 @@ fern = "*"
 [dependencies.clap]
 version = "*"
 features = ["yaml"]
+
+[dependencies.warp]
+version = "*"
+features = ["tls"]

src/configuration.rs

@@ -17,9 +17,11 @@ impl Configuration {
         Configuration {
             default: Base {
                 bind_address: IpAddr::from(Ipv4Addr::LOCALHOST),
-                port: 7021, // TODO: change after implementing SSL
+                port: 7020,
                 port_ssl: 7021,
-                use_ssl: false,
+                use_ssl: true,
+                ssl_certificate: String::new(),
+                ssl_certificate_key: String::new()
             },
             authentication: Authentication {
                 enabled: true,
@@ -56,6 +58,8 @@ pub struct Base {
     pub port: u16,
     pub port_ssl: u16,
     pub use_ssl: bool,
+    pub ssl_certificate: String,
+    pub ssl_certificate_key: String,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/server.rs

@@ -109,10 +109,12 @@ impl Server {
             .with(warp::reply::with::header("Server", format!("Lucid v{}", crate_version!())))
             .with(log);
 
-        warp::serve(routes).run((
-            configuration.default.bind_address,
-            configuration.default.port,
-        ), );
+        let instance = warp::serve(routes);
+        if configuration.default.use_ssl {
+            instance.tls(&configuration.default.ssl_certificate,  &configuration.default.ssl_certificate_key).run((configuration.default.bind_address, configuration.default.port_ssl));
+        } else {
+            instance.run((configuration.default.bind_address, configuration.default.port));
+        }
     }
 }