From 2ccc2e82a3fbb05f43d8c43915413b318dbeca46 Mon Sep 17 00:00:00 2001
From: Wojciech Janota <wojciech@janota.ovh>
Date: Thu, 17 Nov 2022 22:45:43 +0100
Subject: [PATCH] NXPR-3 WIP

---
 config.yml                                    |   3 +-
 database.db                                   |   0
 fleetcontrol                                  |   2 +-
 .../__pycache__/communication.cpython-310.pyc | Bin 2532 -> 4698 bytes
 network/communication.py                      |  72 +++++++++++++++++-
 .../config/__pycache__/config.cpython-310.pyc | Bin 1506 -> 1607 bytes
 utils/config/config.py                        |   5 ++
 .../__pycache__/database.cpython-310.pyc      | Bin 6389 -> 7448 bytes
 utils/database/database.py                    |  29 ++++++-
 utils/middleware/__init__.py                  |   1 +
 .../__pycache__/__init__.cpython-310.pyc      | Bin 0 -> 208 bytes
 .../__pycache__/auth.cpython-310.pyc          | Bin 0 -> 1377 bytes
 utils/middleware/auth.py                      |  45 +++++++++++
 .../models/__pycache__/models.cpython-310.pyc | Bin 1541 -> 2067 bytes
 utils/models/models.py                        |  19 +++--
 15 files changed, 162 insertions(+), 14 deletions(-)
 create mode 100644 database.db
 create mode 100644 utils/middleware/__init__.py
 create mode 100644 utils/middleware/__pycache__/__init__.cpython-310.pyc
 create mode 100644 utils/middleware/__pycache__/auth.cpython-310.pyc
 create mode 100644 utils/middleware/auth.py

diff --git a/config.yml b/config.yml
index 7f1a02d..2e9073a 100644
--- a/config.yml
+++ b/config.yml
@@ -4,4 +4,5 @@ server_loglevel: "INFO"
 database_file: "database.db"
 server_host: "localhost"
 server_password: "sekret_password"
-server_access_username: "user"
\ No newline at end of file
+server_access_username: "user"
+jwt_secret: "sekrit"
\ No newline at end of file
diff --git a/database.db b/database.db
new file mode 100644
index 0000000..e69de29
diff --git a/fleetcontrol b/fleetcontrol
index 05192c6..6c508a3 100644
--- a/fleetcontrol
+++ b/fleetcontrol
@@ -5,7 +5,7 @@ from utils.config.config import ServerConfig
 
 config = ServerConfig()
 server = Server(host=config.server_host, port=config.server_port, name=config.server_name, access_password=config.server_password,
-                access_username=config.server_access_username, version="v0.0.1alpha", database_file_path=config.database_file, logging_level=config.server_loglevel)
+                access_username=config.server_access_username, jwt_secret=config.jwt_secret, version="v0.0.1alpha", database_file_path=config.database_file, logging_level=config.server_loglevel)
 
 server.run()
 
diff --git a/network/__pycache__/communication.cpython-310.pyc b/network/__pycache__/communication.cpython-310.pyc
index 8c65223c1c91a8d75ab8712dce086236912a372b..e8db3a46e0fb8f2793bcdc9e034f92d6851c3923 100644
GIT binary patch
literal 4698
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

