fix leaderboard looks, add OCR, make the captcha only show if you add a username and password

main.py

@@ -1,9 +1,11 @@
 from flask import Flask, redirect, url_for, render_template, request, Response, send_from_directory, g
 from dotenv import load_dotenv
-from constants import RICKROLL_LINK, UPLOAD_DIR, MINIMUM_COSINE_SIMILARITY, DATABASE_FILE
-from jina import get_grass_touching_similarity
+from constants import RICKROLL_LINK, UPLOAD_DIR, MINIMUM_COSINE_SIMILARITY, MINIMUM_OCR_SIMILARITY, DATABASE_FILE
 from PIL import Image
 
+from jina import get_grass_touching_similarity
+from ocr_check import generate_challenge, check_text_similarity
+
 import os, flask_login, uuid, base64, sqlite3, bcrypt, secrets, hashlib, time
 
 if os.path.exists(".env"):
@@ -15,6 +17,9 @@ app.secret_key = os.environ["FLASK_SECRET_KEY"]
 login_manager = flask_login.LoginManager()
 login_manager.init_app(app)
 
+global challenges 
+challenges = {}
+
 os.makedirs("uploads", exist_ok=True)
 
 def get_db():
@@ -56,6 +61,75 @@ def user_loader(user_id):
     user.id = user_id
     return user
 
+@app.route("/generate_challenge")
+def generate_challenge_route():
+    username = request.json["username"]
+
+    if not username in challenges:
+        challenges[username] = generate_challenge(username)
+
+    return challenges[username]
+
+def resize_image_file(path, max_side=256, fmt="JPEG"):
+    img = Image.open(path)
+    scale = max_side / max(img.size)
+    if scale < 1:
+        img = img.resize((int(img.width * scale), int(img.height * scale)), Image.LANCZOS)
+    img.save(path, format=fmt)
+
+@app.route("/submit_challenge", methods=["POST"])
+def submit_challenge():
+    try:
+        username, image_type, image_data = request.json["username"], request.json["image_type"], request.json["image_data"].encode("utf-8")
+
+        if image_type == "jpeg":
+            image_data = image_data[23:] # data:image/jpeg;base64,
+        else:
+            image_data = image_data[22:] # data:image/png;base64,
+
+        image_uuid = str(uuid.uuid4())
+
+        if image_type not in ["png", "jpeg"]:
+            return Response("Invalid file type.", 400)
+
+        if os.path.commonprefix((os.path.realpath(f"{UPLOAD_DIR}/{image_uuid}.{image_type}"), UPLOAD_DIR)) != UPLOAD_DIR:
+            return Response("Why are you trying path traversal :C", 400)
+
+        actual_image_data = base64.b64decode(image_data)
+        image_hash = hashlib.sha512(actual_image_data).hexdigest()
+        cur = get_db().cursor()
+        cur.execute("SELECT image_hash FROM Images WHERE image_hash = ?", (image_hash,))
+        if cur.fetchone():
+            return Response("You can touch grass multiple times. I believe in you. Dont submit the same images.", 400)
+
+        cur.execute("INSERT INTO Images (image_hash, username, filename) VALUES (?, ?, ?)", (image_hash, username, image_uuid))
+        get_db().commit()
+
+        with open(f"{UPLOAD_DIR}/{image_uuid}.{image_type}", "wb") as file:
+            file.write(actual_image_data)
+
+        resize_image_file(f"{UPLOAD_DIR}/{image_uuid}.{image_type}", fmt="JPEG" if image_type == "jpeg" else "png")
+
+    except:
+        import traceback; traceback.print_exc()
+        return Response("Unknown error", 400)
+    
+    if not challenges.get(username):
+        return Response("You havent started a challenge yet.", 400)
+    
+    detected_text, text_similarity = check_text_similarity(f"{UPLOAD_DIR}/{image_uuid}.{image_type}", challenges[username])
+    challenges.pop(username)
+
+    if not text_similarity >= MINIMUM_OCR_SIMILARITY:
+        return Response(f"The text is incorrect on the image. Similarity: {round(text_similarity * 100, 2)}% Detected Text: {detected_text}")
+    
+    grass_touching_similarity = get_grass_touching_similarity(request.url_root.rstrip('/').replace("http://", "https://") + url_for('uploads', filename=f"{image_uuid}.{image_type}"))
+    if not grass_touching_similarity >= MINIMUM_COSINE_SIMILARITY:
+        os.remove(f"{UPLOAD_DIR}/{image_uuid}.{image_type}")
+        return Response(f"Imagine not touching grass. Cosine similarity: {grass_touching_similarity}", 401)
+
+    return Response(f"/uploads/{image_uuid}.{image_type}", 200)
+
 @app.route("/app")
 @flask_login.login_required
 def application():
