[stable13] Don't perform CSRF check on OCS routes with Bearer auth #8099
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MorrisJobke
approved these changes
Jan 29, 2018
Member
MorrisJobke
left a comment
MorrisJobke
left a comment
There was a problem hiding this comment.
Member
Author
|
Review time! we can merge 13.0.1 stuff! |
| * @param bool $exception | ||
| */ | ||
| public function testCsrfOcsController(Controller $controller, $hasOcsApiHeader, $exception) { | ||
| public function testCsrfOcsController(Controller $controller, bool $hasOcsApiHeader, bool $hasBearerAuth, bool $exception) { |
Member
There was a problem hiding this comment.
No, this breaks because stable13 needs to be testable on 5.6
Member
There was a problem hiding this comment.
Argument 2 passed to Test\AppFramework\Middleware\Security\SecurityMiddlewareTest::testCsrfOcsController() must be an instance of Test\AppFramework\Middleware\Security\bool, boolean given
| ->method('getHeader') | ||
| ->with('OCS-APIREQUEST') | ||
| ->willReturn($hasOcsApiHeader ? 'true' : null); | ||
| ->will(self::returnCallback(function ($header) use ($hasOcsApiHeader, $hasBearerAuth) { |
Member
Author
There was a problem hiding this comment.
That doesn't have a default I think
Codecov Report
@@ Coverage Diff @@
## stable13 #8099 +/- ##
==============================================
+ Coverage 51.23% 51.23% +<.01%
- Complexity 24990 24991 +1
==============================================
Files 1608 1608
Lines 95106 95109 +3
Branches 1376 1376
==============================================
+ Hits 48730 48733 +3
Misses 46376 46376
|
Fixes #5694 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Member
Author
|
Relevant tests pass |
nickvergessen
approved these changes
Feb 28, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #7873