Merge lp:~sil/desktopcouch/not-so-random into lp:desktopcouch

[Stuart Langridge]

Use SystemRandom for passwords/tokens where proper unpredictable randomness matters.

[Stuart Langridge (sil)]

Use SystemRandom for passwords/tokens where proper unpredictable randomness matters.

[Tim Cole (tcole)]

review: Approve

[Elliot Murphy (statik)]

review: Approve

[Elliot Murphy (statik)]

text conflict in desktopcouch/start_local_couchdb.py

[Elliot Murphy (statik)]

text conflict in desktopcouch/start_local_couchdb.py

Unmerged revisions

=== modified file 'data/couchdb.tmpl'
--- data/couchdb.tmpl	2009-07-14 13:53:21 +0000
+++ data/couchdb.tmpl	2009-08-20 12:55:54 +0000
@@ -31,7 +31,7 @@
 come back to browse your CouchDB again.</p>
 <p>Don't bookmark the CouchDB page itself, because its location may change!</p>
 <p>Taking you to your Desktop CouchDB in <span>30</span> seconds...
-<a id="there" href="http://localhost:[[COUCHDB_PORT]]/_utils">take me
+<a id="there" href="http://[[COUCHDB_USERNAME]]:[[COUCHDB_PASSWORD]]@localhost:[[COUCHDB_PORT]]/_utils">take me
 there straight away from now on</a> (remember to bookmark this page first!)</p>
 </body>
 </html>
 
=== modified file 'desktopcouch/start_local_couchdb.py'
--- desktopcouch/start_local_couchdb.py	2009-08-19 16:00:01 +0000
+++ desktopcouch/start_local_couchdb.py	2009-08-25 13:22:30 +0000
@@ -32,14 +32,16 @@
 """
 
 from __future__ import with_statement
-import os, subprocess, sys, glob
+import os, subprocess, sys, glob, random, string
 import desktopcouch
 from desktopcouch import local_files
 import xdg.BaseDirectory
 import errno
-import time
+import time, gtk, gnomekeyring
 from desktopcouch.records.server import CouchDatabase
 
+ACCEPTABLE_USERNAME_PASSWORD_CHARS = string.lowercase + string.uppercase
+
 def dump_ini(data, filename):
     """Dump INI data with sorted sections and keywords"""
     fd = open(filename, 'w')
@@ -56,18 +58,32 @@
 
 def create_ini_file():
     """Write CouchDB ini file if not already present"""
-    # FIXME add update trigger folder
-    #update_trigger_dir = [
-    #    'lib', 'canonical', 'ubuntuone', 'cloud_server', 'update_triggers']
-    #
-    #timestamp_trigger = os.path.join(
-    #    *update_trigger_dir + ['timestamp_trigger.py'])
-    #update_trigger =  os.path.join(
-    #    *update_trigger_dir + ['update_trigger.py'])
-
     if os.path.exists(local_files.FILE_INI):
-        return
-
+        # load the username and password from the keyring
+        try:
+            data = gnomekeyring.find_items_sync(gnomekeyring.ITEM_GENERIC_SECRET,
+                                            {'desktopcouch': 'basic'})
+        except gnomekeyring.NoMatchError:
+            data = None
+        if data:
+            username, password = data[0].secret.split(":")
+            return username, password
+        # otherwise fall through; for some reason the access details aren't
+        # in the keyring, so re-create the ini file and do it all again
+    
+    # randomly generate tokens and usernames
+    def make_random_string(count):
+        return ''.join([
+             random.SystemRandom().choice(ACCEPTABLE_USERNAME_PASSWORD_CHARS)
+                        for x in range(count)])
+    
+    ADMIN_ACCOUNT_USERNAME = make_random_string(10)
+    ADMIN_ACCOUNT_BASIC_AUTH_PASSWORD = make_random_string(10)
+    CONSUMER_KEY = make_random_string(10)
+    CONSUMER_SECRET = make_random_string(10)
+    TOKEN = make_random_string(10)
+    TOKEN_SECRET = make_random_string(10)
+    
     local = {
         'couchdb': {
             'database_dir': local_files.DIR_DB,
@@ -81,9 +97,43 @@
             'file': local_files.FILE_LOG,
             'level': 'info',
         },
+        'admins': {
+            ADMIN_ACCOUNT_USERNAME: ADMIN_ACCOUNT_BASIC_AUTH_PASSWORD
+        },
+        'oauth_consumer_secrets': {
+            CONSUMER_KEY: CONSUMER_SECRET
+        },
+        'oauth_token_secrets': {
+            TOKEN: TOKEN_SECRET
+        },
+        'oauth_token_users': {
+            TOKEN: ADMIN_ACCOUNT_USERNAME
+        },
+        'couch_httpd_auth': {
+            'require_valid_user': 'true'
+        }
     }
 
     dump_ini(local, local_files.FILE_INI)
+    # save admin account details in keyring
+    item_id = gnomekeyring.item_create_sync(
+            None,
+            gnomekeyring.ITEM_GENERIC_SECRET,
+            'Desktop Couch user authentication',
+            {'desktopcouch': 'basic'},
+            "%s:%s" % (ADMIN_ACCOUNT_USERNAME, ADMIN_ACCOUNT_BASIC_AUTH_PASSWORD),
+            True)
+    # and oauth tokens
+    item_id = gnomekeyring.item_create_sync(
+            None,
+            gnomekeyring.ITEM_GENERIC_SECRET,
+            'Desktop Couch user authentication',
+            {'desktopcouch': 'oauth'},
+            "%s:%s:%s:%s" % (CONSUMER_KEY, CONSUMER_SECRET, TOKEN, TOKEN_SECRET),
+            True)
+    
+
+    return (ADMIN_ACCOUNT_USERNAME, ADMIN_ACCOUNT_BASIC_AUTH_PASSWORD)
 
 def run_couchdb():
     """Actually start the CouchDB process"""
@@ -146,7 +196,7 @@
                 # than inefficiently just overwriting it regardless
                 db.add_view(view_name, mapjs, reducejs, dd_name)
 
-def write_bookmark_file():
+def write_bookmark_file(username, password):
     """Write out an HTML document that the user can bookmark to find their DB"""
     bookmark_file = os.path.join(local_files.DIR_DB, "couchdb.html")
 
@@ -182,21 +232,24 @@
             pass
     else:
         fp = open(bookmark_file, "w")
-        fp.write(html.replace("[[COUCHDB_PORT]]", port))
+        out = html.replace("[[COUCHDB_PORT]]", port)
+        out = out.replace("[[COUCHDB_USERNAME]]", username)
+        out = out.replace("[[COUCHDB_PASSWORD]]", password)
+        fp.write(out)
         fp.close()
         print "Browse your desktop CouchDB at file://%s" % \
           os.path.realpath(bookmark_file)
 
 def start_couchdb():
     """Execute each step to start a desktop CouchDB"""
-    create_ini_file()
+    username, password = create_ini_file()
     run_couchdb()
     # Note that we do not call update_design_documents here. This is because
     # Couch won't actually have started yet, so when update_design_documents
     # calls the Records API, that will call back into get_pid and we end up
     # starting Couch again. Instead, get_pid calls update_design_documents
     # *after* Couch startup has occurred.
-    write_bookmark_file()
+    write_bookmark_file(username, password)
 
 
 if __name__ == "__main__":