Add some checks before removing directories #7829
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
jwilder
suggested changes
Jan 12, 2017
| @@ -305,6 +305,10 @@ func (e *StatementExecutor) executeDropContinuousQueryStatement(q *influxql.Drop | |||
| // It does not return an error if the database was not found on any of | |||
| // the nodes, or in the Meta store. | |||
| func (e *StatementExecutor) executeDropDatabaseStatement(stmt *influxql.DropDatabaseStatement) error { | |||
| if e.MetaClient.Database(stmt.Name) == nil { | |||
There was a problem hiding this comment.
This needs to be a no-op instead of returning an error for API compatibility.
There was a problem hiding this comment.
Fixed. The conditional won't change, though.
|
|
||
| dbi := e.MetaClient.Database(stmt.Database) | ||
| if dbi == nil { | ||
| return influxql.ErrDatabaseNotFound(stmt.Database) |
joelegasse
force-pushed
the
jl-deletepath
branch
2 times, most recently
from
f7b37a7 to
e5b972f
Compare
jwilder
approved these changes
Jan 12, 2017
Fixes #7822 This change first ensures that databases and retention policies exist before attempting to remove them from the Store. It also adds some checks in the `DeleteDatabase` and `DeleteRetentionPolicy` to ensure that maliciously named entries won't remove anything outside of the configured data directory.
This change adds some very basic name validation with the following
plain-english description: names must be non-zero sequence of printable
characters that do not contain slashes ('/' or '\') and are not equal to
either "." or "..".
The intent is that, since we currently just use database and retention
policy names directly as path elements, these rules will hopefully leave
us with names that should be at least close to valid directory names.
Ideally, we would restrict names even further or not use them as path
elements directly, but this should be a step towards the former without
restricting names "too much"
joelegasse
force-pushed
the
jl-deletepath
branch
from
e5b972f to
2db0250
Compare
3 tasks
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 #7822
This change first ensures that databases and retention policies exist
before attempting to remove them from the Store. It also adds some
checks in the
DeleteDatabaseandDeleteRetentionPolicyto ensurethat maliciously named entries won't remove anything outside of the
configured data directory.
This also adds some very basic name validation with the following
plain-english description: names must be non-zero sequence of printable
characters that do not contain slashes ('/' or '') and are not equal to
either "." or "..".
The intent is that, since we currently just use database and retention
policy names directly as path elements, these rules will hopefully leave
us with names that should be at least close to valid directory names.
Ideally, we would restrict names even further or not use them as path
elements directly, but this should be a step towards the former without
restricting names "too much"
Required for all non-trivial PRs