arthexis 0.1.24__py3-none-any.whl → 0.1.25__py3-none-any.whl

pages/tests.py

@@ -515,6 +515,23 @@ class InvitationTests(TestCase):
         self.assertEqual(lead.mac_address, "")
         self.assertEqual(len(mail.outbox), 0)
 
+    def test_request_invite_uses_original_referer(self):
+        InviteLead.objects.all().delete()
+        self.client.get(
+            reverse("pages:index"),
+            HTTP_REFERER="https://campaign.example/landing",
+        )
+
+        resp = self.client.post(
+            reverse("pages:request-invite"),
+            {"email": "origin@example.com"},
+            HTTP_REFERER="http://testserver/pages/request-invite/",
+        )
+
+        self.assertEqual(resp.status_code, 200)
+        lead = InviteLead.objects.get()
+        self.assertEqual(lead.referer, "https://campaign.example/landing")
+
     def test_request_invite_falls_back_to_send_mail(self):
         node = Node.objects.create(
             hostname="local", address="127.0.0.1", mac_address="00:11:22:33:44:55"
@@ -3531,6 +3548,28 @@ class UserStorySubmissionTests(TestCase):
         story = UserStory.objects.get()
         self.assertEqual(story.language_code, "es")
 
+    def test_submission_prefers_original_referer(self):
+        self.client.get(
+            reverse("pages:index"),
+            HTTP_REFERER="https://ads.example/original",
+        )
+        response = self.client.post(
+            self.url,
+            {
+                "rating": 3,
+                "comments": "Works well",
+                "path": "/wizard/step-2/",
+                "name": "visitor@example.com",
+                "take_screenshot": "0",
+            },
+            HTTP_REFERER="http://testserver/wizard/step-2/",
+            HTTP_USER_AGENT="FeedbackBot/2.0",
+        )
+
+        self.assertEqual(response.status_code, 200)
+        story = UserStory.objects.get()
+        self.assertEqual(story.referer, "https://ads.example/original")
+
     def test_superuser_submission_creates_triage_todo(self):
         Todo.objects.all().delete()
         superuser = get_user_model().objects.create_superuser(
@@ -3591,6 +3630,7 @@ class UserStorySubmissionTests(TestCase):
             screenshot_file,
             method="USER_STORY",
             user=self.user,
+            link_duplicates=True,
         )
 
     def test_anonymous_submission_uses_provided_email(self):

pages/utils.py

@@ -1,6 +1,15 @@
+from __future__ import annotations
+
+from urllib.parse import urlsplit
+
+from django.core.exceptions import DisallowedHost
+from django.http.request import split_domain_port
 from django.urls import path as django_path
 
 
+ORIGINAL_REFERER_SESSION_KEY = "pages:original_referer"
+
+
 def landing(label=None):
     """Decorator to mark a view as a landing page."""
 
@@ -12,6 +21,67 @@ def landing(label=None):
     return decorator
 
 
+def cache_original_referer(request) -> None:
+    """Persist the first external referer observed for the session."""
+
+    session = getattr(request, "session", None)
+    if not hasattr(session, "get"):
+        return
+
+    original = session.get(ORIGINAL_REFERER_SESSION_KEY)
+    if original:
+        request.original_referer = original
+        return
+
+    referer = (request.META.get("HTTP_REFERER") or "").strip()
+    if not referer:
+        return
+
+    try:
+        parsed = urlsplit(referer)
+    except ValueError:
+        return
+
+    if parsed.scheme not in {"http", "https"} or not parsed.netloc:
+        return
+
+    try:
+        host = request.get_host()
+    except DisallowedHost:
+        host = ""
+
+    referer_host, _ = split_domain_port(parsed.netloc)
+    request_host, _ = split_domain_port(host)
+
+    if referer_host and request_host:
+        if referer_host.lower() == request_host.lower():
+            return
+
+    referer_value = referer[:1000]
+    session[ORIGINAL_REFERER_SESSION_KEY] = referer_value
+    request.original_referer = referer_value
+
+
+def get_original_referer(request) -> str:
+    """Return the original external referer recorded for the session."""
+
+    if hasattr(request, "original_referer"):
+        return request.original_referer or ""
+
+    session = getattr(request, "session", None)
+    if hasattr(session, "get"):
+        referer = session.get(ORIGINAL_REFERER_SESSION_KEY)
+        if referer:
+            request.original_referer = referer
+            return referer
+
+    referer = (request.META.get("HTTP_REFERER") or "").strip()
+    if referer:
+        referer = referer[:1000]
+    request.original_referer = referer
+    return referer
+
+
 def landing_leads_supported() -> bool:
     """Return ``True`` when the local node supports landing lead tracking."""
 

pages/views.py

@@ -67,6 +67,7 @@ from core.models import (
     Todo,
 )
 from ocpp.models import Charger
+from .utils import get_original_referer
 
 try:  # pragma: no cover - optional dependency guard
     from graphviz import Digraph
@@ -1114,7 +1115,7 @@ def request_invite(request):
                 comment=comment,
                 user=request.user if request.user.is_authenticated else None,
                 path=request.path,
-                referer=request.META.get("HTTP_REFERER", ""),
+                referer=get_original_referer(request),
                 user_agent=request.META.get("HTTP_USER_AGENT", ""),
                 ip_address=ip_address,
                 mac_address=mac_address or "",
@@ -1592,7 +1593,7 @@ def submit_user_story(request):
         if not story.name:
             story.name = str(_("Anonymous"))[:40]
         story.path = (story.path or request.get_full_path())[:500]
-        story.referer = request.META.get("HTTP_REFERER", "")
+        story.referer = get_original_referer(request)
         story.user_agent = request.META.get("HTTP_USER_AGENT", "")
         story.ip_address = client_ip or None
         story.is_user_data = True
@@ -1664,6 +1665,7 @@ def submit_user_story(request):
                         screenshot_path,
                         method="USER_STORY",
                         user=story.user if story.user_id else None,
+                        link_duplicates=True,
                     )
                 except Exception:  # pragma: no cover - best effort persistence
                     logger.exception(