From d3d29e686fbfd612ef4d29fcfce7d45f21a15045 Mon Sep 17 00:00:00 2001
From: flifloo <flifloo@gmail.com>
Date: Wed, 15 May 2019 16:48:27 +0200
Subject: [PATCH] Add logs system

---
 Setup.py   | 32 ++++++++++++++++++++++++++------
 lock.py    | 15 +++++++++------
 yubikey.py |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/Setup.py b/Setup.py
index 0ca191b..36388e6 100644
--- a/Setup.py
+++ b/Setup.py
@@ -5,6 +5,8 @@ from flask import request, Flask
 
 #http://192.168.43.155:5000/setup?ssid=cimaphone&password=cimakodu30&id=1
 
+mac = io.open("/sys/class/net/wlan0/address").read()
+
 app = Flask(__name__)
 
 def writeconfig(ssid, password):
@@ -31,7 +33,6 @@ def web_setup():
     else:
         writeconfig(request.args.get("ssid"), request.args.get("password"))
         if testinternet():
-            mac = io.open("/sys/class/net/wlan0/address").read()
             id = request.args.get("id")
             with shelve.open("Settings.conf") as settings:
                 settings["token"] = id
@@ -67,10 +68,13 @@ def add_yubi():
         reg[int(i[:id])] = i[wriedid+1:secret]
 
     with shelve.open("Settings.conf", writeback = True) as settings:
-        if len(settings["register"]) != 0:
-            id = settings["register"][-1] + 1
-        else:
-            id = 1
+        id = None
+        for i in range(1, 10):
+            if i not in settings["register"]:
+                id = i
+                break
+        if id == None:
+            return "Too many yubikeys"
 
         settings["register"].append(id)
 
@@ -81,9 +85,25 @@ def add_yubi():
         return "Error, too many yubikeys"
 
     subprocess.check_call(["ykpersonalize", "-1", f"-ofixed={dico[id]['publicid']}", f"-ouid={dico[id]['privateid']}", f"-a{dico[id]['secretkey']}", "-y"])
-
+    get(f"http://vps.flifloo.fr:5001/logs?mac={mac}&id={str(id)}")
     return "Ok"
 
+@app.route("/delyubi")
+def del_yubi():
+    if not request.args.get("id"):
+        return "Error"
+
+    try:
+        id = int(request.args.get("id"))
+    except:
+        return "Error"
+
+    with shelve.open("Settings.conf", writeback = True) as settings:
+        if id not in settings["register"]:
+            return "Error"
+        else:
+            del settings["register"][settings["register"].index(id)]
+    return "Ok"
 
 if __name__ == "__main__":
     app.run(debug=True, port=6000, host="0.0.0.0")
diff --git a/lock.py b/lock.py
index 13784fe..8324b95 100644
--- a/lock.py
+++ b/lock.py
@@ -1,5 +1,5 @@
 from gpiozero import LED
-import shelve
+import shelve, io, requests
 
 led = LED(17)
 
@@ -15,16 +15,19 @@ def state(current : bool = None):
             return settings["state"]
 
 
-def unlock():
+def unlock(keyid = None):
     led.on()
     state(True)
+    mac = io.open("/sys/class/net/wlan0/address").read()
+    requests.get(f"http://vps.flifloo.fr:5001/logs?mac={mac}&state=unlock&id={str(keyid)}")
 
-def lock():
+def lock(keyid = None):
     led.off()
     state(False)
+    requests.get(f"http://vps.flifloo.fr:5001/logs?mac={mac}&state=lock&id={str(keyid)}")
 
-def switch():
+def switch(keyid = None):
     if state():
-        lock()
+        lock(keyid)
     else:
-        unlock()
+        unlock(keyid)
diff --git a/yubikey.py b/yubikey.py
index 20f388f..7eec1ee 100644
--- a/yubikey.py
+++ b/yubikey.py
@@ -14,4 +14,4 @@ while True:
     except:
         pass
     else:
-        lock.switch()
+        lock.switch(id)