Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5e9026d
unified: Copy Swift SQL injection query and tests unchanged
geoffw0 Oct 28, 2026
14f7a14
unified: Collect original Swift SQL injection configuration
geoffw0 Oct 28, 2026
53152a3
unified: Port SQL injection query with annotated test baseline
geoffw0 Oct 28, 2026
8ce85ea
unified: Model unambiguous Swift SQL injection sinks
geoffw0 Oct 28, 2026
9f930b0
unified: Recognize SQL sinks by resolved parameter names
geoffw0 Oct 28, 2026
9a3c558
unified: Resolve SQLite run and scalar SQL sinks precisely
geoffw0 Oct 28, 2026
92ebcc0
unified: Clarify SQL injection prevention guidance
geoffw0 Oct 28, 2026
42158ff
unified: move the new test cases into organization of existing test c…
geoffw0 Oct 28, 2026
c0afa1f
unified: Add / edit doc and comments.
geoffw0 Oct 28, 2026
b1a43f7
unified: Add a few more test cases around parameter names and call ta…
geoffw0 Oct 28, 2026
2bcd3ab
unified: Clean up heuristicSink predicate.
geoffw0 Oct 28, 2026
5921954
unified: Undo the .qhelp change. I'm not convinced it's meaningfully…
geoffw0 Oct 28, 2026
c38ed2a
unified: Remove database-store sinks that duplicate sql-sinks (the da…
geoffw0 Oct 29, 2026
b7b57b2
unified: Add a couple more test cases.
geoffw0 Nov 3, 2026
8706d4f
unified: Implement Copilot suggestion.
geoffw0 Nov 3, 2026
b1fbc3c
unified: Fix bad join
asgerf Nov 11, 2026
cdf1e6e
Merge branch 'main' into unifiedsqlinjection
geoffw0 Nov 18, 2026
51d146a
Unified: Consequences of losing the model changes in the merge.
geoffw0 Nov 18, 2026
fc0eaef
Unified: Move all database related models into a separate model file.
geoffw0 Nov 18, 2026
e0fd29a
Unified: Convert database-store models to sql-injection where appropr…
geoffw0 Nov 18, 2026
f8f9cda
Unified: Add missing models (again).
geoffw0 Nov 18, 2026
aaccb37
Unified: Fix bug in one of the models.
geoffw0 Nov 18, 2026
b8988d4
Merge branch 'main' into unifiedsqlinjection
geoffw0 Nov 18, 2026
9d03ebf
Unified: Accept damage after merge.
geoffw0 Nov 18, 2026
c12d0ed
Unified: Fix models after merge (again).
geoffw0 Nov 18, 2026
e0f0b00
Unified: Fix some mistranslated models.
geoffw0 Nov 18, 2026
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
131 changes: 131 additions & 0 deletions unified/ql/lib/ext/database.model.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
{
"extensions": [
{
"addsTo": {
"pack": "codeql/unified-all",
"extensible": "legacySinkModel"
},
"data": [
// namespace, type, subtypes, name, signature, ext, input, kind, provenance
// SQLite.swift
["", "Connection", true, "key(_:db:)", "", "", "Argument[0]", "encryption-key", "manual"],
["", "Connection", true, "keyAndMigrate(_:db:)", "", "", "Argument[0]", "encryption-key", "manual"],
["", "Connection", true, "rekey(_:db:)", "", "", "Argument[0]", "encryption-key", "manual"],
["", "Connection", true, "sqlcipher_export(_:key:)", "", "", "Argument[key:]", "encryption-key", "manual"],
["", "Connection", true, "execute(_:)", "", "", "Argument[0]", "sql-injection", "manual"],
["", "Connection", true, "prepare(_:_:)", "", "", "Argument[0]", "sql-injection", "manual"],
["", "Connection", true, "prepare(_:_:)", "", "", "Argument[1]", "database-store", "manual"],
["", "Connection", true, "run(_:_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "Connection", true, "run(_:_:)", "", "", "Argument[1]", "database-store", "manual"],
["", "Connection", true, "scalar(_:_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "Connection", true, "scalar(_:_:)", "", "", "Argument[1]", "database-store", "manual"],
["", "Connection", true, "init(_:readonly:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "Statement", true, "init(_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "Statement", true, "bind(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "Statement", true, "run(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "Statement", true, "scalar(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "insert(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "update(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "insert(_:_:)", "", "", "Argument[0,1]", "database-store", "manual"],
["", "QueryType", true, "insert(or:_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "insertMany(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "insertMany(or:_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "update(_:_:)", "", "", "Argument[0,1]", "database-store", "manual"],
["", "QueryType", true, "update(or:_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "upsert(_:onConflictOf:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "upsert(_:onConflictOf:setValues:)", "", "", "Argument[0]", "database-store", "manual"],
["", "QueryType", true, "upsert(_:onConflictOf:setValues:)", "", "", "Argument[setValues:]", "database-store", "manual"],
["", "Connection.Location", true, "uri(_:parameters:)", "", "", "Argument[0]", "path-injection", "manual"],
// GRDB
["", "Database", true, "changePassphrase(_:)", "", "", "Argument[0]", "encryption-key", "manual"],
["", "Database", true, "usePassphrase(_:)", "", "", "Argument[0]", "encryption-key", "manual"],
["", "Database", true, "allStatements(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Database", true, "execute(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Database", true, "init(path:description:configuration:)", "", "", "Argument[path:]", "path-injection", "manual"],
["", "SQL", true, "append(sql:arguments:)", "", "", "Argument[sql:]", "sql-injection", "manual"],
["", "SQL", true, "append(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "SQL", true, "init(sql:arguments:)", "", "", "Argument[sql:]", "sql-injection", "manual"],
["", "SQL", true, "init(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "SQL", true, "init(stringLiteral:)", "", "", "Argument[stringLiteral:]", "sql-injection", "manual"],
["", "SQL", true, "init(unicodeScalarLiteral:)", "", "", "Argument[unicodeScalarLiteral:]", "sql-injection", "manual"],
["", "SQL", true, "init(extendedGraphemeClusterLiteral:)", "", "", "Argument[extendedGraphemeClusterLiteral:]", "sql-injection", "manual"],
["", "SQL", true, "init(stringInterpolation:)", "", "", "Argument[stringInterpolation:]", "sql-injection", "manual"],
["", "StatementCache", true, "statement(_:)", "", "", "Argument[0]", "sql-injection", "manual"],
["", "SQLRequest", true, "init(sql:arguments:adapter:cached:)", "", "", "Argument[sql:]", "sql-injection", "manual"],
["", "SQLRequest", true, "init(sql:arguments:adapter:cached:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "SQLRequest", true, "init(stringLiteral:)", "", "", "Argument[stringLiteral:]", "sql-injection", "manual"],
["", "SQLRequest", true, "init(unicodeScalarLiteral:)", "", "", "Argument[unicodeScalarLiteral:]", "sql-injection", "manual"],
["", "SQLRequest", true, "init(extendedGraphemeClusterLiteral:)", "", "", "Argument[extendedGraphemeClusterLiteral:]", "sql-injection", "manual"],
["", "SQLRequest", true, "init(stringInterpolation:)", "", "", "Argument[stringInterpolation:]", "sql-injection", "manual"],
["", "SQLStatementCursor", true, "init(database:sql:arguments:prepFlags:)", "", "", "Argument[sql:]", "sql-injection", "manual"],
["", "SQLStatementCursor", true, "init(database:sql:arguments:prepFlags:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Row", true, "fetchAll(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Row", true, "fetchCursor(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Row", true, "fetchOne(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Row", true, "fetchSet(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "TableRecord", true, "filter(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "TableRecord", true, "order(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "TableRecord", true, "select(sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "TableRecord", true, "select(sql:arguments:as:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "DatabaseValueConvertible", true, "fetchAll(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "DatabaseValueConvertible", true, "fetchCursor(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "DatabaseValueConvertible", true, "fetchOne(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "DatabaseValueConvertible", true, "fetchSet(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchAll(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchCursor(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchOne(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchSet(_:sql:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchAll(_:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchCursor(_:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchOne(_:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "FetchableRecord", true, "fetchSet(_:arguments:adapter:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Statement", true, "execute(arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "Statement", true, "setArguments(_:)", "", "", "Argument[0]", "database-store", "manual"],
["", "CommonTableExpression", true, "init(recursive:named:columns:sql:arguments:)", "", "", "Argument[arguments:]", "database-store", "manual"],
["", "DatabasePool", true, "init(path:configuration:)", "", "", "Argument[path:]", "path-injection", "manual"],
["", "DatabaseQueue", true, "init(path:configuration:)", "", "", "Argument[path:]", "path-injection", "manual"],
["", "DatabaseSnapshotPool", true, "init(path:configuration:)", "", "", "Argument[path:]", "path-injection", "manual"],
["", "SerializedDatabase", true, "init(path:configuration:defaultLabel:purpose:)", "", "", "Argument[path:]", "path-injection", "manual"],
// sqlite3
["", "", false, "sqlite3_key(_:_:_:)", "", "", "Argument[1]", "encryption-key", "manual"],
["", "", false, "sqlite3_key_v2(_:_:_:_:)", "", "", "Argument[2]", "encryption-key", "manual"],
["", "", false, "sqlite3_rekey(_:_:_:)", "", "", "Argument[1]", "encryption-key", "manual"],
["", "", false, "sqlite3_rekey_v2(_:_:_:_:)", "", "", "Argument[2]", "encryption-key", "manual"],
["", "", false, "sqlite3_bind_blob(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_blob64(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_double(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_int(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_int64(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_pointer(_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_text(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_text16(_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_text64(_:_:_:_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_bind_value(_:_:_:)", "", "", "Argument[2]", "database-store", "manual"],
["", "", false, "sqlite3_exec(_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_prepare(_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_prepare16(_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_prepare16_v2(_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_prepare16_v3(_:_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_prepare_v2(_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_prepare_v3(_:_:_:_:_:_:)", "", "", "Argument[1]", "sql-injection", "manual"],
["", "", false, "sqlite3_database_file_object(_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_filename_database(_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_filename_journal(_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_filename_wal(_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_free_filename(_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_open(_:_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_open16(_:_:)", "", "", "Argument[0]", "path-injection", "manual"],
["", "", false, "sqlite3_open_v2(_:_:_:_:)", "", "", "Argument[0]", "path-injection", "manual"],
// Realm
["", "Realm.Configuration", true, "encryptionKey", "", "", "PostUpdate", "encryption-key", "manual"],
["", "Realm.Configuration", true, "init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:)", "", "", "Argument[fileURL:]", "path-injection", "manual"],
["", "Realm.Configuration", true, "init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:)", "", "", "Argument[encryptionKey:]", "encryption-key", "manual"],
["", "Realm.Configuration", true, "init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:seedFilePath:)", "", "", "Argument[fileURL:]", "path-injection", "manual"],
["", "Realm.Configuration", true, "init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:seedFilePath:)", "", "", "Argument[encryptionKey:]", "encryption-key", "manual"],
["", "Realm.Configuration", true, "init(fileURL:inMemoryIdentifier:syncConfiguration:encryptionKey:readOnly:schemaVersion:migrationBlock:deleteRealmIfMigrationNeeded:shouldCompactOnLaunch:objectTypes:seedFilePath:)", "", "", "Argument[seedFilePath:]", "path-injection", "manual"],
["", "Realm.Configuration", true, "fileURL", "", "", "PostUpdate", "path-injection", "manual"],
["", "Realm.Configuration", true, "seedFilePath", "", "", "PostUpdate", "path-injection", "manual"]
]
}
]
}
Loading
Loading