User activation logic and UI. r=fabrice

Author: ferjm

Cargo.lock

@@ -28,7 +28,7 @@ foxbox_taxonomy = { path = "components/taxonomy/" }
 openzwave-adapter = { path = "components/openzwave-adapter/" }
 tls = { path = "components/tls/" }
 
-foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "ec53c3a" }
+foxbox_users = { git = "https://github.com/ferjm/users.git", branch = "user.activation" }
 iron-cors = { git = "https://github.com/fxbox/iron-cors.git", rev = "f397cd2" }
 multicast_dns = { git = "https://github.com/fxbox/multicast-dns.git", rev = "a6e4bcc" }
 

Cargo.toml

@@ -17,7 +17,7 @@ features = ["ssl"]
 
 [dependencies]
 clippy = "0.0.71"
-foxbox_users = { git = "https://github.com/fxbox/users.git", rev = "ec53c3a" }
+foxbox_users = { git = "https://github.com/ferjm/users.git", branch = "user.activation" }
 hyper = "0.8.1"
 libc = "0.2.7"
 log = "0.3"

components/core/Cargo.toml

@@ -10,7 +10,7 @@ use serde_json;
 use std::io;
 use std::net::SocketAddr;
 use std::sync::atomic::AtomicBool;
-use std::sync::Arc;
+use std::sync::{ Arc, RwLock };
 use std::vec::IntoIter;
 use tls::{ CertificateRecord, CertificateManager };
 use upnp::UpnpManager;
@@ -34,6 +34,6 @@ pub trait Controller : Send + Sync + Clone + Reflect + 'static {
 
     fn get_config(&self) -> Arc<ConfigService>;
     fn get_upnp_manager(&self) -> Arc<UpnpManager>;
-    fn get_users_manager(&self) -> Arc<UsersManager>;
+    fn get_users_manager(&self) -> Arc<RwLock<UsersManager>>;
     fn get_profile(&self) -> &ProfileService;
 }

components/core/src/traits.rs

@@ -18,7 +18,7 @@ use std::io;
 use std::net::SocketAddr;
 use std::net::ToSocketAddrs;
 use std::path::PathBuf;
-use std::sync::{ Arc, Mutex };
+use std::sync::{ Arc, Mutex, RwLock };
 use std::sync::atomic::{ AtomicBool, Ordering };
 use std::vec::IntoIter;
 use tls::{ CertificateManager, CertificateRecord, SniSslContextProvider, TlsOption };
@@ -36,7 +36,7 @@ pub struct FoxBox {
     websockets: Arc<Mutex<HashMap<ws::util::Token, ws::Sender>>>,
     pub config: Arc<ConfigService>,
     upnp: Arc<UpnpManager>,
-    users_manager: Arc<UsersManager>,
+    users_manager: Arc<RwLock<UsersManager>>,
     profile_service: Arc<ProfileService>,
 }
 
@@ -64,7 +64,7 @@ impl FoxBox {
             ws_port: ws_port,
             config: config,
             upnp: Arc::new(UpnpManager::new()),
-            users_manager: Arc::new(UsersManager::new(&profile_service.path_for("users_db.sqlite"))),
+            users_manager: Arc::new(RwLock::new(UsersManager::new(&profile_service.path_for("users_db.sqlite")))),
             profile_service: Arc::new(profile_service)
         }
     }
@@ -150,7 +150,7 @@ impl Controller for FoxBox {
         self.upnp.clone()
     }
 
-    fn get_users_manager(&self) -> Arc<UsersManager> {
+    fn get_users_manager(&self) -> Arc<RwLock<UsersManager>> {
         self.users_manager.clone()
     }
 

src/controller.rs

@@ -69,11 +69,12 @@ impl<T: Controller> HttpServer<T> {
                                                       adapter_api);
 
         let users_manager = self.controller.get_users_manager();
+        let guard = users_manager.read().unwrap();
         let mut mount = Mount::new();
         mount.mount("/", static_router::create(users_manager.clone()))
              .mount("/ping", Ping)
              .mount("/api/v1", taxonomy_chain)
-             .mount("/users", users_manager.get_router_chain());
+             .mount("/users", guard.get_router_chain());
 
         let mut chain = Chain::new(mount);
         chain.link_after(Custom404);

src/http_server.rs

@@ -125,7 +125,8 @@ Options:
         --dns-domain <domain>          Set the top level domain for public DNS [default: box.knilxof.org]
         --dns-api <url>                Set the DNS API endpoint [default: https://knilxof.org:5300]
     -c, --config <namespace;key;value>  Set configuration override
-    -h, --help               Print this help menu.
+    -e, --email-server <url>    User email server URL. [default: https://knilxof.org:4000]
+    -h, --help                  Print this help menu.
 ",
         flag_local_name: String,
         flag_port: u16,
@@ -138,7 +139,8 @@ Options:
         flag_disable_tls: bool,
         flag_dns_domain: String,
         flag_dns_api: String,
-        flag_config: Option<Vec<String>>);
+        flag_config: Option<Vec<String>>,
+        flag_email_server: String);
 
 /// Updates local host name with the provided host name string. If requested host name
 /// is not available (used by anyone else on the same network) then collision
@@ -292,12 +294,27 @@ fn main() {
                                                     args.flag_tunnel_secret,
                                                     args.flag_port,
                                                     args.flag_wsport,
-                                                    registrar.get_remote_dns_name())));
+                                                    registrar.clone().get_remote_dns_name())));
         tunnel.as_mut().unwrap().start().unwrap();
     }
 
-    registrar.start(args.flag_iface, &tunnel,
-                    args.flag_port,  &controller);
+    registrar.clone().start(args.flag_iface, &tunnel,
+                            args.flag_port,  &controller);
+
+    let mut invitation_prepath = if controller.get_tls_enabled() {
+        String::from("https://")
+    } else {
+        String::from("http://")
+    };
+
+    invitation_prepath = format!("{}{}/users", invitation_prepath,
+                                 registrar.get_remote_dns_name());
+
+    let manager = controller.get_users_manager().clone();
+    manager.write().unwrap().setup_invitation_middleware(
+        args.flag_email_server,
+        invitation_prepath
+    );
 
     controller.run(&SHUTDOWN_FLAG);
 
@@ -324,6 +341,7 @@ describe! main {
             assert_eq!(args.flag_iface, None);
             assert_eq!(args.flag_tunnel, None);
             assert_eq!(args.flag_config, None);
+            assert_eq!(args.flag_email_server, "https://knilxof.org:4000");
             assert_eq!(args.flag_help, false);
         }
 

src/main.rs

@@ -7,11 +7,10 @@
 /// after trying more aggressively at first run.
 
 extern crate get_if_addrs;
-extern crate hyper;
 
-use self::hyper::Client;
-use self::hyper::header::Connection;
-use self::hyper::status::StatusCode;
+use hyper::Client;
+use hyper::header::Connection;
+use hyper::status::StatusCode;
 use self::get_if_addrs::{ IfAddr, Interface };
 use foxbox_core::traits::Controller;
 use serde_json;
@@ -23,6 +22,7 @@ use tunnel_controller:: { Tunnel };
 
 const REGISTRATION_INTERVAL_IN_MINUTES: u32 = 1;
 
+#[derive(Clone)]
 pub struct Registrar {
     certificate_manager: CertificateManager,
     top_level_domain: String,

src/registration.rs

@@ -9,7 +9,7 @@ use iron::status;
 use router::Router;
 use staticfile::Static;
 use std::path::Path;
-use std::sync::Arc;
+use std::sync::{ Arc, RwLock };
 
 fn handler(req: &mut Request, db: &UsersDb) -> IronResult<Response> {
     let handler = match db.read(ReadFilter::IsAdmin(true)) {
@@ -27,15 +27,15 @@ fn handler(req: &mut Request, db: &UsersDb) -> IronResult<Response> {
     Handler::handle(&handler, req)
 }
 
-pub fn create(manager: Arc<UsersManager>) -> Router {
+pub fn create(manager: Arc<RwLock<UsersManager>>) -> Router {
     let mut router = Router::new();
-    let usersmanager = manager.clone();
+    let cloned = manager.clone();
     router.any("", move |req: &mut Request| -> IronResult<Response> {
-        handler(req, &usersmanager.get_db())
+        handler(req, &cloned.read().unwrap().get_db())
     });
-    let usersmanager = manager.clone();
+    let manager = manager.clone();
     router.any("*", move |req: &mut Request| -> IronResult<Response> {
-        handler(req, &usersmanager.get_db())
+        handler(req, &manager.read().unwrap().get_db())
     });
     router
 }

src/static_router.rs

@@ -281,7 +281,8 @@ pub fn create<T>(controller: T, adapter_api: &Arc<AdapterManager>) -> Chain
     };
 
     let mut chain = Chain::new(router);
-    chain.around(controller.get_users_manager().get_middleware(auth_endpoints));
+    let manager = controller.get_users_manager().clone();
+    chain.around(manager.read().unwrap().get_middleware(auth_endpoints));
 
     chain
 }