more intro screen work

modules/installed/first_boot.py

@@ -1,5 +1,5 @@
 from urlparse import urlparse
-import os, cherrypy
+import os, cherrypy, re
 from gettext import gettext as _
 from plugin_mount import PagePlugin, PluginMount, FormPlugin
 from modules.auth import require
@@ -17,9 +17,23 @@ class FirstBoot(PagePlugin):
     def index(self, *args, **kwargs):
         return self.state0(*args, **kwargs)
 
+    ## TODO: flesh out these tests values
+    def valid_box_name_p(self, name):
+        name = name.strip()
+        if re.search("\W", name):
+            return False
+        return True
+    def valid_box_key_p(self, key):
+        return True
+    def generate_box_key(self):
+        return "fake key"
+
     @cherrypy.expose
-    def state0(self, message=None, box_name=None, box_key=""):
+    def state0(self, message="", box_name="", box_key="", submitted=False):
         """
+        In this state, we do time config over HTTP, name the box and
+        server key selection.
+
         All the parameters are form inputs.  They get passed in when
         the form is submitted.  This method checks the inputs and if
         they validate, uses them to take action.  If they do not
@@ -31,9 +45,36 @@ class FirstBoot(PagePlugin):
         user. It's a good place to put error messages.
         """
 
-        with sqlite_db(cfg.store_file, table="firstboot") as db:
+        ## Until LDAP is in place, we'll put the box name and key in the cfg.store_file
-            db['state']=0
+        ## Must resist the sick temptation to write an LDAP interface to the sqlite file
-            db.commit()
+        with sqlite_db(cfg.store_file, table="thisbox", autocommit=True) as db:
+            db['about'] = "This table is for information about this FreedomBox"
+            if box_name:
+                if self.valid_box_name_p(box_name): 
+                    db['box_name'] = box_name
+                else:
+                    message += _("Invalid box name.")
+            elif 'box_name' in db and db['box_name']:
+                box_name = db['box_name']
+                #TODO: set /etc/hostname to box name via ex machina
+
+            if box_key: 
+                if self.valid_box_key_p(box_key):
+                    db['box_key'] = box_key
+                else:
+                    message += _("Invalid key!")
+            elif 'box_key' in db and db['box_key']:
+                box_key = _("We already have a key for this box on file.") #TODO: Think this through and handle more gracefully
+            elif submitted and not box_key:
+                box_key = self.generate_box_key()
+                db['box_key'] = box_key
+
+
+        if box_name and box_key and self.valid_box_name_p(box_name) and self.valid_box_key_p(box_key):
+            ## Update state to 1 and head there
+            with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db:
+                db['state']=1
+            raise cherrypy.InternalRedirect('/firstboot/state1')
 
         main = "<p>Welcome.  It looks like this FreedomBox isn't set up yet.  We'll need to ask you a just few questions to get started.</p>"
         form = Form(title="Welcome to Your FreedomBox!", 
@@ -46,21 +87,34 @@ class FirstBoot(PagePlugin):
         form.text_input('Name your FreedomBox', id="box_name", value=box_name)
         form.html("<p>%(box_name)s uses cryptographic keys so it can prove its identity when talking to you.  %(box_name)s can make a key for itself, but if one already exists (from a prior FreedomBox, for example), you can paste it below.  This key should not be the same as your key because you are not your FreedomBox!</p>" % {'box_name':cfg.box_name})
         form.text_box("If you want, paste your box's key here.", id="box_key", value=box_key)
-
+        form.hidden(name="submitted", value="True")
-        ### State 1 ###
-
         form.submit("Box it up!")
 
         main += form.render()
         return self.fill_template(template="base", title=_("First Boot!"), main=main,
-        sidebar_right=_("""<strong>Statement of Principles</strong><p>When we say your
+        sidebar_right=_("""<strong>Getting Help</strong><p>We've done our best to make your FreedomBox easy to use.  If you have questions during setup, there are a few places to turn for help. TODO: add links to such help.</p>"""))
-privacy is important, it's not just an empty pleasantry.  We really
-mean it.  Your privacy control panel should give you fine-grained
-control over exactly who can access your %s and the
-information on it.</p>
 
-<p>Your personal information should not leave this box without your
+    @cherrypy.expose
-knowledge and direction.  And if companies or government wants this
+    def state1(self, message=None):
-information, they have to ask <strong>you</strong> for it.  This gives you a
+        """
-change to refuse and also tells you who wants your data.</p>
+        State 1 is when we have a box name and key.  In this state,
-""" % cfg.product_name))
+        our task is to provide a certificate and maybe to guide the
+        user through installing it.  We automatically move to State 2,
+        which is an HTTPS connection.
+
+        TODO: HTTPS failure in State 2 should returns to state 1.
+        """
+        main = """<p>Here's a certificate.
+TODO: explain all this cert stuff to the user.</p>
+<p>TODO: add instrux for installing certificate.</p>
+<p>After you have installed
+"""
+        if False:
+            ## Update state to 2 and head there
+            with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db:
+                db['state']=1
+                            #TODO: switch to HTTPS
+            raise cherrypy.InternalRedirect('/firstboot/state1')
+
+        return self.fill_template(template="base", title=_("Installing the Certificate"), main=main,
+        sidebar_right=_("""<strong>Getting Help</strong><p>We've done our best to make your FreedomBox easy to use.  If you have questions during setup, there are a few places to turn for help. TODO: add links to such help.</p>"""))