Merge branch 'implementAddingNewKeycards' of dos4dev/doors into master

LGTM

kdoorweb/README.md

@@ -16,8 +16,16 @@
 ## Run dev server
 
     source venv/bin/activate
+    python -m kdoorweb
+
+Or
+
     bottle.py --debug --reload kdoorweb:application
 
+To set the TCP port number add it as the last argument
+
+    python -m kdoorweb 8888
+
 ## Run unittests
 
     source venv/bin/activate

kdoorweb/kdoorweb/api.py

@@ -1,29 +1,33 @@
-from bottle import Bottle, request, response
+import hashlib
+from functools import partial
+
+from bottle import Bottle, request, response, HTTPError
 
 
 api = Bottle()
 
+scrypt = partial(hashlib.scrypt, n=16384, r=8, p=1)
+
 
-# FIXME: Fix door api auth
 def check_api_auth(callback):
     def wrapper(*args, **kwargs):
         print("check api auth")
+        user, api_key = request.auth or (None, None)
         if "db" not in kwargs:
-            request.current_user = None
+            return "Auth not possible, db not available"
-            return callback(*args, **kwargs)
+        user = kwargs["db"].get_door_by_name_and_api_key(user) or {}
-        user = None
+        stored_hash, salt = dict(user).get("api_key", ":").split(":")
-        request.current_user = user
+        api_hash = scrypt(api_key, salt=salt)
-        if user:
+        if user and api_hash  == api_key:
-            print(f"logged in as {user['user']}")
+            request.current_door = user
-            print(request.current_user)
+            print(f"logged in as {user['name']}")
+            print(user)
             return callback(*args, **kwargs)
         else:
             print("not logged in")
             return "Invalid authentication"
     return wrapper
 
-# FIXME: db plugin not available yet
-api.install(check_api_auth)
 
 @api.route("/")
 def index():

kdoorweb/kdoorweb/db.py

@@ -51,6 +51,9 @@ class DB:
 
     @staticmethod
     def create_db(dbfile):
+        if type(dbfile) is DB:
+            db = dbfile.db
+        else:
             db = sqlite3.connect(dbfile)
         db.executescript("""
             create table versions (
@@ -80,7 +83,7 @@ class DB:
             );
             create table doors (
                 id integer primary key,
-                name text,
+                name text unique,
                 note text,
                 api_key text,
                 created text,
@@ -177,6 +180,24 @@ class DB:
         """)
         return cur.fetchall()
 
+    def add_door(self, name, note, api_key):
+        self.add_doors([name, note, api_key, ])
+
+    def add_doors(self, doors):
+        self.db.executemany("""
+                    insert into doors(name, note, api_key, created, disabled)
+                    values(?, ?, ?, ?, ?)
+                """, doors)
+        self.db.commit()
+
+    def get_door(self, door_id):
+        cur = self.db.execute("select id, name, note, api_key, created, disabled from doors where id = ?", (door_id,))
+        return cur.fetchone()
+
+    def get_door_by_name(self, name):
+        cur = self.db.execute("select id, name, note, api_key, created, disabled from doors where name = ?", (name,))
+        return cur.fetchone()
+
     @staticmethod
     def import_ad(json_file):
         with open(json_file) as fp:
@@ -238,7 +259,7 @@ def initdb():
         pass
     DB.create_db(dbfile)
     db = DB(dbfile)
-    db.add_users(db.import_ad("../ad.json"))
+    db.add_users(db.import_ad("ad.json"))
     users = db.list_users()
     for user in users:
         print(dict(user))

kdoorweb/kdoorweb/web.py

@@ -5,7 +5,7 @@ from bottle import Bottle, view, TEMPLATE_PATH, static_file, \
     request, redirect, response, HTTPError
 
 from .db import SQLitePlugin
-from .api import api
+from .api import api, check_api_auth
 
 application = app = Bottle()
 
@@ -56,6 +56,7 @@ app.install(db_plugin)
 app.install(check_auth)
 
 api.install(db_plugin)
+api.install(check_api_auth)
 app.mount("/api/v1", api)
 
 

kdoorweb/tests/test_db.py

@@ -0,0 +1,18 @@
+import unittest
+
+from kdoorweb.db import DB
+
+
+class TestDB(unittest.TestCase):
+    def setUp(self) -> None:
+        self.db = DB()
+
+    def test_create_db_in_memory(self):
+        DB.create_db(dbfile=":memory:")
+
+    def test_create_db_in_connection(self):
+        DB.create_db(dbfile=self.db)
+
+
+if __name__ == '__main__':
+    unittest.main()