@@ -136,57 +210,7 @@ def register():
         flask_login.login_user(user, remember=True)
 
         return redirect(url_for("application"))
-
-def resize_image_file(path, max_side=256, fmt="JPEG"):
-    img = Image.open(path)
-    scale = max_side / max(img.size)
-    if scale < 1:
-        img = img.resize((int(img.width * scale), int(img.height * scale)), Image.LANCZOS)
-    img.save(path, format=fmt)
-
-@app.route("/upload", methods=["POST"])
-def upload():
-    try:
-        username, image_type, image_data = request.json["username"], request.json["image_type"], request.json["image_data"].encode("utf-8")
-
-        if image_type == "jpeg":
-            image_data = image_data[23:] # data:image/jpeg;base64,
-        else:
-            image_data = image_data[22:] # data:image/png;base64,
-
-        image_uuid = str(uuid.uuid4())
-
-        if image_type not in ["png", "jpeg"]:
-            return Response("Invalid file type.", 400)
-
-        if os.path.commonprefix((os.path.realpath(f"{UPLOAD_DIR}/{image_uuid}.{image_type}"), UPLOAD_DIR)) != UPLOAD_DIR:
-            return Response("Why are you trying path traversal :C", 400)
-
-        actual_image_data = base64.b64decode(image_data)
-        image_hash = hashlib.sha512(actual_image_data).hexdigest()
-        cur = get_db().cursor()
-        cur.execute("SELECT image_hash FROM Images WHERE image_hash = ?", (image_hash,))
-        if cur.fetchone():
-            return Response("You can touch grass multiple times. I believe in you. Dont submit the same images.", 400)
-
-        cur.execute("INSERT INTO Images (image_hash, username, filename) VALUES (?, ?, ?)", (image_hash, username, image_uuid))
-        get_db().commit()
-
-        with open(f"{UPLOAD_DIR}/{image_uuid}.{image_type}", "wb") as file:
-            file.write(actual_image_data)
-
-        resize_image_file(f"{UPLOAD_DIR}/{image_uuid}.{image_type}", fmt="JPEG" if image_type == "jpeg" else "png")
-
-    except:
-        import traceback; traceback.print_exc()
-        return Response("Unknown error", 400)
     
-    grass_touching_similarity = get_grass_touching_similarity(request.url_root.rstrip('/').replace("http://", "https://") + url_for('uploads', filename=f"{image_uuid}.{image_type}"))
-    if not grass_touching_similarity >= MINIMUM_COSINE_SIMILARITY:
-        return Response(f"Imagine not touching grass. Cosine similarity: {grass_touching_similarity}", 401)
-
-    return Response(f"/uploads/{image_uuid}.{image_type}", 200)
-
 @app.route("/uploads/<filename>")
 def uploads(filename):
     return send_from_directory("uploads", filename)
@@ -211,4 +235,4 @@ def logout():
 def unauthorized_handler():
     return redirect("/login")
 
-app.run(port=os.environ.get("PORT"), host=os.environ.get("HOST", "0.0.0.0"))
+app.run(debug=True, port=os.environ.get("PORT"), host=os.environ.get("HOST", "0.0.0.0"))