Stable8.1 backport sharingcheckmiddleware fixes #19638
Merged
Conversation
This file contains 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
If the sharing API setting is disabled that sharing check middle ware should block the request. Thus making link shares unavailable. Fixes #18970 * Unit test added * Unit tests updated
…Exception The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened. Helps to debug cases such as #19465
Since for external shares there is no need for link shares to be enabled we should check which controller is actually being called. This makes sure that in all cases we verify that the files_sharing app is enabled. But only for the share controller (public shares) we check if the API is enabled and if links are enabled. TODO: add checks for federated sharing as well
Added new annotations for the externalsharescontroller class * @NoOutgoingFederatedSharingRequired * @NoIncomingFederatedSharingRequired By default both are required for all functions in the externalSharesController. A proper exception is thrown and then a 405 is returned instead of the default error page. Since it is only an API endpoint this makes more sense. Unit tests added and updated
👍 from my side @nickvergessen @LukasReschke Can you review this please? |
|
👍 But what's up with the OCS API integration tests ci ? |
|
@DeepDiver1975 Do the ocs api integration tests work on stable8.1? |
|
maybe @SergioBertolinSG knows ? |
|
Looking at #19784 which contains changes unrelated to OCS also have it fail on 8.1, so the tests for OCS API probably don't work against 8.1. |
|
@MorrisJobke @PVince81 intergration tests stuff was only added in 8.2 so the files are missing here ;) |
|
Okay, then this is good to go |
|
@karlitschek can you approve this backport(s)? |
|
yes. please backport |
rullzer
added a commit
that referenced
this pull request
Oct 16, 2015
…ckmiddleware_fixes Stable8.1 backport sharingcheckmiddleware fixes
It is only prepared for master at the moment. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
As reqeusted in #19487 (comment)
Basically backports 3 PR's that solve issues we had in the sharing middleware. The request was only for the last PR but without the whole bunch things would get kind of messy. And since all 3 PR's are pretty clean this seemed like the best solution and improved the sharing middleware for 8.1.
In order:
Of course the introduced tests are backported as well.
@karlitschek please confirm backport
@MorrisJobke @michaelstingl: please have a look and test.