Unverified Commit c3d0191f authored by John Chilton's avatar John Chilton Committed by GitHub
Browse files

Merge pull request #16585 from mvdbeek/dont_read_body_into_memory 

[23.0] Don't read request body into memory
parents 81a17055 92128ea4

lib/galaxy/app_unittest_utils/galaxy_mock.py

+1 −1
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ class MockTrans: 
        self.security = self.app.security

        self.history = history



        self.request: Any = Bunch(headers={}, body=None)

        self.request: Any = Bunch(headers={}, is_body_readable=False)

        self.response: Any = Bunch(headers={}, set_content_type=lambda i: None)



    def check_csrf_token(self, payload):

lib/galaxy/web/framework/decorators.py

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ def legacy_expose_api(func, to_json=True, user_required=True): 
        if user_required and trans.anonymous:

            error_message = "API Authentication Required for this request"

            return error

        if trans.request.body:

        if trans.request.is_body_readable:

            try:

                kwargs["payload"] = __extract_payload_from_request(trans, func, kwargs)

            except ValueError:
@@ -296,7 +296,7 @@ def expose_api(func, to_json=True, user_required=True, user_or_session_required= 
                    err_msg="API authentication or Galaxy session required for this request",

                )



        if trans.request.body:

        if trans.request.is_body_readable:

            try:

                kwargs["payload"] = __extract_payload_from_request(trans, func, kwargs)

            except ValueError: