Skip to content

Allow unsafe raw SQL injection in PostgresQuery #258

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 16, 2022
Merged

Allow unsafe raw SQL injection in PostgresQuery #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13eec94
Allow unsafe raw SQL injection in PostgresQuery
fabianfett Mar 12, 2022
866837e
Merge branch 'main' into ff-allow-unsafe-raw-sql-injection
fabianfett Mar 15, 2022
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
5 changes: 5 additions & 0 deletions Sources/PostgresNIO/New/PostgresQuery.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ extension PostgresQuery {
try self.binds.append(value, context: context)
self.sql.append(contentsOf: "$\(self.binds.count)")
}

@inlinable
public mutating func appendInterpolation(unescaped interpolated: String) {
self.sql.append(contentsOf: interpolated)
}
}
}

Expand Down
44 changes: 28 additions & 16 deletions Tests/PostgresNIOTests/New/PostgresQueryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ import XCTest

final class PostgresQueryTests: XCTestCase {

func testStringInterpolationWithOptional() throws {
func testStringInterpolationWithOptional() {
let string = "Hello World"
let null: UUID? = nil
let uuid: UUID? = UUID()

let query: PostgresQuery = try """
var query: PostgresQuery?
XCTAssertNoThrow(query = try """
INSERT INTO foo (id, title, something) SET (\(uuid), \(string), \(null));
"""
)

XCTAssertEqual(query.sql, "INSERT INTO foo (id, title, something) SET ($1, $2, $3);")
XCTAssertEqual(query?.sql, "INSERT INTO foo (id, title, something) SET ($1, $2, $3);")

var expected = ByteBuffer()
expected.writeInteger(Int32(16))
Expand All @@ -27,22 +29,24 @@ final class PostgresQueryTests: XCTestCase {
expected.writeString(string)
expected.writeInteger(Int32(-1))

XCTAssertEqual(query.binds.bytes, expected)
XCTAssertEqual(query?.binds.bytes, expected)
}

func testStringInterpolationWithCustomJSONEncoder() throws {
func testStringInterpolationWithCustomJSONEncoder() {
struct Foo: Codable, PostgresCodable {
var helloWorld: String
}

let jsonEncoder = JSONEncoder()
jsonEncoder.keyEncodingStrategy = .convertToSnakeCase

let query: PostgresQuery = try """
var query: PostgresQuery?
XCTAssertNoThrow(query = try """
INSERT INTO test (foo) SET (\(Foo(helloWorld: "bar"), context: .init(jsonEncoder: jsonEncoder)));
"""
)

XCTAssertEqual(query.sql, "INSERT INTO test (foo) SET ($1);")
XCTAssertEqual(query?.sql, "INSERT INTO test (foo) SET ($1);")

let expectedJSON = #"{"hello_world":"bar"}"#

Expand All @@ -51,17 +55,10 @@ final class PostgresQueryTests: XCTestCase {
expected.writeInteger(UInt8(0x01))
expected.writeString(expectedJSON)

XCTAssertEqual(query.binds.bytes, expected)
XCTAssertEqual(query?.binds.bytes, expected)
}

func testAllowUsersToGenerateLotsOfRows() throws {
struct Foo: Codable, PostgresCodable {
var helloWorld: String
}

let jsonEncoder = JSONEncoder()
jsonEncoder.keyEncodingStrategy = .convertToSnakeCase

func testAllowUsersToGenerateLotsOfRows() {
let sql = "INSERT INTO test (id) SET (\((1...5).map({"$\($0)"}).joined(separator: ", ")));"

var query = PostgresQuery(unsafeSQL: sql, binds: .init(capacity: 5))
Expand All @@ -79,4 +76,19 @@ final class PostgresQueryTests: XCTestCase {

XCTAssertEqual(query.binds.bytes, expected)
}

func testUnescapedSQL() {
let tableName = UUID().uuidString.uppercased()
let value = 1

var query: PostgresQuery?
XCTAssertNoThrow(query = try "INSERT INTO \(unescaped: tableName) (id) SET (\(value));")
XCTAssertEqual(query?.sql, "INSERT INTO \(tableName) (id) SET ($1);")

var expected = ByteBuffer()
expected.writeInteger(UInt32(8))
expected.writeInteger(value)

XCTAssertEqual(query?.binds.bytes, expected)
}
}