Ticket #407: django.patch

contrib/comments/views/comments.py

@@ -204 +204 @@
     new_data = request.POST.copy()
     new_data['content_type_id'] = content_type_id
     new_data['object_id'] = object_id
-    new_data['ip_address'] = request.META['REMOTE_ADDR']
+    new_data['ip_address'] = request.META.get('REMOTE_ADDR')
     new_data['is_public'] = comments.IS_PUBLIC in option_list
     response = HttpResponse()
     manipulator = PublicCommentManipulator(request.user,

core/xheaders.py

@@ -17 +17 @@
     within the INTERNAL_IPS setting.
     """
     from django.conf.settings import INTERNAL_IPS
-    if request.META['REMOTE_ADDR'] in INTERNAL_IPS:
+    if request.META.get('REMOTE_ADDR') in INTERNAL_IPS:
         response['X-Object-Type'] = "%s.%s" % (package, python_module_name)
         response['X-Object-Id'] = str(object_id)

core/handlers/base.py

@@ -79 +79 @@
             if DEBUG:
                 return self.get_technical_error_response()
             else:
-                subject = 'Database error (%s IP)' % (request.META['REMOTE_ADDR'] in INTERNAL_IPS and 'internal' or 'EXTERNAL')
+                subject = 'Database error (%s IP)' % (request.META.get('REMOTE_ADDR', '[UNKNOWN]') in INTERNAL_IPS and 'internal' or 'EXTERNAL')
                 message = "%s\n\n%s" % (self._get_traceback(), request)
                 mail_admins(subject, message, fail_silently=True)
                 return self.get_friendly_error_response(request, resolver)
@@ -89 +89 @@
             if DEBUG:
                 return self.get_technical_error_response()
             else:
-                subject = 'Coding error (%s IP)' % (request.META['REMOTE_ADDR'] in INTERNAL_IPS and 'internal' or 'EXTERNAL')
+                subject = 'Coding error (%s IP)' % (request.META.get('REMOTE_ADDR', '[UNKNOWN]') in INTERNAL_IPS and 'internal' or 'EXTERNAL')
                 try:
                     request_repr = repr(request)
                 except:

middleware/doc.py

@@ -12 +12 @@
         with an x-header indicating the view function.  This is used by the
         documentation module to lookup the view function for an arbitrary page.
         """
-        if request.META['REQUEST_METHOD'] == 'HEAD' and request.META['REMOTE_ADDR'] in settings.INTERNAL_IPS:
+        if request.META['REQUEST_METHOD'] == 'HEAD' and request.META.get('REMOTE_ADDR') in settings.INTERNAL_IPS:
             response = httpwrappers.HttpResponse()
             response['X-View'] = "%s.%s" % (view_func.__module__, view_func.__name__)
             return response