Compare commits

..

No commits in common. "e8c84ba809e8eaa200dd01b2dc97d7f652d1c9cb" and "4e44457c8dcb15a5402b27b8b3049379664e3892" have entirely different histories.

2 changed files with 8 additions and 16 deletions

4
.gitignore vendored
View file

@ -1,3 +1,3 @@
.venv/ .venv
.env .env
.idea/ .idea

20
app.py
View file

@ -7,7 +7,6 @@ import mysql.connector
import os import os
from dotenv import load_dotenv from dotenv import load_dotenv
import jwt import jwt
import hmac
load_dotenv() load_dotenv()
app = Flask(__name__) app = Flask(__name__)
@ -157,17 +156,11 @@ def transfer():
return jsonify({"error":"User not found"}), 404 return jsonify({"error":"User not found"}), 404
if sender["balance"] < amount: if sender["balance"] < amount:
return jsonify({"error": "Insufficient funds"}), 400 return jsonify({"error": "Insufficient funds"}), 400
try: with db.cursor(dictionary=True) as cur:
db.start_transaction() cur.execute("UPDATE users SET balance = balance - %s WHERE bid = %s", (amount, fbid))
with db.cursor(dictionary=True) as cur: cur.execute("UPDATE users SET balance = balance + %s WHERE bid = %s", (amount, tbid))
cur.execute("UPDATE users SET balance = balance - %s WHERE bid = %s", (amount, fbid)) db.commit()
cur.execute("UPDATE users SET balance = balance + %s WHERE bid = %s", (amount, tbid)) return jsonify({"message": "Transfer successful"}), 200
db.commit()
return jsonify({"message": "Transfer successful"}), 200
except mysql.connector.Error as err:
db.rollback()
print(f"Transactional Error: {err}")
return jsonify({"error": "A database error occurred during the transfer."}), 500
@app.route('/admin/change-password', methods=['POST', 'PATCH']) @app.route('/admin/change-password', methods=['POST', 'PATCH'])
@ -178,8 +171,7 @@ def change_password():
key = data.get('key') key = data.get('key')
if not bid or not new_password or not key: if not bid or not new_password or not key:
return jsonify({"error": "BID, new password, and key are required"}), 400 return jsonify({"error": "BID, new password, and key are required"}), 400
oskey = os.getenv('ADMIN_KEY') if key != os.getenv('ADMIN_KEY'):
if not oskey or not hmac.compare_digest(key, oskey):
return jsonify({"error": "Admin Key required"}), 403 return jsonify({"error": "Admin Key required"}), 403
user = get_user(bid) user = get_user(bid)
if not user: if not user: