Handle ClickHouse queries with other statements being invalid #58
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 original query is
```
insert into cats (name) values (' + var + ');
```
And the user input is
```
foo'||version());
```
Then the query will be
```sql
insert into cats_table (id, petname) values (null, 'foo'||version());');
```
Which isn't a valid query. The second statement is `');`
Clickhouse seems to ignore this because it does not allow multiple
statements. It will still execute the first part so we need to detect
this.
hansott
changed the title
| } | ||
| } | ||
|
|
||
| // If the query is invalid, we can't determine if it's an injection | ||
| return false; | ||
| } | ||
|
|
||
| // Remove leading and trailing spaces from userinput : | ||
| let trimmed_userinput = userinput.trim_matches(SPACE_CHAR); |
There was a problem hiding this comment.
trimmed userinput is now only used for length check? everything else moved to replace_user_input_with_safe_str
| if dialect == 3 && has_multiple_statements(query, dialect) { | ||
| // Clickhouse does not support multiple statements | ||
| // The first statement will still be executed if the other statements are invalid | ||
| // We'll assume the original query is valid |
There was a problem hiding this comment.
This I still don't fully understand, where do we make the assumption?
Codecov ReportAttention: Patch coverage is
📢 Thoughts on this report? Let us know! |
| return true; | ||
| } | ||
|
|
||
| matches!(tokens.last(), Some(Token::SemiColon)) && has_semicolon |
There was a problem hiding this comment.
has_semicolon is not necessary
hansott
commented
Jan 20, 2025
| } | ||
|
|
||
| fn is_single_statement(tokens: &Vec<Token>) -> bool { | ||
| let has_semicolon = tokens.iter().any(|x| matches!(x, Token::SemiColon)); |
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.
If the original query is
And the user input is
Then the query will be
Which isn't a valid query. The second statement is
');Clickhouse seems to ignore this because it does not allow multiple statements. It will still execute the first part so we need to detect this.