Skip to content

Fix request body/POST access #5590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions rest_framework/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,10 @@ def _load_data_and_files(self):
else:
self._full_data = self._data

# copy files refs to the underlying request so that closable
# copy data & files refs to the underlying request so that closable
# objects are handled appropriately.
self._request._files = self._files
self._request._post = self.POST
self._request._files = self.FILES

def _load_stream(self):
"""
Expand Down
60 changes: 51 additions & 9 deletions tests/test_middleware.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,76 @@
from django.conf.urls import url
from django.contrib.auth.models import User
from django.http import HttpRequest
from django.test import override_settings

from rest_framework.authentication import TokenAuthentication
from rest_framework.authtoken.models import Token
from rest_framework.request import is_form_media_type
from rest_framework.response import Response
from rest_framework.test import APITestCase
from rest_framework.views import APIView


class PostView(APIView):
def post(self, request):
return Response(data=request.data, status=200)


urlpatterns = [
url(r'^$', APIView.as_view(authentication_classes=(TokenAuthentication,))),
url(r'^auth$', APIView.as_view(authentication_classes=(TokenAuthentication,))),
url(r'^post$', PostView.as_view()),
]


class MyMiddleware(object):
class RequestUserMiddleware(object):
def __init__(self, get_response):
self.get_response = get_response

def process_response(self, request, response):
def __call__(self, request):
response = self.get_response(request)
assert hasattr(request, 'user'), '`user` is not set on request'
assert request.user.is_authenticated(), '`user` is not authenticated'
assert request.user.is_authenticated, '`user` is not authenticated'

return response


class RequestPOSTMiddleware(object):
def __init__(self, get_response):
self.get_response = get_response

def __call__(self, request):
assert isinstance(request, HttpRequest)

# Parse body with underlying Django request
request.body

# Process request with DRF view
response = self.get_response(request)

# Ensure request.POST is set as appropriate
if is_form_media_type(request.content_type):
assert request.POST == {'foo': ['bar']}
else:
assert request.POST == {}

return response


@override_settings(ROOT_URLCONF='tests.test_middleware')
class TestMiddleware(APITestCase):

@override_settings(MIDDLEWARE=('tests.test_middleware.RequestUserMiddleware',))
def test_middleware_can_access_user_when_processing_response(self):
user = User.objects.create_user('john', '[email protected]', 'password')
key = 'abcd1234'
Token.objects.create(key=key, user=user)

with self.settings(
MIDDLEWARE_CLASSES=('tests.test_middleware.MyMiddleware',)
):
auth = 'Token ' + key
self.client.get('/', HTTP_AUTHORIZATION=auth)
self.client.get('/auth', HTTP_AUTHORIZATION='Token %s' % key)

@override_settings(MIDDLEWARE=('tests.test_middleware.RequestPOSTMiddleware',))
def test_middleware_can_access_request_post_when_processing_response(self):
response = self.client.post('/post', {'foo': 'bar'})
assert response.status_code == 200

response = self.client.post('/post', {'foo': 'bar'}, format='json')
assert response.status_code == 200