Skip to content
This repository was archived by the owner on Jan 5, 2023. It is now read-only.

Revert #682 #748

Merged
merged 1 commit into from
Sep 6, 2022
Merged

Revert #682 #748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions ql/lib/semmle/go/frameworks/SQL.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,11 @@ module SQL {
// first argument to `squirrel.Expr`
fn.hasQualifiedName(sq, "Expr")
or
// first argument `pred`, `sql`, `from` to most methods of one of the `*Builder` classes
// first argument to the `Prefix`, `Suffix` or `Where` method of one of the `*Builder` classes
exists(string builder | builder.matches("%Builder") |
fn.(Method)
.hasQualifiedName(sq, builder,
[
"Prefix", "Column", "From", "JoinClause", "Join", "LeftJoin", "RightJoin",
"InnerJoin", "CrossJoin", "Where", "Having", "OrderByClause", "Suffix"
])
fn.(Method).hasQualifiedName(sq, builder, "Prefix") or
fn.(Method).hasQualifiedName(sq, builder, "Suffix") or
fn.(Method).hasQualifiedName(sq, builder, "Where")
)
) and
this = fn.getACall().getArgument(0) and
Expand Down
2 changes: 1 addition & 1 deletion ql/test/library-tests/semmle/go/frameworks/SQL/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module semmle.go.frameworks.SQL
go 1.13

require (
github.com/Masterminds/squirrel v1.5.2
github.com/Masterminds/squirrel v1.1.0
github.com/go-pg/pg v8.0.6+incompatible
github.com/go-pg/pg/v9 v9.1.3
github.com/go-sql-driver/mysql v1.6.0 // indirect
Expand Down
10 changes: 0 additions & 10 deletions ql/test/library-tests/semmle/go/frameworks/SQL/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,8 @@ func test(db *sql.DB, ctx context.Context) {
}

func squirrelTest(querypart string) {
squirrel.Select("*").From("users").Prefix(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").Column(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").From(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").JoinClause(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").Join(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").LeftJoin(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").RightJoin(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").InnerJoin(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").Where(squirrel.Expr(querypart)) // $ querystring=querypart
squirrel.Select("*").From("users").Where(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").Having(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").OrderByClause(querypart) // $ querystring=querypart
squirrel.Select("*").From("users").Suffix(querypart) // $ querystring=querypart
}

Expand Down
30 changes: 1 addition & 29 deletions ...est/library-tests/semmle/go/frameworks/SQL/vendor/github.com/Masterminds/squirrel/stub.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ql/test/query-tests/Security/CWE-089/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ module Security.CWE-089
go 1.14

require (
github.com/Masterminds/squirrel v1.5.2
github.com/Masterminds/squirrel v1.1.0
go.mongodb.org/mongo-driver v1.3.3
)
86 changes: 1 addition & 85 deletions ql/test/query-tests/Security/CWE-089/vendor/github.com/Masterminds/squirrel/stub.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ql/test/query-tests/Security/CWE-089/vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# github.com/Masterminds/squirrel v1.5.2
# github.com/Masterminds/squirrel v1.1.0
## explicit
github.com/Masterminds/squirrel
# go.mongodb.org/mongo-driver v1.3.3
Expand Down