Merge pull request #59 from lucid-kv/improve-encryption

Improve Encryption
lucid-kv · Mar 1, 2020 · d5c80d5 · d5c80d5
2 parents e6788a2 + ac350f9
commit d5c80d5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/configuration.rs b/src/configuration.rs
@@ -5,6 +5,7 @@ use std::{
 
 use app_dirs::{AppDataType, AppDirsError};
 use log::LevelFilter;
+use rand::Rng;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Configuration {
@@ -49,8 +50,8 @@ impl Default for Configuration {
             },
             encryption: Encryption {
                 enabled: false,
-                private_key: String::new(),
-                iv: String::new(),
+                private_key: hex::encode(rand::thread_rng().gen::<[u8; 24]>()),
+                iv: hex::encode(rand::thread_rng().gen::<[u8; 16]>()),
             },
             webui: WebUI { enabled: false },
             store: Store { max_limit: 7340032 },

diff --git a/src/server.rs b/src/server.rs
@@ -34,10 +34,18 @@ impl Server {
 
         let mut encryption_key = None;
         if configuration.encryption.enabled {
-            encryption_key = Some([
-                configuration.encryption.private_key.as_str(),
-                configuration.encryption.iv.as_str(),
-            ]);
+            if configuration.encryption.private_key.is_empty() {
+                panic!("The private key must be filled.");
+            }
+            else if configuration.encryption.iv.is_empty() {
+                panic!("The initialization vector must be filled.")
+            }
+            else {
+                encryption_key = Some([
+                    configuration.encryption.private_key.as_str(),
+                    configuration.encryption.iv.as_str(),
+                ]);
+            }
         }
         let store = Arc::new(KvStore::new(encryption_key));
         let store = warp::any().map(move || store.clone());