Changeset 3870

Timestamp:

09/26/06 13:49:28 (2 years ago)

Author:

lukeplant

Message:

Improved detection of whether a URL is internal or not for the purpose
of broken link e-mails (referred links from images.google were being
misclassified).

Files:

• django/trunk/django/middleware/common.py (modified) (3 diffs)

django/trunk/django/middleware/common.py

@@ -3 +3 @@
-from django.core.mail import mail_managers
-import md5
+import re
-
-class CommonMiddleware(object):
@@ -62 +63 @@
-                domain = http.get_host(request)
-                referer = request.META.get('HTTP_REFERER', None)
-referer and (domain in
+_is_internal_request(domain,
-                path = request.get_full_path()
-                if referer and not _is_ignorable_404(path) and (is_internal or '?' not in referer):
@@ -89 +90 @@
-            return True
-    return False
+
+def _is_internal_request(domain, referer):
+    "Return true if the referring URL is the same domain as the current request"
+    # Different subdomains are treated as different domains.
+    return referer is not None and re.match("^https?://%s/" % re.escape(domain), referer)