mirror of
https://github.com/django/django.git
synced 2025-10-29 00:26:07 +00:00
[1.6.x] Dropped fix_IE_for_vary/attach.
This is a security fix. Disclosure following shortly.
This commit is contained in:
committed by
Florian Apolloner
parent
e05a6222cd
commit
1abcf3a808
@@ -23,8 +23,6 @@ class BaseHandler(object):
|
||||
response_fixes = [
|
||||
http.fix_location_header,
|
||||
http.conditional_content_removal,
|
||||
http.fix_IE_for_attach,
|
||||
http.fix_IE_for_vary,
|
||||
]
|
||||
|
||||
def __init__(self):
|
||||
|
||||
@@ -6,5 +6,4 @@ from django.http.response import (HttpResponse, StreamingHttpResponse,
|
||||
HttpResponseRedirect, HttpResponseNotModified, HttpResponseBadRequest,
|
||||
HttpResponseForbidden, HttpResponseNotFound, HttpResponseNotAllowed,
|
||||
HttpResponseGone, HttpResponseServerError, Http404, BadHeaderError)
|
||||
from django.http.utils import (fix_location_header, conditional_content_removal,
|
||||
fix_IE_for_attach, fix_IE_for_vary)
|
||||
from django.http.utils import fix_location_header, conditional_content_removal
|
||||
|
||||
@@ -39,58 +39,3 @@ def conditional_content_removal(request, response):
|
||||
else:
|
||||
response.content = b''
|
||||
return response
|
||||
|
||||
|
||||
def fix_IE_for_attach(request, response):
|
||||
"""
|
||||
This function will prevent Django from serving a Content-Disposition header
|
||||
while expecting the browser to cache it (only when the browser is IE). This
|
||||
leads to IE not allowing the client to download.
|
||||
"""
|
||||
useragent = request.META.get('HTTP_USER_AGENT', '').upper()
|
||||
if 'MSIE' not in useragent and 'CHROMEFRAME' not in useragent:
|
||||
return response
|
||||
|
||||
offending_headers = ('no-cache', 'no-store')
|
||||
if response.has_header('Content-Disposition'):
|
||||
try:
|
||||
del response['Pragma']
|
||||
except KeyError:
|
||||
pass
|
||||
if response.has_header('Cache-Control'):
|
||||
cache_control_values = [value.strip() for value in
|
||||
response['Cache-Control'].split(',')
|
||||
if value.strip().lower() not in offending_headers]
|
||||
|
||||
if not len(cache_control_values):
|
||||
del response['Cache-Control']
|
||||
else:
|
||||
response['Cache-Control'] = ', '.join(cache_control_values)
|
||||
|
||||
return response
|
||||
|
||||
|
||||
def fix_IE_for_vary(request, response):
|
||||
"""
|
||||
This function will fix the bug reported at
|
||||
http://support.microsoft.com/kb/824847/en-us?spid=8722&sid=global
|
||||
by clearing the Vary header whenever the mime-type is not safe
|
||||
enough for Internet Explorer to handle. Poor thing.
|
||||
"""
|
||||
useragent = request.META.get('HTTP_USER_AGENT', '').upper()
|
||||
if 'MSIE' not in useragent and 'CHROMEFRAME' not in useragent:
|
||||
return response
|
||||
|
||||
# These mime-types that are decreed "Vary-safe" for IE:
|
||||
safe_mime_types = ('text/html', 'text/plain', 'text/sgml')
|
||||
|
||||
# The first part of the Content-Type field will be the MIME type,
|
||||
# everything after ';', such as character-set, can be ignored.
|
||||
mime_type = response.get('Content-Type', '').partition(';')[0]
|
||||
if mime_type not in safe_mime_types:
|
||||
try:
|
||||
del response['Vary']
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
return response
|
||||
|
||||
Reference in New Issue
Block a user