delta 1310
zcmaJ>Pfyf96z_D}>9pHjmj8kvf(R4{$jyTq6BE3UJ;<$>P1)(<F3av_+C@V)!2~WI
zIFLy^d60t#K7dCP@niJj#ZTb{-<t&l6Kyl^y?JlmpZUGlX0tyB3$1+KGvImup;`IC
zP6`v`)ydM>Ghzrs(1x{Zhqjij2HSN)hZrvnVGDL-2p0208oID|1cyC8G(%6gn?~TB
ze4pnev)3C@vZE-OCY6)^G4+~!F1nCPVnWF^QIlpwTy<bp*Uv~Ppb`&ctkP;$YulOK
zX}4n;STc9*)`xa`FKTq+%MfVtuk3lXMBj~IkkF5WD0gI|EIW-jaAZ!M)44~3=x;@G
zJIUD28{~h5$+TbG6zx{6nf9wuYj@27r@-vhMrEf7vaaY3rtMt>C0)fhNW<!jwO-Dn
zPTzG5B{bYPtlhK+0|RDA@GLjD$*m#Fw<PK-ux>p?*gc1plvHRhEmVub72c5*+9D_X
zBO_!YFABgN(I<+)x#)+E45+X6Q^nZwI6`yvplrc<0V~;18*FBkb&ax}vaZwRf*hN$
zb5h==hXf=y^}0sg)pAZ45Y|-ZZ17+X+yh@u0h9NUOe2{=@&L&!63mlv5v9>ql*E$4
zHgu~vAmymt)_2wT25t}9|3`a>Au%rix}qr%4JLwq7gjO?gpoh5Ni4!IJX3vhstXt$
zhD{f$%R|K(>7~BWP*vh1WM0L5?J<E9xHMSUDZm00h=VM^HXw2Vm|R41GsMTj><}sw
z6NqQ-&uzwXFP1Cnv@oS6`|<}E6??5C<E1ciod_ZT|GFvYHWAjbMYR4CJ-y5t*ri`&
zHOv8;5Uz~S$^r0(&t(Xh97cjDNSt}lV!Ndt#U+&VJVIdyx5~Y;0IEiU*YF4@?4m&T
zz00~`{!7p$1X)fXnFNy2B$XM3FGlLI*BO@4`p>by2Ue_R^m6VOP406FbB~5nkW=OU
zd;8&NC#^M-m8-$I7W6=c#hx{OTZ!9gt<_AV4bB;BZPnvS+M6m2ccUS?H8?66f3n*W
U@Na;h9o!XFzTp#mi*#V%H>}U*eE<Le

diff --git a/network/communication.py b/network/communication.py
index 009c473..787045f 100644
--- a/network/communication.py
+++ b/network/communication.py
@@ -2,8 +2,11 @@ from http.client import NON_AUTHORITATIVE_INFORMATION
 from flask import Flask, request, jsonify
 from utils.database.database import Database
 from utils.exceptions import DatabaseException
-from utils.models.models import Client
+from utils.models.models import Client, VMImage, User
+from utils.middleware.auth import require_auth
 import json
+import bcrypt
+import jwt
 
 
 class FlaskAppWrapper(object):
@@ -26,7 +29,7 @@ class FlaskAppWrapper(object):
 
 class Server():
 
-    def __init__(self, host: str, port: int, name: str, access_password: str, access_username: str, version: str, database_file_path: str, logging_level: str, ):
+    def __init__(self, host: str, port: int, name: str, access_password: str, access_username: str, jwt_secret: str, version: str, database_file_path: str, logging_level: str, ):
         self.host = host
         self.port = port
         self.name = name
@@ -36,12 +39,66 @@ class Server():
         self.database = Database(
             database_file=database_file_path, logging_level=logging_level)
         self.flask_app = Flask(name)
+        self.flask_app.config['SECRET_KEY'] = jwt_secret
+        self.flask_app.config['DATABASE_FILE_PATH'] = database_file_path
+        self.flask_app.config['LOGGING_LEVEL'] = logging_level
         self.app = FlaskAppWrapper(self.flask_app)
 
     def basic_server_data(self):
         return {"server_name": self.name, "server_version": self.version, "host": self.host}
 
-    def register_new_client_to_database(self):
+    def login(self):
+        try:
+            request_data = request.json
+            if not request_data:
+                return {
+                    "message": "Please provide login info",
+                    "data": None,
+                    "error": "Bad request"
+                }, 400
+
+            current_user = self.database.get_user_by_name(
+                request_data["username"])
+            if current_user is None:
+                return {
+                    "message": "Please provide correct login info",
+                    "data": None,
+                    "error": "Bad request"
+                }, 400
+            correct_password = False
+            temporary_salt = bcrypt.gensalt()
+            hashed_request_password = bcrypt.hashpw(
+                password=request_data["password"].encode("utf-8"), salt=temporary_salt)
+            if current_user.password_hash != hashed_request_password:
+                return {
+                    "message": "Invalid login data",
+                    "data": None,
+                    "error": "Auth error"
+                }, 401
+            try:
+                current_user["token"] = jwt.encode({
+                    "username": current_user["username"]
+                },
+                    self.flask_app.config["SECRET_KEY"],
+                    algorithm="HS256"
+                )
+                current_user.pop("password")
+                return current_user, 202
+            except Exception as ex:
+                return {
+                    "message": "Error loging in",
+                    "data": None,
+                    "error": f"Internal server error: {str(ex)}",
+                }, 500
+        except Exception as ex:
+            return {
+                "message": "Error loging in",
+                "data": None,
+                "error": f"Internal server error: {str(ex)}",
+            }, 500
+
+    @require_auth
+    def register_new_client_to_database(self, request_user):
         request_content_type = request.headers.get('Content-Type')
         json_string = ""
         if request_content_type == 'application/json':
@@ -60,6 +117,15 @@ class Server():
                 return response
 
     def run(self):
+        # add admin user to dataabse (or update existing one)
+        salt = bcrypt.gensalt()
+        temp_password_hash = bcrypt.hashpw(
+            self.access_password.encode("utf-8"), salt)
+        admin_user = self.database.get_user_by_name(self.access_username)
+        if admin_user == None:
+            admin_user = User(username=self.access_username,
+                              password_hash=temp_password_hash)
+        self.database.add_user(admin_user)
         self.app.add_endpoint(endpoint="/", endpoint_name="server_data",
                               handler=self.basic_server_data, methods=["GET"])
         self.app.add_endpoint(endpoint="/clients", endpoint_name="register_client",
diff --git a/utils/config/__pycache__/config.cpython-310.pyc b/utils/config/__pycache__/config.cpython-310.pyc
index 1d71752c0d53f677d3ed036e18c90fb9c91e7114..a88902dc8c0361409d5631605b50be03593708b0 100644
GIT binary patch
delta 428
zcmY+=!Aiq07zgllZQ8C$x~@}L2Lrur9=$q*QU@Xh!3_lu>tWqxI0os42$6xJ2R+RQ
z;!VL<@Dap!5IpFU_$4P7_`)w=@=qYY<dgbS#ykY$yE`8qx=a7rXRsnr2~=^leE(R?
z@YsHFa_`l+qyqDaz{1K&2ML=O!Uj{Y!!LvbW?;e>f`EOn%Ws4Wu7Jz@UX;NB*yBs#
zfvaH3p9BSmV7NI#0%a;gwGtKaHC2FVsp~6RDi~-nP*uwZg<6#y^-#Me8>Puw?Kn>N
z<1~%4gOh&N>n2CtzPv3x5^sDy%ZkyEk7hD5w~RpUnFEKbUuZM=W?qxpzY|SsVALhN
zV4TVyYx4oO<Oa563sbp`ll2Cqcztz><Q;DA1gfdNmzP$z_2~$DUv6hI&F5#MT?1By
L4U>ypBQ*a2uDW1&

delta 317
zcmY+=yGjE=6b9hg%j_mQmyLxa0Y%aXi?0xb;2RiQZ@6F;g_BA+kiv*Xs&J}+uc4)#
z_zbqzg0GN&rpv$?zM1(sFz4I;8vp2ArLaEU9`2Uq+HbtY$)L_q^PBbi*Mc?Ov*x_5
z#)=D?aRD2+q&b(cg)4gE3U+XZ7Tke7+@%-p!ZmDY#Rl%d=r&ZWu0zg5g_Mg5eQZ=n
zk9?#B>nI2HqI|2Ss@aoqI+M>-<T7iLT3)lOw6XG+J<Bq`Nc!@Vx5>Gj>XF>)V_9h{
g8$H<{;)B%R-3Icn50C0_8RkIg?sH5J<fJ&*0#h+Z7XSbN

