prune_captcha 1.10.0__py3-none-any.whl → 1.12.0__py3-none-any.whl

captcha_prune/utils.py

@@ -1,68 +1,44 @@
 import os
 import random
-from urllib.parse import urlencode
 
-import requests
 from django.conf import settings
-from django.contrib import messages
-from django.http import HttpRequest, HttpResponse
-from django.urls import reverse
+from django.shortcuts import get_object_or_404
 
+from captcha_prune.models import Captcha
+
+
+def create_and_get_captcha() -> dict:
+    captcha = Captcha.objects.create()
 
-def create_and_get_puzzle(request: HttpRequest) -> HttpResponse | dict:
     _, _, puzzle_images_path = settings.PUZZLE_IMAGE_STATIC_PATH.rpartition("static/")
-    try:
-        response = requests.post(
-            request.build_absolute_uri(reverse("captcha:create-captcha"))
-        ).json()
-    except requests.RequestException:
-        return HttpResponse(status=502)
-    request.session["puzzle_uuid"] = response["uuid"]
     puzzle_images = [
         f
         for f in os.listdir(settings.PUZZLE_IMAGE_STATIC_PATH)
-        if f.lower().endswith((".jpg", ".jpeg", ".png", ".gif"))
+        if f.lower().endswith((".jpg", ".jpeg", ".png", ".gif", ".webp"))
     ]
     selected_image = random.choice(puzzle_images)
+
     return {
-        "uuid": response["uuid"],
-        "width": response["width"],
-        "height": response["height"],
-        "piece_width": response["piece_width"],
-        "piece_height": response["piece_height"],
-        "pos_x_solution": response["pos_x_solution"],
-        "pos_y_solution": response["pos_y_solution"],
-        "piece_pos_x": response["piece_pos_x"],
-        "piece_pos_y": response["piece_pos_y"],
+        "uuid": captcha.uuid,
+        "width": captcha.width,
+        "height": captcha.height,
+        "piece_width": captcha.piece_width,
+        "piece_height": captcha.piece_height,
+        "pos_x_solution": captcha.pos_x_solution,
+        "pos_y_solution": captcha.pos_y_solution,
+        "piece_pos_x": captcha.piece_pos_x,
+        "piece_pos_y": captcha.piece_pos_y,
         "image": f"{puzzle_images_path}{selected_image}",
     }
 
 
-def verify_captcha(
-    request: HttpRequest,
-    session_expired: HttpResponse,
-    incorrect_captcha: HttpResponse,
-    form,
-) -> HttpResponse | None:
-    puzzle_uuid = request.session.get("puzzle_uuid")
-    if not puzzle_uuid:
-        messages.error(request, "La session a expiré.")
-        return session_expired
-    try:
-        base_url = request.build_absolute_uri(
-            reverse("captcha:verify-captcha", kwargs={"uuid": puzzle_uuid}),
-        )
-        data = {
-            "pos_x_answer": request.POST.get("pos_x_answer"),
-            "pos_y_answer": request.POST.get("pos_y_answer"),
-        }
-        query_string = urlencode(data)
-        full_url = f"{base_url}?{query_string}"
-        response = requests.get(full_url)
-        if response.status_code == 401:
-            messages.error(request, "Captcha incorrect. Veuillez réessayer.")
-            return incorrect_captcha
-        del form.fields["pos_x_answer"]
-        del form.fields["pos_y_answer"]
-    except requests.RequestException:
-        return HttpResponse(status=502)
+def verify_captcha(puzzle_uuid: str, pos_x_answer: int, pos_y_answer: int) -> bool:
+    captcha = get_object_or_404(Captcha, uuid=puzzle_uuid)
+
+    if (
+        abs(captcha.pos_x_solution - pos_x_answer) <= captcha.precision
+        and abs(captcha.pos_y_solution - pos_y_answer) <= captcha.precision
+    ):
+        return True
+    else:
+        return False

