merging dev branch into master as a stable release

app/__init__.py

@@ -1,20 +1,27 @@
 from flask import Flask, request, jsonify
+from flask_jwt_extended import create_access_token, get_jwt_identity, jwt_required, JWTManager
 import time
 import json
 import uuid
+import datetime
+import os
+from hashlib import sha256
 
 from marshmallow import Schema, fields
 from flask_sqlalchemy import SQLAlchemy
 
 app = Flask(__name__)
 app.config.from_pyfile('config.py', silent=True)
+app.config["JWT_SECRET_KEY"] = os.getenv("JWT_SECRET_KEY")
 
 db = SQLAlchemy(app)
+jwt = JWTManager(app)
 
 class UserModel(db.Model):
     __tablename__ = "user"
     uuid = db.Column(db.String(32), unique=True, primary_key=True, nullable=False)
     name = db.Column(db.String(64), nullable=False)
+    password = db.Column(db.String(64), nullable=False)
     bal_uuid = db.Column(db.String(32), db.ForeignKey('balance.uuid'))
 
 class CategoryModel(db.Model):
@@ -39,6 +46,7 @@ class BalanceModel(db.Model):
 class UserSchema(Schema):
     uuid = fields.Str()
     name = fields.Str()
+    password = fields.Str()
     bal_uuid = fields.Str()
 
 class CategorySchema(Schema):
@@ -49,7 +57,7 @@ class RecordSchema(Schema):
     uuid = fields.Str()
     user_uuid = fields.Str()
     cat_uuid = fields.Str()
-    date = fields.Date()
+    date = fields.Date('iso')
     amount = fields.Integer()
 
 class BalanceSchema(Schema):
@@ -88,39 +96,33 @@ def ep_reset():
     return {}, 200
 
 @app.route("/users", methods = ["GET"])
+@jwt_required()
 def ep_users_get():
     result = db.session.query(UserModel).all()
     return users_schema.dumps(result)
 
-@app.route("/user/<user_id>", methods = ["GET"])
-def ep_user_get(user_id):
-    result = db.session.query(UserModel).filter(UserModel.uuid == user_id).all()
-
-    if len(result) == 1:
-        return user_schema.dumps(result[0]), 200
-    else:
-        return {}, 404
-
 @app.route("/user", methods = ["POST"])
 def ep_user_post():
-    body = request.json
+    name = request.json.get('name', None)
+    password = request.json.get('password', None)
 
-    if not body:
+    pass_hashed = sha256(password.encode("UTF-8")).digest().hex()
-        return {}, 403
-
-    if 'uuid' in body:
-        return {}, 403
 
     b = BalanceModel(uuid=uuid.uuid4().hex, value=0)
-    body.update({'uuid': uuid.uuid4().hex})
+
-    body.update({'bal_uuid': b.uuid})
+    u_uuid = uuid.uuid4().hex
+    bal_uuid = b.uuid
 
     try:
-        _ = user_schema.load(body)
+        _ = user_schema.load({'uuid': u_uuid, 'name': name,
-    except ValidationError as e:
+                              'password': pass_hashed, 'bal_uuid': bal_uuid})
+    except Exception as e:
         return {}, 403
 
-    u = UserModel(**body)
+    u = UserModel(uuid=u_uuid, name=name,
+                   password=pass_hashed, bal_uuid=bal_uuid)
+
+    at = create_access_token(identity = json.dumps({'uuid': u.uuid, 'bal_uuid': u.bal_uuid}))
 
     try:
         db.session.add(b)
@@ -130,29 +132,43 @@ def ep_user_post():
         db.session.rollback()
         return {}, 403
 
-    return jsonify(user_schema.load(body)), 200
+    return jsonify(access_token = at), 200
 
-@app.route("/user/<user_id>", methods = ["DELETE"])
+@app.route("/user", methods = ["GET"])
-def ep_user_delete(user_id):
+def ep_user_get():
-    try:
+    name = request.json.get('user', None)
-        result = db.session.query(UserModel).filter(UserModel.uuid == user_id).all()
+    password = request.json.get('password', None)
-    except Exception as e:
+    pass_hashed = sha256(password.encode("UTF-8")).digest().hex()
-        return {}, 403
 
-    if len(result) == 0:
+    u = db.session.query(UserModel).filter(UserModel.name == name).one_or_none()
+
+    if not u:
         return {}, 404
 
+    if u.password != pass_hashed:
+        return {"message": "Wrong password."}, 401
+
+    at = create_access_token(identity = json.dumps({'uuid': u.uuid, 'bal_uuid': u.bal_uuid}))
+
+    return jsonify(access_token = at), 200
+
+@app.route("/user", methods = ["DELETE"])
+@jwt_required()
+def ep_user_delete():
+    current_user = json.loads(get_jwt_identity())
+
     try:
-        db.session.query(UserModel).filter(UserModel.uuid == user_id).delete()
+        db.session.query(UserModel).filter(UserModel.uuid == current_user['uuid']).delete()
-        db.session.query(BalanceModel).filter(BalanceModel.uuid == result[0].bal_uuid).delete()
+        db.session.query(BalanceModel).filter(BalanceModel.uuid == current_user['bal_uuid']).delete()
         db.session.commit()
     except Exception as e:
         db.session.rollback()
         return {}, 403
 
-    return user_schema.dumps(result[0]), 200
+    return {"message": "Success."}, 200
 
 @app.route("/category", methods = ["GET"])
+@jwt_required()
 def ep_category_get():
     body = request.json
 
@@ -167,6 +183,7 @@ def ep_category_get():
         return {}, 403
 
 @app.route("/category", methods = ["POST"])
+@jwt_required()
 def ep_category_post():
     body = request.json
 
@@ -195,6 +212,7 @@ def ep_category_post():
     return jsonify(category_schema.load(body)), 200
 
 @app.route("/category", methods = ["DELETE"])
+@jwt_required()
 def ep_category_delete():
     body = request.json
 
@@ -220,15 +238,18 @@ def ep_category_delete():
     return category_schema.dumps(result[0]), 200
 
 @app.route("/record/<record_id>", methods = ["GET"])
+@jwt_required()
 def ep_record_get(record_id):
-    result = db.session.query(RecordModel).filter(RecordModel.uuid == record_id).all()
+    current_user = json.loads(get_jwt_identity())
+    result = db.session.query(RecordModel).filter(RecordModel.uuid == record_id).one_or_none()
 
-    if len(result) == 1:
+    if result and result.user_uuid == current_user['uuid']:
-        return user_schema.dumps(result[0]), 200
+        return user_schema.dumps(result), 200
     else:
-        return {}, 404
+        return {}, 403
 
 @app.route("/record", methods = ["GET"])
+@jwt_required()
 def ep_record_get_filtered():
     r = db.session.query(RecordModel)
 
@@ -248,68 +269,63 @@ def ep_record_get_filtered():
         r = r.filter(RecordModel.cat_uuid == request.json['cat_uuid'])
         filtered = True
 
-
     if filtered:
         return records_schema.dumps(r.all())
     else:
         return [], 403
 
 @app.route("/record/<record_id>", methods = ["DELETE"])
+@jwt_required()
 def ep_record_del(record_id):
+    current_user = json.loads(get_jwt_identity())
+
     try:
-        result = db.session.query(RecordModel).filter(RecordModel.uuid == record_id).all()
+        result = db.session.query(RecordModel).filter(RecordModel.uuid == record_id).one_or_none()
     except Exception as e:
         return {}, 403
 
-    if len(result) == 0:
+    if result and result.user_uuid == current_user['uuid']:
-        return {}, 404
-
         db.session.query(RecordModel).filter(RecordModel.uuid == record_id).delete()
         db.session.commit()
+    else:
+        return {}, 401
 
-    return record_schema.dumps(result[0]), 200
+    return record_schema.dumps(result), 200
 
 @app.route("/record", methods = ["POST"])
+@jwt_required()
 def ep_record_post():
-    body = request.json
+    current_user = json.loads(get_jwt_identity())
 
-    if not body:
+    amount = request.json.get('amount', None)
+    category = request.json.get('category', None)
+
+    if not all([amount, category]):
         return {}, 403
 
-    if 'uuid' in body:
+    u_uuid = uuid.uuid4().hex
-        return {}, 403
 
-    body.update({'uuid': uuid.uuid4().hex})
+    r_time = time.strftime("%Y-%m-%d")
-
-    # backward compatibility with lab2 DB model
-    if 'cat_id' in body:
-        body.update({'cat_uuid': body['cat_id']})
-        del body['cat_id']
-
-    if 'user_id' in body:
-        body.update({'user_uuid': body['user_id']})
-        del body['user_id']
 
     try:
-        _ = record_schema.load(body)
+        _ = record_schema.load({'amount': amount, "cat_uuid": category, "uuid": u_uuid,
+                                'user_uuid': current_user['uuid'], 'date': r_time})
     except Exception as e:
-        return {}, 403
+        return {}, 400
 
-    r = RecordModel(**body)
+    r = RecordModel(amount=amount, cat_uuid=category, uuid=u_uuid, user_uuid=current_user['uuid'], date=r_time)
-
-    b_id = db.session \
-            .query(UserModel) \
-            .filter(UserModel.uuid == body['user_uuid']) \
-            .all()[0] \
-            .bal_uuid
 
     v = db.session \
             .query(BalanceModel) \
-            .filter(BalanceModel.uuid == b_id) \
+            .filter(BalanceModel.uuid == current_user['bal_uuid']) \
-            .all()[0] \
+            .one_or_none() \
             .value
 
-    BalanceModel.metadata.tables.get("balance").update().where(BalanceModel.metadata.tables.get("balance").c.uuid == b_id).values(value = v-body['amount'])
+    BalanceModel \
+            .metadata.tables.get("balance") \
+            .update() \
+            .where(BalanceModel.metadata.tables.get("balance").c.uuid == current_user['bal_uuid']) \
+            .values(value = v - amount)
 
     try:
         db.session.add(r)