diff --git a/utils/config/config.py b/utils/config/config.py
index 7a5d0e4..01f2844 100644
--- a/utils/config/config.py
+++ b/utils/config/config.py
@@ -18,6 +18,7 @@ class ServerConfig:
         server_port_override = os.environ.get("VALHALLA_SERVER_PORT")
         server_host_override = os.environ.get("VALHALLA_SERVER_HOST")
         server_password_override = os.environ.get("VALHALLA_SERVER_PASSWORD")
+        jwt_secret_override = os.environ.get("VALHALLA_JWT_SECRET")
         server_access_username_override = os.environ.get(
             "VALHALLA_SERVER_ACCESS_USERNAME")
         database_file_override = os.environ.get("VALHALLA_DATABASE_FILE")
@@ -38,6 +39,9 @@ class ServerConfig:
         if server_password_override:
             config["server_password"] = server_password_override
 
+        if jwt_secret_override:
+            config["jwt_secret"] = jwt_secret_override
+
         if server_access_username_override:
             config["server_access_username"] = server_access_username_override
 
@@ -49,5 +53,6 @@ class ServerConfig:
         self.database_file = config["database_file"]
         self.server_host = config["server_host"]
         self.server_password = config["server_password"]
+        self.jwt_secret = config["jwt_secret"]
         self.server_access_username = config["server_access_username"]
         self.server_loglevel = config["server_loglevel"]