{prune_captcha-1.10.0.dist-info → prune_captcha-1.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prune_captcha
-Version: 1.10.0
+Version: 1.12.0
 Summary: A tool to protect formulaire from spam.
 Author-email: Arnout <bastien@prune.sh>
 Project-URL: Made_by, https://prune.sh/
@@ -61,21 +61,21 @@ Don't hesitate to regularly run `poetry update`, as the captcha evolves with tim
 In `settings.py`, set the path to the images used for the puzzle:
 
 ```python
-PUZZLE_IMAGE_STATIC_PATH = "website/static/website/images/"
+PUZZLE_IMAGE_STATIC_PATH = "website/static/website/images/puzzles/"
 ```
 
 ### Utilisation
 
 -   GET request (form display)
 
-    -   Use create_and_get_puzzle to generate the captcha data:
+    -   Use create_captcha to generate the captcha data:
 
         ```python
-        from captcha_prune.utils import create_and_get_puzzle
+        from captcha_prune.utils import create_captcha
         ```
 
         ```python
-        puzzle = create_and_get_puzzle(request)
+        puzzle = create_captcha(request)
         ```
 
     -   Passes the data into the context under the puzzle variable:
@@ -103,50 +103,19 @@ PUZZLE_IMAGE_STATIC_PATH = "website/static/website/images/"
             ```
 
             ```python
-            response = verify_captcha(
-                request, redirect("/"), redirect("website:contact-page"), form
-            )
+            response = verify_captcha(request)
             ```
 
-        -   None if the captcha is correct.
+        -   True if the captcha is correct, else False.
 
-        -   Redirects in case of expired session or incorrect captcha:
-
-            ```python
-            if response is not None:
-                return response
-            ```
-
-### Example
-
-    ```python
-    def contact_view(request):
-        if request.method == "POST":
-            form = ContactForm(request.POST)
-            if form.is_valid():
-                response = verify_captcha(
-                    request, redirect("/"), redirect("website:contact-page"), form
-                )
-            if response is not None:
-                return response
-            messages.success(request, "Formulaire soumis avec succès.")
-            return redirect("/")
-        else:
-            puzzle = create_and_get_puzzle(request)
-    else:
-        form = ContactForm()
-        puzzle = create_and_get_puzzle(request)
-    return render(
-        request,
-        "website/pages/contact/page.html",
-        {"form": form, "puzzle": puzzle},
-    )
-    ```
+        -   Redirects in case of  incorrect captcha.
 
 # Available Versions
 
 | Version | Date       | Notes                              |
 | ------- | ---------- | ---------------------------------- |
+| 1.12.0  | 2025-05-21 | removed views, added utils, ...    |
+| 1.11.0  | 2025-05-21 | removed utils                      |
 | 1.10.0  | 2025-05-20 | fix documentation, removed ...     |
 | 1.9.0   | 2025-05-20 | puzzle images path fixed           |
 | 1.8.0   | 2025-05-20 | added migrations                   |

{prune_captcha-1.10.0.dist-info → prune_captcha-1.12.0.dist-info}/RECORD

@@ -4,20 +4,17 @@ captcha_prune/asgi.py,sha256=wi2rRLFltXOZyve8mAB_E8udaFyONOf5N42WrWIQX8M,403
 captcha_prune/models.py,sha256=O8nxhVfPat3oaDGZzd88kQHkGayQIWZ_dOO9uu1R6P4,1240
 captcha_prune/payloads.py,sha256=PwR48xKg9YEgGgoJmGe7ywwFPCqM4gumomyFunn-Ems,115
 captcha_prune/settings.py,sha256=YEZHEjYYYK-cH3gSLIR3a7g4Bypnuf_5eMTTcm719CE,3395
-captcha_prune/urls.py,sha256=DeCJTjJA0krW27KoHafvh3GBRr7fJ80E2lVHEWYSsW4,271
-captcha_prune/utils.py,sha256=3AYKlLxLUdGf9SBGg5Mgzym7LlxBpDhYv4ITFFZ0nAc,2415
-captcha_prune/views.py,sha256=BzjQfXLwYx2YSWODrnGpokqU8XeC-9QORivzWKxYofY,1539
+captcha_prune/utils.py,sha256=bEOMAA4jatS9eAgHEHpq0qNHjkCrywDGHAn81JPwbuo,1352
 captcha_prune/wsgi.py,sha256=fukA_iiCT4FFzcJ0QX2Zr_HNddqdq-ln3ien2UWcCTA,403
 captcha_prune/migrations/0001_initial.py,sha256=QMTaeSIxPociSrV4r89zfsbxMwMu4qpL16LT3yPgcaw,831
 captcha_prune/migrations/0002_remove_captcha_created_at_remove_captcha_pos_x_and_more.py,sha256=xyyE_G3t8kJqFvKuNWFRTyTyyD1kzvfeSgbkTQ9DO8A,2099
 captcha_prune/migrations/0003_captcha_created_at_captcha_updated_at.py,sha256=qT9cTDe3coiWXYbYfBlK4iEYg71E9B2FGuo74Wy_gbA,698
 captcha_prune/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 commons/base_model.py,sha256=q1Q7lgtvN_t6ujhEiSsNNXb_ay0qY6FbfK0Zm2Hdgp0,213
-commons/decorators.py,sha256=nU_3SyxENcWDdxo03VyNYEvoevplC6ig7BFogY8apNs,1306
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/captcha_prune/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/captcha_prune/test_views.py,sha256=h-Mrdiprh71s7kIJPYAt6xv4G_S7vp51WCpAzy4CZ6U,2364
-prune_captcha-1.10.0.dist-info/METADATA,sha256=DVW1Kulk4o16TNlXHBkAxovoGG2XbyS2G9ywg4P-34g,4311
-prune_captcha-1.10.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-prune_captcha-1.10.0.dist-info/top_level.txt,sha256=EB4h0WF_YGF7kAWB0XtqmuloOhkL5pC71CzgEVYam7w,28
-prune_captcha-1.10.0.dist-info/RECORD,,
+prune_captcha-1.12.0.dist-info/METADATA,sha256=sU70ylcO8ntgm7y1CZqPQiEmwI7Yf-rXULvoZxn10Dw,3443
+prune_captcha-1.12.0.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+prune_captcha-1.12.0.dist-info/top_level.txt,sha256=EB4h0WF_YGF7kAWB0XtqmuloOhkL5pC71CzgEVYam7w,28
+prune_captcha-1.12.0.dist-info/RECORD,,

{prune_captcha-1.10.0.dist-info → prune_captcha-1.12.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

captcha_prune/urls.py

@@ -1,10 +0,0 @@
-from django.urls import path
-
-from captcha_prune.views import create_captcha_view, verify_captcha_view
-
-app_name = "captcha"
-
-urlpatterns = [
-    path("", create_captcha_view, name="create-captcha"),
-    path("<str:uuid>/", verify_captcha_view, name="verify-captcha"),
-]

captcha_prune/views.py

@@ -1,45 +0,0 @@
-from django.http import HttpRequest, HttpResponse, JsonResponse
-from django.shortcuts import get_object_or_404
-from django.views.decorators.csrf import csrf_exempt
-from django.views.decorators.http import require_GET, require_POST
-
-from captcha_prune.models import Captcha
-from captcha_prune.payloads import PuzzleAnswerPayload
-from commons.decorators import use_payload
-
-
-@require_POST
-@csrf_exempt
-def create_captcha_view(request: HttpRequest) -> HttpResponse:
-    captcha = Captcha.objects.create()
-    return JsonResponse(
-        status=201,
-        data={
-            "uuid": str(captcha.uuid),
-            "width": captcha.width,
-            "height": captcha.height,
-            "piece_width": captcha.piece_width,
-            "piece_height": captcha.piece_height,
-            "pos_x_solution": captcha.pos_x_solution,
-            "pos_y_solution": captcha.pos_y_solution,
-            "piece_pos_x": captcha.piece_pos_x,
-            "piece_pos_y": captcha.piece_pos_y,
-        },
-    )
-
-
-@require_GET
-@use_payload(PuzzleAnswerPayload)
-def verify_captcha_view(
-    request: HttpRequest, uuid: str, payload: PuzzleAnswerPayload
-) -> HttpResponse:
-    captcha = get_object_or_404(Captcha, uuid=uuid)
-    pos_x_answer = payload.pos_x_answer
-    pos_y_answer = payload.pos_y_answer
-    if (
-        abs(captcha.pos_x_solution - pos_x_answer) <= captcha.precision
-        and abs(captcha.pos_y_solution - pos_y_answer) <= captcha.precision
-    ):
-        return HttpResponse(status=304)
-    else:
-        return HttpResponse(status=401)

commons/decorators.py

@@ -1,41 +0,0 @@
-import functools
-from typing import get_origin
-
-from django.http import HttpResponse
-from pydantic import ValidationError
-
-
-def use_payload(payload_class):
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(request, *args, **kwargs):
-            data = {}
-
-            if request.method == "POST":
-                body = request.POST
-            elif request.method == "GET":
-                body = request.GET
-            else:
-                raise NotImplementedError
-
-            for field_name, field in payload_class.model_fields.items():
-                url_name = field.alias if field.alias else field_name
-                is_list_field = get_origin(field.annotation) is list
-                url_value = (
-                    body.getlist(url_name) if is_list_field else body.get(url_name)
-                )
-                if url_value is not None:
-                    data[url_name] = url_value
-
-            try:
-                payload = payload_class.model_validate(data)
-            except ValidationError as e:
-                return HttpResponse(
-                    e.json(), headers={"content_type": "application/json"}, status=400
-                )
-
-            return func(request, *args, payload=payload, **kwargs)
-
-        return wrapper
-
-    return decorator