Rust: Update SqlxQuery, SqlxExecute to use getCanonicalPath #19802
+20
−24
Conversation
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
|
I managed to make some progress; will continue investigations tomorrow. |
|
Just merged |
aibaars
reviewed
Jul 11, 2025
| "crate::query::query", "crate::query_as::query_as", "crate::query_with::query_with", | ||
| "crate::query_as_with::query_as_with", "crate::query_scalar::query_scalar", | ||
| "crate::query_scalar_with::query_scalar_with", "crate::raw_sql::raw_sql" | ||
| "sqlx_core::query::query", "sqlx_core::query_as::query_as", |
There was a problem hiding this comment.
This QLL file could be replaced by models as data, right?
| @@ -33,7 +36,8 @@ private class SqlxExecute extends SqlExecution::Range { | |||
|
|
|||
| SqlxExecute() { | |||
| this.asExpr().getExpr() = call and | |||
| call.(Resolvable).getResolvedPath() = "crate::executor::Executor::execute" | |||
| call.getStaticTarget().(Addressable).getCanonicalPath() = | |||
| "sqlx_core::executor::Executor::execute" | |||
There was a problem hiding this comment.
I guess this should be something like
Suggested change
| "sqlx_core::executor::Executor::execute" | |
| "<sqlx_core::executor::Executor>::execute" |
hvitved
reviewed
Jul 11, 2025
| let _ = conn.execute(safe_query_2.as_str()).await?; // $ sql-sink | ||
| let _ = conn.execute(safe_query_3.as_str()).await?; // $ sql-sink | ||
| let _ = conn.execute(unsafe_query_1.as_str()).await?; // $ sql-sink Alert[rust/sql-injection]=args1 | ||
| let _ = conn.execute(safe_query_1.as_str()).await?; // $ MISSING: sql-sink |
There was a problem hiding this comment.
While we are able to infer that conn has type PoolConnection, we cannot currently infer that is in fact has type PoolConnection<MySql> (#19954 or similar is needed for that).
Once we are able to do that, we need implicit dereferencing via
impl<DB: Database> Deref for PoolConnection<DB> {
type Target = DB::Connection;
fn deref(&self) -> &Self::Target {
&self.live.as_ref().expect(EXPECT_MSG).raw
}
}
to get to the type &MySqlConnection, and then via impl<'c> Executor<'c> for &'c mut MySqlConnection we can find execute.
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.
Update
SqlxQuery,SqlxExecuteto usegetCanonicalPathrather thangetResolvedPath.At present we lose some results, presumably for similar reasons as we lose similar results in #19268 . I'd prefer we address the issue (and do a DCA run) before merging this.
@hvitved