diff --git a/utils/database/__pycache__/database.cpython-310.pyc b/utils/database/__pycache__/database.cpython-310.pyc
index 772f4a4d219ffa19ec4e4a3d3ab3a5415ae59688..a861f46d02564cbff16fc8ee02f5585f5083f204 100644
GIT binary patch
delta 2515
zcma)8O>7%Q6yEXAdcC%{iJLfyl~5;bnmB3Fq(2lwX;UR_NoWG4KM)t{IG#!3c5Tz~
zhLEVO5v>XbB#7n!0##~m^nwHyAoaq511C;M9QFn$xNx8<5*OgT@lWDpBVoy(X5PGc
zKi|IhcApG?GGgRIAzgvrpV_7KM8}%ZPOh%?cb^~%Rj9{Qv%Z8ct0lCoKjD`$uc>DP
ziGW<IW-t*vt56@+?kZHf<4T06dO?Z%*KYS5Aa(;~X*0!BR^~01oJ$p0+-<94W`^Y~
z+jn_tBAZ%Zw&zlT@wIP<$cZn13z4T;WZp&lX#ZVLqJ<t{yQmi=9y&k=LDEVOGIvEX
zM2A7rMh}6%!==B;H$=rectCvZK1}wB-`#1Vm!>>j<Z2tpZSNdg$mDGAjU~ocxEDq4
zlxgxkc&S5bFwXNl?&e*%Q#mUvnHJxR=lg2Vjc0)cW+l@ykwQ%T=zT&4#rNvKIdsH(
z5#k8aiFZE33)Ut#p5+wJ#XZssA4I(a2wVM#<G!azf9Z-(Bjk{v+OcT|>%0%I)>7a@
zu&tUtw4-S_usg)4ze7C=%ffy!>x-1S{5l~6VnFXZv&EiT4)sXYULsgYJ!xhNmaUd|
z+Y`92x06xvNT2c?gR7$06cycppVe|2f&^PfHyrh&aSh;MnSPE}wwVN(t*0oha6eU=
z37#ayVN{hw))=zAS;iL_e-4k1BRIIK5{0g8J#W%ve(oAeJ3sPJHcvD2D;3YL!j(ch
zfQtl0i}Ba^hG&&BlUZ!5!{;%GEoBrct5$4MaemjYWLz9+7)sa7l?zG5%Lfta)2L=J
z4o9{I1^Z?`2i>%_l<;&HmTU$)E;+Z7%+Twl9~umD(aF)4n!-m@X$pP@V{kIB*UT3z
z5f9ItKP_)f#|b}&cV0l4Kv|{mrF2JgjWu%^Z7!8%x5Q83F%Q<O_@g;0IvOKla<@f}
zitl!h%sOS^%oG~fIg5I?i>bomd#L|nX{M=@9C;SQuaxIYD0d>lkL4+O{s>eam%eE3
zBl)wajSq=$M0ygp|EoS<LCsMFCx^jGVM?E$f)-4qMx#y4wsh*YmSfAwB`68#zK@IK
zrt351zUvNomr&)F>$Yo|EGu!>^y=QR{E|s?Jyr~&kD-3d%Ezol7NaREg_C<E7WZ!o
zegvbD!OJx2xt4ugCF<fv+_Dd43&<g=Ayeq<b5uDGu-Z6YaW_~!vwf%m^$H2J4Lp7y
zwR&zU*OUijUHPzuD01zx-0S3l$8ulu-XzyuuvXU<ajLPI#KbR6%|+kJ7=eU|vf2Rp
z+5<nWP_a&kV(HagJuwe~n6A_KN{B%<TAAE}WFt1u^V!Y31UB&^$G#7OwAJ~H2~&Vy
zhE36_ck5U}Eyt&8U?WHhWY>NLdXK{ZFn36l^!{tO!o(ojJFb6LTWaLh-?25xAvBS=
z-4rcyoL&4ifVgAid<M^7M{t-pbx}(tr<!co907LkBQ$pfV0BNMW0<Hk9gp&Maj#`>
zaX)C<9(=pVcPJmg>vGH=#+4k0&*16=!YPC?0Nb6(SzI>TB+8}`rV(C7xPX8UhhIWS
zAiROFF_z2KDGSvPC-^U*OjE)n90>;^dL&?k!aDqYVSmIQ(G5TBjIbWjIBLfYG1=PF
z87<r}Q)YURWmg8-+t%Qw4<YUWHCx<hZ4Th~K{*+p_@K3S4Bvk|ih!oJg#|KOI}Yu>
XWHR_ZgU}3spb~^yXo9~+!tVb7?>H0(

delta 1646
zcma)6TTc@~6z-JW?RIIo6jGoR5D=l|eo-PKm753xYE%-ND3<O}7Pqa=mKYKfOuR&W
zP{_RCi|;&;m^A3C|G-C+ebb*{f{70X=S)j0Wl8MA*O@ctobQ~o-^}*Ves4+A?N)5;
z_n<EkeO0|x;z#pa?JZq#DJ&tIYEuQ>5tqX<UyHgk?3}WxlInPFQytIjVMP^h+5+;{
z+g6X=l*V-pCsL+kVQxAeiQ%p9J;;^zAU6`2Q!sto{s~Dk<04L4F7%@&Iw?evGrc1;
zp?g)#Zi-7drX@`A(HbV}L;zD!MAu0j1l4j6Oh}RhipVM0Ndy~fdWtl{c~cIW;jB1@
zQ;Shvk<mZ{(mv{-4UW!PAR=b~S^+qTxU3N)^$(5kI6@KufwPbf@CyPI^3ZKZJqo5j
zJ7k1<=ofi#+9Eq?gV0<Hq>F72Q}>*l`jWE=4Wy&a7KGaAYbEF}$RK5k>*E>dSH)L$
zth(QdABCv5cuqLWyy!<?4SibtP0G|r@4Bil<#PrgkHlanGg|^7#~NlfQ;Dc*cCfSQ
zJy!^Abb~9OQm%bdjAIhR<UAY=0a#ESP64P)C8?{6$)!~swf>&&cv97t*R#wEEX43L
zup<{WN`6h`nI#qLIE4!dFF+9m8gXY_vpJ)5xAX@Zqnl+t8@Y5Dm531B32?NH!w$yS
zkts7ZK1?PIY&o`4(4z+TVsUAGQBzl0h~Z<vIzSQ<kZ>R%`+?ow_NPRkq4J-%tZFFG
z5`4AnWgru5ZON?Um<@xz@Z7mE&ZFi7h|ECDWq>KLWd+ZzC#EaUrGrKikvM)ryDP?p
zewKmGcztxU;tlGjwUtBntvawCAOxS>!BNVUh_Uh#{HN1<m5pd%5K7Ogb`I=?7lGMK
zC#aT>{~g;JX~i2vtCQdj-;U%fy$IX?lI=C{909N*bY=C*Ip5O{RUvUc;3Ym9t8Lym
z&7w>}*Vv;24-jbw;Mb@ZR$Ol9U^NU70vKgr7HNqT;Z<J&+f{&BfO&xH0C|b?6}*MS
z!2lj!qn<B3w9a4S^eWsQD5jJC*4m1-l%^Y9tZ1D3%hV>)U4PpsJPo880Fqg;nDQ`-
XUeoaiVjhNzfy?GXWlY{O@)Z3A%zi$P

diff --git a/utils/database/database.py b/utils/database/database.py
index 1753959..e4bc5dc 100644
--- a/utils/database/database.py
+++ b/utils/database/database.py
@@ -1,6 +1,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from utils.models.models import Client, VMImage
+from sqlalchemy.ext.declarative import declarative_base
+from utils.models.models import Client, VMImage, User
 from utils.exceptions.DatabaseException import DatabaseException
 import logging
 
@@ -163,3 +164,29 @@ class Database:
             self.logger.error(f"Couldn't modify object in database: {ex}")
             raise DatabaseException(
                 f"Couldn't modify object in database: {ex}")
+
+    def add_user(self, new_user: User):
+        try:
+            with self.session.begin():
+                self.session.add(new_user)
+                self.session.flush()
+                self.session.merge()
+        except Exception as ex:
+            self.logger.error(f"Couldn't add user to the database: {ex}")
+            raise DatabaseException(f"Couldn't add user to the database: {ex}")
+
+    def get_user_by_id(self, user_id: int) -> User:
+        try:
+            with self.session.begin():
+                return self.session.query(User).filter(User.user_id == user_id).first()
+        except Exception as ex:
+            self.logger.error(f"Error getting data from database: {ex}")
+            raise DatabaseException(f"Error getting data from database: {ex}")
+
+    def get_user_by_name(self, username: str) -> User:
+        try:
+            with self.session.begin():
+                return self.session.query(User).filter(User.username == username).first()
+        except Exception as ex:
+            self.logger.error(f"Error getting data from database: {ex}")
+            raise DatabaseException(f"Error getting data from database: {ex}")
diff --git a/utils/middleware/__init__.py b/utils/middleware/__init__.py
new file mode 100644
index 0000000..25d9ef7
--- /dev/null
+++ b/utils/middleware/__init__.py
@@ -0,0 +1 @@
+from . import auth
diff --git a/utils/middleware/__pycache__/__init__.cpython-310.pyc b/utils/middleware/__pycache__/__init__.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8746ad3f1a8028ef2da8b51f8d430d3bc4d08cce
GIT binary patch
literal 208
zcmYjLK?=e!5KL+hA`}X~qKCR45D~nKAbRi;LbKFJo0Lt0`UgMamwNT&7d)AGa$ske
zfnnAb#f(KfHldkEeI@gcEShyZS4L7y@s9QU#5q&ho>h}Kk8#DvTn2yMR@ulXHJ*&}
zC_nlf;oy)Q7=1$nJF*vSyaP0?Hi)E6TPth{5iB)lbe^QQRLfz2;C1Jq*GhGGm4qOK
XHrflZ81CbA*;^GlT%{jenl0HEdQvpd

literal 0
HcmV?d00001

diff --git a/utils/middleware/__pycache__/auth.cpython-310.pyc b/utils/middleware/__pycache__/auth.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b3a9f899c5ddaf73c951556dc1003783b6223d0b
GIT binary patch
literal 1377
zcmYjQ&2J+$6t_JenS7P(Cqy7^4t&j_jkMBoTCFH-wnT)2nl7uI%V;`wrjvSRg6%YI
zlpv(81eYQqt{eby*?-Abxa^(Ns;E3qnrc0o-}|ur{QP@<MYCB$FgBk|<F1R)-^O@z
z5HLQ4U+x1?L@`Gh4lp)4;Upj+EpBCYU}sL?lztm*H*ibc;g!q_yi#|0HLC?R&@0q?
zfr2_EL*!RqL1gq2YiA~+iQM&xt_b$slu4zX=%5hF$GRR*g<!b~qsatJ`>A9Cr1v;d
z(Lp3xj7^ZMVRE+Nx8RrW04VemI>SGr5vG`u7v33O;su7Yt=$-=uSW$mL&rV%<v#!v
zEeXX6jqx!OH;kmXjeaMT{DG;}hS>#??@}8`aH#v6MJpq?(!8rIWse=|wNWXnZA5G5
zWN9gPTv?FPR|j7s!L)g9E$xLh_7*nX0N-2Zc<C%0il#{PY3n-jjS+c<hUgi}-?Ndb
zo{lhD0>$$dy-AU(E!;C)W^l`_bJ25?yZgO6ypl6K0}>Waf*0sdyoXY>z<=SN4GFh*
zb#r^F4hxaaBb65UYutHd_?+MTDwQ(LlTHNF9aS8$TsNNP#xjc;^(|e=n3Pe%v`wKF
z+F?S#+%K>{Xg=QF-~McS*bATZ2R+>!e7&>N-`xoZy>EL1D09>7Fx3l3DQCLLizI>5
zLe7pE*R^5q^S$1F_+{_8cD@+ifAEQqgIdHB2(Jz^sl6#Yf;`HYkHwub-F|)?@sz%i
zZu%=EGQZQ$m08L=u;ZAC&ML`&Va~4$^Hg-@kVTXUsU11tsS+MI1vCWGZd~M}G||?0
zrnF00Tu`Q42~(jtKRh@MO%A%+JBiuE(5Ee_gkRBiBoe9Jqgg4P6@A|N&cWSsyD`I&
zD6(+<<{MW^8D0~10<D2ZFVXA0u6gyco2Mr%?|vhSF^iS#vK&ZbOaOD6lqG_(ZXx1B
zXde-&LTp0Ebf+rivYVxpat7(Jt|{Tx<WyJ9ePA7<4Y;cu0NA94Z(|!1LNLMhf5f&g
zh(mA-yO%cEDA5J<V8MEYdtqO0xW;zN9jy!R2XcA0GQVdolL{7=2R`IQ9C7(*>-tn-
zdetZ50}$e410NcA-@r!zx@2P=pbj2sisIr8Y<GkYs^8Gn(KL@$QE(|t%ZoOEc1Aps
zM`dw^W4vWCZ<S1JWl%#duY@pduiswHtjn{tR#q>;oU}@<%&&wpKkp&LnsWBYG>qH;
MXdn-`YOFrze=xsqEdT%j

literal 0
HcmV?d00001

diff --git a/utils/middleware/auth.py b/utils/middleware/auth.py
new file mode 100644
index 0000000..921ebaf
--- /dev/null
+++ b/utils/middleware/auth.py
@@ -0,0 +1,45 @@
+from functools import wraps
+import jwt
+from flask import request, abort
+from flask import current_app
+from utils.models.models import User
+from utils.database.database import Database
+
+# Inspired by: https://blog.loginradius.com/engineering/guest-post/securing-flask-api-with-jwt/ [access: 16.11.2022, 18:33 CET]
+
+
+def require_auth(f):
+    @wraps(f)
+    def decorated(*args, **kwargs):
+        token = None
+        if "Authorization" in request.headers:
+            token = request.headers["Authorization"].split(" ")[1]
+        if not token:
+            return {
+                "message": "Missing auth token",
+                "data": None,
+                "error": "Unauthorized"
+            }, 401
+        try:
+            database = Database(
+                database_file=current_app.config["DATABASE_FILE"], logging_level=current_app.config["LOGGING_LEVEL"])
+            user_data_from_request = jwt.decode(
+                token, current_app.config["SECRET_KEY"], algorithms=["HS256"])
+            request_user = database.get_user_by_name(
+                username=user_data_from_request["username"])
+            if request_user is None:
+                return {
+                    "message": "Invalid auth token",
+                    "data": None,
+                    "error": "Unauthorized"
+                }, 403
+        except Exception as ex:
+            return {
+                "message": "Internal server error",
+                "data": None,
+                "error": str(ex)
+            }, 500
+
+        return f(request_user, *args, **kwargs)
+
+    return decorated
diff --git a/utils/models/__pycache__/models.cpython-310.pyc b/utils/models/__pycache__/models.cpython-310.pyc
index 62ec91e74d786ddeeaf893e1bcdc19e3ffca1ba2..8a7fa428c4483084c0047b06d14a97ef3034a3ac 100644
GIT binary patch
literal 2067
zcmaJ?&u`;I6rQmi+i~L5O}o3WT7C+Fg0#tj8$zg}sAz?#R%+oe5;AV)HF4@6>5Nmh
zRXJs^`xhW2IPO2hVXmBdMVtUFyl1Do(NfmdJkK}t#-8`RZ=TCA3>aR2<%{v}E@QtD
zSijl`cChJR(MTqF#&RxrZV4;5g`GRX$y=huY0k>r+!J2z3%|xT`nE;8?mJnKcSNV|
zx3X>?ijXr1mrV4aEnVo%HhyG3SxYV==s+aBCtPg8=B)qo)-Mb_Thb>4T(-dmM+Qs2
zv=Mc{LewR+bj0=-Oop=en8_Y&E^ToO@rH~LM>W2UcvJQf_iKDdZXK|}_7%p)1})?6
zmf0dNjQ60ZU;@gx2bD^Ti3#>f1?i;t63$KQFgeO#V41FhEUD76(9?8oyrX1%qTqPI
zO*mGNR1iZkNejS%NWwTv6gr<le3WP!>mGnQ1GQTg$LZuE(5G2i!N;S~2<M!mw2-1Z
z&Qd6<IL(s@h+u{CWPGvJ^z{%yoJgraYvb2`aVjtRXL++o53k3@6yf^iAlSjCze58|
zaLI%vxj=4_YfIWsEaBFDXUSztx`@3Rd(W}|5^h6)S?b6(`gUa?JCB(NWfvI^k=i;K
z<E^%S_>`N@T;cxId3*xrR}t=G4+s5Xk!8g2mBbO_ee=}=iXUg%8pdTIalzQasq4$e
z4z*ou`du`aY{ouk-*$emF0C2A<THL^sU9kiAFxwfTDTv3|8Ng8NJM3+uHv$Yk;*A%
z%LEN&(?m}PwsACM$D)mX<<Shrm9Wn8r%c_$&;0pt^tA@1M@9MwiqS(=l7k*KSqIY1
zeF+l<Fe=q}3c5l8l<IympN|$*n(0wqN_hSl&d*JRUyUhwg|3n;1Nj!kL<cnBUG8%0
zAIG}5(=a)F*>``?GkzQwNe*#rf;h(4FEZ+P<M?!uWUHAljw|A~fr_Y9qz2PjS5uJA
zUnpx@>WbV=ugPAF!qq5z<<YwSYOo=$ez$s^-ufmPqH4{&L9mBr8=Jn3#%B%&7uC1L
z>2{xWTeZ)BRNF%T9a@;7d4*~{NvgGK-P(e5>d8j8q-0yP>ybv;KB_fX^B~-TF4mb)
z2H5Y(4l1UrXs@*r>NxeGBE_m(Xh=%#qDW5{peU^L4~{ciG)<AJJ81R?8;Y{2-X`-7
z8PaM)Kgm~xWa>n$BuI>lRsT56K!gp$*W}-&1(X5x0htXlH?d6{e;?Z#+kM_&<2!g(
z2lxMM4{`MkY*Ur6>nefVHZ0?_Egj^mWgI#kqP3tiayYQmCceak$)YOL0t;l0rEPx@
zyqXl_(Q>S54KY5UT8QC1(fa#R$(Ro6jbVR?-}{Kdrt?E0>v122rf7VB@S35Ln`C$}
z^YgVVPy!UmOyS><ncfShVX5+lZl9*<$7t@ZO~a#VxK`&Ceb#K%Cw+)@3#<I<p*l3<
zHe)7~2_6~zC&ZLv<2L2PIG^E=@pGsWaxlT_pMqtfNq4O*N^Kp`O$-?SlcofGigIN7
eJv8@NgcQ*2S`iQMwk(SiH9hY99r;mzJNy^O1Oavc

delta 689
zcmZvZzi-qq6vyMliJhO9!l}@5Ks%l~Q86$eP68nW5@q1WU?fhy^HVvv^eQK<U_vNm
zL1H+0?83^#hQwcjl$HMiQHkd?42b$EpXaahV(0s8@()S2NYlu{@#E)s+V_{)fP7qT
zU4I@Hk%))`QSFErd_^ICl>kvbctBN9liEYYz(vKas;NltIVx1qk)tArYfogTW0jyz
zTHRCWV`rF|fIM2s6-?(+%W8HA<B2T69FrI3D-Fp5^POI~=GR0ppkOoaatM+A59O=i
zlP40z6hCrAszTf~GB4fDZNZ;CykE#&D4X!G7|+`27q<yZm@f8|)Nh+?BB!s%`-}a9
zxvZcx-`w|P)!guQ$-4RMy&=M^(b3)W*b#lvV)b8Kurfwu_>{JSJCr1Zx8ai02u_kf
z$L5$`ZtYxs*STPrLv&+v)a4iwbd`3lGR4phZ&+tU_wa}(Iz<Y0XFh|ys?-T8og;RJ
zJ-uedy2T}nfrV?~S=hVP)GYn2r+qtR78@4rCTF?Z#J9HMKX<%y=aT3|+p3*mZhi$L
z?AeG7CLyjg^fumQ!waaSl9fC?%J!@M;H+*o{ARIG2XnYZ{vJATa%^ef;vke{81#3}
H`se-t6FQ0I

diff --git a/utils/models/models.py b/utils/models/models.py
index 01feba7..24060bd 100644
--- a/utils/models/models.py
+++ b/utils/models/models.py
@@ -1,8 +1,13 @@
 from sqlalchemy import Column, Integer, String, ForeignKey, Table
 from sqlalchemy.orm import relationship, backref
+from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
+from utils.config.config import ServerConfig
 
-Base = declarative_base()
+config = ServerConfig()
+engine = create_engine(f"sqlite:///{config.database_file}")
+Base = declarative_base(bind=engine)
+Base.metadata.create_all()
 
 client_image_table = Table(
     "client_image",
@@ -19,9 +24,8 @@ class Client(Base):
     hostname = Column(String(100), nullable=False)
     client_version = Column(String(100), nullable=False)
     vm_list_on_machine = relationship(
-        "VMImages",
+        "VMImage",
         secondary=client_image_table,
-        back_populates="vm_images"
     )
 
     def has_vm_installed(self, vm_object):
@@ -37,16 +41,15 @@ class VMImage(Base):
     image_name = Column(String(100), unique=True, nullable=False)
     image_file = Column(String(500), unique=False, nullable=False)
     image_version = Column(String(100), nullable=False)
-    image_hash = Column(String(500), nullalbe=False)
+    image_hash = Column(String(500), nullable=False)
     clients = relationship(
-        "Clients",
-        secondary=client_image_table,
-        back_populates="clients"
+        "Client",
+        secondary=client_image_table
     )
 
 
 class User(Base):
     __tablename__ = "users"
-    user_id = Column(Integer, primary_key=True)
+    user_id = Column(Integer, primary_key=True, autoincrement=True)
     username = Column(String)
     password_hash = Column(String)