Modify solution_exists to take crackme_id directly

Author: 3rdit

app/controllers/solution.py

@@ -84,17 +84,14 @@ def upload_solution_get(hexidcrackme):
 @limit("20 per day", key_func=lambda: session.get('name'))
 def upload_solution_post(hexidcrackme):
     """Handle solution file upload."""
-    _get_crackme_or_abort(hexidcrackme)  # Validate crackme exists
+    crackme = _get_crackme_or_abort(hexidcrackme)
     username = session.get('name')
     redirect_url = f'/upload/solution/{hexidcrackme}'
 
     # Check if user already submitted a solution
-    try:
-        if solution_exists(username, hexidcrackme):
-            flash("You've already submitted a solution to this crackme", FLASH_ERROR)
-            return redirect(redirect_url)
-    except ErrNoResult:
-        abort(404)
+    if solution_exists(username, crackme['_id']):
+        flash("You've already submitted a solution to this crackme", FLASH_ERROR)
+        return redirect(redirect_url)
 
     if not verify_recaptcha(request):
         flash('reCAPTCHA invalid!', FLASH_ERROR)
@@ -188,17 +185,14 @@ def editor_solution_get(hexidcrackme):
 @limit("20 per day", key_func=lambda: session.get('name'))
 def editor_solution_post(hexidcrackme):
     """Handle solution submission from the web editor."""
-    _get_crackme_or_abort(hexidcrackme)  # Validate crackme exists
+    crackme = _get_crackme_or_abort(hexidcrackme)
     username = session.get('name')
     redirect_url = f'/upload/solution/{hexidcrackme}/editor'
 
     # Check if user already submitted a solution
-    try:
-        if solution_exists(username, hexidcrackme):
-            flash("You've already submitted a solution to this crackme", FLASH_ERROR)
-            return redirect(redirect_url)
-    except ErrNoResult:
-        abort(404)
+    if solution_exists(username, crackme['_id']):
+        flash("You've already submitted a solution to this crackme", FLASH_ERROR)
+        return redirect(redirect_url)
 
     if not verify_recaptcha(request):
         flash('reCAPTCHA invalid!', FLASH_ERROR)

app/models/solution.py

@@ -72,24 +72,22 @@ def solutions_by_user(username):
     return solutions
 
 
-def solution_exists(username, crackme_hexid):
+def solution_exists(username, crackme_id):
     """Check if a user has already submitted a solution for a crackme.
 
-    Raises:
-        ErrNoResult: If the crackme doesn't exist
-        ErrUnavailable: If the database is unavailable
+    Args:
+        username: The username to check
+        crackme_id: The crackme's ObjectId (not hexid)
+
+    Returns:
+        True if a solution exists, False otherwise
     """
     if not check_connection():
         raise ErrUnavailable("Database is unavailable")
 
-    crackme_collection = get_collection('crackme')
-    crackme = crackme_collection.find_one({'hexid': crackme_hexid}, {'_id': 1})
-    if not crackme:
-        raise ErrNoResult("Crackme not found")
-
     collection = get_collection('solution')
     return collection.find_one(
-        {'crackmeid': crackme['_id'], 'author': username},
+        {'crackmeid': crackme_id, 'author': username},
         {'_id': 1}
     ) is not None