Fix RemoveRelativePathComponents (again) and fix mod security with paths starting with ".." #4919
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
ShadowNinja
added
@ Script API
Blocker
ShadowNinja
changed the title
sfan5
previously requested changes
Dec 17, 2016
| } | ||
| if (pos > 0) { | ||
| pos++; | ||
| } |
There was a problem hiding this comment.
The code style nowhere mandates that braces should be removed. Both placing braces and not placing them is fine.
|
Does this replace #4849 ? If there's a conflict which should be merged first? |
|
@paramat No, those two PRs fix two seperate issues with mod security. |
This used to return "/foo" for "../foo" when it should return the enpty string (i.e., error removing all relative components).
Trying to resolve a path with RemoveRelativePathComponents that can't be resolved without leaving leading parent components (e.g. "../worlds/foo" or "bar/../../worlds/foo") will fail. To work around this, we leave the relative components and simply remove the trailing components one at a time, and bail out when we find a parent component. This will still fail for paths like "worlds/foo/noexist/../auth.txt" (the path before the last parent component must not exist), but this is fine since you won't be able to open a file with a path like that anyways (the O.S. will determine that the path doesn't exist. Try `cat /a/../etc/passwd`).
ShadowNinja
force-pushed
the
fix-rrpc
branch
from
175f103
to
aee24c8
Compare
|
@sfan5: Done. |
sfan5
approved these changes
Dec 19, 2016
|
Applying: Fix RemoveRelatvePathComponents When attempting to merge after #4849, so i will merge #4849 only for now. |
|
#4849 merged. |
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.
Fixes #4909.
string (i.e., error removing all relative components). Also, "./foo" should be resolved to "foo".
cat /a/../etc/passwd).