-
Notifications
You must be signed in to change notification settings - Fork 1.9k
fix(trino): coerce LIMIT before SQL interpolation #2626
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+60
−0
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| """Trino query must coerce LIMIT before SQL interpolation.""" | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| from unittest.mock import MagicMock, patch | ||
|
|
||
| import pytest | ||
|
|
||
| from wren.connector import trino as trino_mod | ||
|
|
||
|
|
||
| def _connector(): | ||
| c = object.__new__(trino_mod.TrinoConnector) | ||
| c.connection = MagicMock() | ||
| c._closed = False | ||
| return c | ||
|
|
||
|
|
||
| def test_reject_negative_limit(): | ||
| c = _connector() | ||
| with pytest.raises(ValueError, match="non-negative"): | ||
| c.query("SELECT 1", limit=-1) | ||
|
|
||
|
|
||
| def test_reject_injection_string(): | ||
| c = _connector() | ||
| with pytest.raises(ValueError): | ||
| c.query("SELECT 1", limit="1; DROP TABLE t") | ||
|
|
||
|
|
||
| def test_numeric_string_limit_interpolated(): | ||
| c = _connector() | ||
| cursor = MagicMock() | ||
| c.connection.cursor.return_value = cursor | ||
| with patch.object(trino_mod, "_import_trino") as imp, patch.object( | ||
| trino_mod, "_build_trino_arrow_table", return_value="tbl" | ||
| ): | ||
| trino_pkg = MagicMock() | ||
| trino_pkg.exceptions.TrinoQueryError = type("TrinoQueryError", (Exception,), {}) | ||
| imp.return_value = trino_pkg | ||
| out = c.query("SELECT 1", limit="4") | ||
| assert out == "tbl" | ||
| executed = cursor.execute.call_args[0][0] | ||
| assert "LIMIT 4" in executed | ||
| assert "DROP" not in executed |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Reject fractional negative limits before coercion.
int(-0.5)becomes0, so the check at Line 468 accepts an originally negative limit and executesLIMIT 0. Validate the original numeric value before truncation, or reject non-integral numeric inputs; add a regression test forlimit=-0.5.🤖 Prompt for AI Agents