Skip to content
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

YQ-3566 fix sql injection in create binding request #7984

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions ydb/core/fq/libs/common/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,24 @@ class TIssueDatabaseRemover {
TString DatabasePath;
};

void EscapeBackslashes(TString& value) {
SubstGlobal(value, "\\", "\\\\");
}

}

TString EscapeString(const TString& value,
const TString& enclosingSeq,
const TString& replaceWith) {
auto escapedValue = value;
EscapeBackslashes(escapedValue);
SubstGlobal(escapedValue, enclosingSeq, replaceWith);
return escapedValue;
}

TString EscapeString(const TString& value, char enclosingChar) {
auto escapedValue = value;
EscapeBackslashes(escapedValue);
SubstGlobal(escapedValue,
TString{enclosingChar},
TStringBuilder{} << '\\' << enclosingChar);
Expand Down
4 changes: 4 additions & 0 deletions ydb/core/fq/libs/common/util_ut.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,19 @@ Y_UNIT_TEST_SUITE(EscapingBasics) {
UNIT_ASSERT_VALUES_EQUAL(EscapeString("some_secret1", '"'), "some_secret1");
UNIT_ASSERT_VALUES_EQUAL(EscapeString("some_secret1", "}+{", "[*]"), "some_secret1");
UNIT_ASSERT_VALUES_EQUAL(EscapeString("some\"_\"secret1", '"'), "some\\\"_\\\"secret1");
UNIT_ASSERT_VALUES_EQUAL(EscapeString("some\"_\\\"secret1", '"'), "some\\\"_\\\\\\\"secret1");
UNIT_ASSERT_VALUES_EQUAL(EscapeString("some}+{_}+{secret1", "}+{", "[*]"), "some[*]_[*]secret1");
UNIT_ASSERT_VALUES_EQUAL(EscapeString("some}+{\\}+{secret1", "}+{", "[*]"), "some[*]\\\\[*]secret1");
}

Y_UNIT_TEST(EncloseAndEscapeStringShouldWork) {
UNIT_ASSERT_VALUES_EQUAL(EncloseAndEscapeString("some_secret1", '"'), "\"some_secret1\"");
UNIT_ASSERT_VALUES_EQUAL(EncloseAndEscapeString("some_secret1\nsome_secret2", "}+{", "[*]"), "}+{some_secret1\nsome_secret2}+{");

UNIT_ASSERT_VALUES_EQUAL(EncloseAndEscapeString("some\"_\"secret1", '"'), "\"some\\\"_\\\"secret1\"");
UNIT_ASSERT_VALUES_EQUAL(EncloseAndEscapeString("some\"_\\\"secret1", '"'), "\"some\\\"_\\\\\\\"secret1\"");
UNIT_ASSERT_VALUES_EQUAL(EncloseAndEscapeString("some_secret1}+{\n}+{some_secret2", "}+{", "[*]"), "}+{some_secret1[*]\n[*]some_secret2}+{");
UNIT_ASSERT_VALUES_EQUAL(EncloseAndEscapeString("some_secret1}+{\\}+{some_secret2", "}+{", "[*]"), "}+{some_secret1[*]\\\\[*]some_secret2}+{");
}
}

Expand Down
48 changes: 48 additions & 0 deletions ydb/tests/fq/s3/test_bindings_1.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,3 +277,51 @@ def test_raw_empty_schema_binding(self, kikimr, client, unique_prefix):
assert "Only one column in schema supported in raw format" in str(binding_response.issues), str(
binding_response.issues
)

@yq_all
@pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
def test_binding_with_backslash_in_location(self, s3, client, unique_prefix):
resource = boto3.resource(
"s3", endpoint_url=s3.s3_url, aws_access_key_id="key", aws_secret_access_key="secret_key"
)

bucket = resource.Bucket("backslash_bucket")
bucket.create(ACL='public-read')

s3_client = boto3.client(
"s3", endpoint_url=s3.s3_url, aws_access_key_id="key", aws_secret_access_key="secret_key"
)

data = R'''data
test'''
s3_client.put_object(Body=data, Bucket='backslash_bucket', Key='\\', ContentType='text/plain')

connection_response = client.create_storage_connection(unique_prefix + "backslash_bucket", "backslash_bucket")

data_type = ydb.Column(name="data", type=ydb.Type(type_id=ydb.Type.PrimitiveTypeId.UTF8))
storage_binding_name = unique_prefix + "binding_name"
client.create_object_storage_binding(
name=storage_binding_name,
path="\\",
format="csv_with_names",
connection_id=connection_response.result.connection_id,
columns=[data_type],
)

sql = fR'''
SELECT *
FROM bindings.{storage_binding_name};
'''

query_id = client.create_query(
"simple", sql, type=fq.QueryContent.QueryType.ANALYTICS, pg_syntax=True
).result.query_id
client.wait_query_status(query_id, fq.QueryMeta.COMPLETED)

data = client.get_result_data(query_id)
result_set = data.result.result_set
logging.debug(str(result_set))
assert len(result_set.columns) == 1
assert result_set.columns[0].name == "data"
assert len(result_set.rows) == 1
assert result_set.rows[0].items[0].text_value == "test"
Loading