@@ -318,68 +334,60 @@ def ep_record_post():
         db.session.rollback()
         return {}, 403
 
-
+    return {'uuid': r.uuid}, 200
-    return jsonify(record_schema.load(body)), 200
 
 @app.route("/balance_up", methods = ["POST"])
+@jwt_required()
 def ep_balance_up():
-    body = request.json
+    current_user = json.loads(get_jwt_identity())
 
-    if 'user_id' in body:
+    amount = request.json.get('amount', None)
-        body.update({'user_uuid': body['user_id']})
-        del body['user_id']
-    elif 'uuid' in body:
-        body.update({'user_uuid': body['uuid']})
-        del body['uuid']
-
-    if 'user_uuid' not in body:
-        return {}, 403
 
     try:
-        b_id = db.session \
-                .query(UserModel) \
-                .filter(UserModel.uuid == body['user_uuid']) \
-                .all()[0] \
-                .bal_uuid
-
         v = db.session \
                 .query(BalanceModel) \
-                .filter(BalanceModel.uuid == b_id) \
+                .filter(BalanceModel.uuid == current_user['bal_uuid']) \
-                .all()[0] \
+                .one_or_none() \
                 .value
 
-        BalanceModel.metadata.tables.get("balance").update().where(BalanceModel.metadata.tables.get("balance").c.uuid == b_id).values(value = v + body['amount'])
+        BalanceModel.metadata.tables.get("balance").update().where(BalanceModel.metadata.tables.get("balance").c.uuid == current_user['bal_uuid']).values(value = v + amount)
     except Exception as e:
-        return {}, 403
+        return {}, 407
 
     return {}, 200
 
 @app.route("/balance", methods = ["GET"])
+@jwt_required()
 def ep_balance_get():
-    body = request.json
+    current_user = json.loads(get_jwt_identity())
+    result = db.session.query(BalanceModel).filter(BalanceModel.uuid == current_user['bal_uuid']).one_or_none()
 
-    if 'user_id' in body:
+    return balance_schema.dumps(result), 200
-        body.update({'user_uuid': body['user_id']})
-        del body['user_id']
-    elif 'uuid' in body:
-        body.update({'user_uuid': body['uuid']})
-        del body['uuid']
 
-    if 'user_uuid' not in body:
+@jwt.expired_token_loader
-        return {}, 403
+def expired_token_callback(jwt_header, jwt_payload):
+   return (
+       jsonify({"message": "The token has expired.", "error": "token_expired"}),
+       401,
+   )
 
-    try:
+@jwt.invalid_token_loader
-        b_id = db.session \
+def invalid_token_callback(error):
-                .query(UserModel) \
+   return (
-                .filter(UserModel.uuid == body['user_uuid']) \
+       jsonify(
-                .all()[0] \
+           {"message": "Signature verification failed.", "error": "invalid_token"}
-                .bal_uuid
+       ),
+       401,
+   )
 
-        result = db.session.query(BalanceModel).filter(BalanceModel.uuid == b_id).all()
+@jwt.unauthorized_loader
-    except Exception as e:
+def missing_token_callback(error):
-        return {}, 403
+   return (
-
+       jsonify(
-    if len(result) == 1:
+           {
-        return user_schema.dumps(result[0]), 200
+               "description": "Request does not contain an access token.",
-    else:
+               "error": "authorization_required",
-        return {}, 404
+           }
+       ),
+       401,
+   )

docker-compose.yaml

@@ -14,6 +14,7 @@ services:
       - ./app:/app/app
     env_file:
       - db.env
+      - app.env
     depends_on:
       - db
 

requirements.txt

@@ -3,6 +3,7 @@ apispec==6.8.0
 blinker==1.8.2
 click==8.1.7
 Flask==3.0.3
+Flask-JWT-Extended==4.7.1
 Flask-Migrate==4.0.7
 flask-smorest==0.45.0
 Flask-SQLAlchemy==3.1.1
@@ -14,6 +15,7 @@ MarkupSafe==2.1.5
 marshmallow==3.23.2
 packaging==24.2
 psycopg2-binary==2.9.10
+PyJWT==2.10.1
 SQLAlchemy==2.0.36
 typing_extensions==4.12.2
 webargs==8.6.0

tests/lab3/user_test.sh

@@ -19,7 +19,7 @@ fi
 echo ' Done.'
 
 echo -n 'Creating users...'
-for i in $(seq 9); do
+for i in $(seq 1); do
     curl -X POST -f -s \
         --data "{\"name\": \"hi$i\"}" \
         --header "Content-Type: application/json" \
@@ -49,7 +49,7 @@ echo " $DELETION_UUID."
 
 echo -n "Deleting user $DELETION_UUID..."
 curl -X DELETE -f -s \
-    http://127.0.0.1:12402/user/$DELETION_UUID > /dev/null
+    http://$HOST:12402/user/$DELETION_UUID > /dev/null
 
 if [ $? -ne 0 ]; then
     echo 'Exiting due to previous error'