Merge pull request #5 from cinaglia/master

Fixed issue #2: /all errors

Author: progrium

keychain/app.py

@@ -17,6 +17,7 @@
 app = Flask('keychain')
 app.config['DEBUG'] = True
 
+bucket_name = 'keychain.io'
 action_expiry = 3600
 pending_actions = {}
 
@@ -26,10 +27,17 @@ def s3key(email, name):
     global s3
     if not s3:
         s3 = boto.connect_s3()
-    k = boto.s3.key.Key(s3.lookup('keychain.io'))
+    k = boto.s3.key.Key(s3.lookup(bucket_name))
     k.key = '{}.{}'.format(email, name)
     return k
 
+def s3keys(email):
+    global s3
+    if not s3:
+        s3 = boto.connect_s3()
+    b = s3.get_bucket(bucket_name)
+    return b.list(prefix=email)
+
 def lookup_key(email, name=None):
     name = name or 'default'
     k = s3key(email, name)
@@ -38,6 +46,13 @@ def lookup_key(email, name=None):
     except:
         return None
 
+def lookup_keys(email):
+    keys = s3keys(email)
+    try:
+        return [k.get_contents_as_string() for k in keys]
+    except Exception, e:
+        return None
+
 def upload_key(email, name, key):
     k = s3key(email, name)
     k.set_contents_from_string(key.strip())
@@ -112,12 +127,12 @@ def default_fingerprint(email):
 
 @app.route('/<email>/all')
 def all_keys(email):
-    keys_ = [lookup_key(email, key) for key in keys[email]]
+    keys_ = lookup_keys(email)
     return "{0}\n".format('\n'.join(keys_))
 
 @app.route('/<email>/all/install')
 def all_install(email):
-    keys_ = [lookup_key(email, key) for key in keys[email]]
+    keys_ = lookup_keys(email)
     return render_template('install.sh', keys=keys_)
 
 @app.route('/<email>/<keyname>', methods=['GET', 'PUT', 'DELETE'])