Skip to content

Always encrypted unicode data corruption guard #2289

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

Draft
wants to merge 13 commits into
base: main
Choose a base branch
from
Draft

Always encrypted unicode data corruption guard #2289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c309aae
Initial changes
tkyc Jan 4, 2024
3af81f3
AE unicode data corruption guard
tkyc Jan 6, 2024
4b0f854
Updated test testAddbatch2AEOnConnection
tkyc Jan 8, 2024
84f8012
Initial changes
tkyc Jan 4, 2024
dbb883f
AE unicode data corruption guard
tkyc Jan 6, 2024
105b7a0
Updated test testAddbatch2AEOnConnection
tkyc Jan 8, 2024
663846d
Additional test updates for SSPAU=false
tkyc Jan 10, 2024
90578df
AE null dtv jdbctypesetbyuser fix
tkyc Jan 10, 2024
58cb7b4
Merge branch 'ae-data-corruption' of https://github.com/microsoft/mss…
tkyc Jan 10, 2024
f7fdc56
Review changes
tkyc Jan 10, 2024
89f14c2
Merge branch 'ae-data-corruption' of https://github.com/microsoft/mss…
tkyc Jan 10, 2024
7a1f604
Create login creds for new tests
tkyc Jan 15, 2024
98ec0d3
Additional sspau test update
tkyc Jan 15, 2024
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
Prev Previous commit
Next Next commit
Review changes
  • Loading branch information
@tkyc
tkyc committed Jan 10, 2024
commit f7fdc56481e794450da01588bda71283d07191ff
4 changes: 2 additions & 2 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -870,11 +870,11 @@ protected static void populateBinaryNullCase() throws SQLException {
* @param charValues
* @throws SQLException
*/
protected static void populateCharNormalCase(String[] charValues, boolean sendStringParametersAsUnicode) throws SQLException {
protected static void populateCharNormalCase(String[] charValues) throws SQLException {
String sql = "insert into " + CHAR_TABLE_AE + " values( " + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?,"
+ "?,?,?," + "?,?,?," + "?,?,?," + "?,?,?" + ")";

String connectionString = TestUtils.addOrOverrideProperty(AETestConnectionString, "sendStringParametersAsUnicode", Boolean.toString(sendStringParametersAsUnicode));
String connectionString = TestUtils.addOrOverrideProperty(AETestConnectionString, "sendStringParametersAsUnicode", Boolean.toString(false));
try (SQLServerConnection con = (SQLServerConnection) PrepUtil.getConnection(connectionString, AEInfo);
SQLServerPreparedStatement pstmt = (SQLServerPreparedStatement) TestUtils.getPreparedStmt(con, sql,
stmtColEncSetting)) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public static void initValues() throws Exception {
createTable(BINARY_TABLE_AE, cekJks, binaryTable);

createDateTableCallableStatement(cekJks);
populateCharNormalCase(charValues, false);
populateCharNormalCase(charValues);
populateNumericSetObject(numericValues);
populateBinaryNormalCase(byteValues);
populateDateNormalCase();
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/EnclaveTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void testAEv2Disabled(String serverName, String url, String protocol) thr
String[] values = createCharValues(false);
TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
createTable(CHAR_TABLE_AE, cekJks, charTable);
populateCharNormalCase(values, false);
populateCharNormalCase(values);
testAlterColumnEncryption(stmt, CHAR_TABLE_AE, charTable, cekJks);
fail(TestResource.getResource("R_expectedExceptionNotThrown"));
} catch (Throwable e) {
Expand Down Expand Up @@ -346,7 +346,7 @@ public void testChar(String serverName, String url, String protocol) throws Exce
SQLServerStatement stmt = (SQLServerStatement) con.createStatement()) {
TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
createTable(CHAR_TABLE_AE, cekJks, charTable);
populateCharNormalCase(createCharValues(false), false);
populateCharNormalCase(createCharValues(false));
testAlterColumnEncryption(stmt, CHAR_TABLE_AE, charTable, cekJks);
}
}
Expand All @@ -363,7 +363,7 @@ public void testCharAkv(String serverName, String url, String protocol) throws E
SQLServerStatement stmt = (SQLServerStatement) con.createStatement()) {
TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
createTable(CHAR_TABLE_AE, cekAkv, charTable);
populateCharNormalCase(createCharValues(false), false);
populateCharNormalCase(createCharValues(false));
testAlterColumnEncryption(stmt, CHAR_TABLE_AE, charTable, cekAkv);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/JDBCEncryptionDecryptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ void testChars(SQLServerStatement stmt, String cekName, String[][] table, String

switch (testCase) {
case NORMAL:
populateCharNormalCase(values, false);
populateCharNormalCase(values);
break;
case SETOBJECT:
populateCharSetObject(values);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ private void testCharAkv(String connStr) throws SQLException {
TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
createTable(CHAR_TABLE_AE, cekAkv, charTable);
String[] values = createCharValues(false);
populateCharNormalCase(values, false);
populateCharNormalCase(values);

try (ResultSet rs = (stmt == null) ? pstmt.executeQuery() : stmt.executeQuery(sql)) {
int numberOfColumns = rs.getMetaData().getColumnCount();
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/ParameterMetaDataCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ public void testParameterMetaDataCacheTrim() throws Exception {
createTable(CHAR_TABLE_AE, cekAkv, charTable);
createTable(NUMERIC_TABLE_AE, cekAkv, numericTable);

populateCharNormalCase(charValues, false);
populateCharNormalCase(charValues);
populateNumeric(numericValues);
populateCharNormalCase(charValues, false);
populateCharNormalCase(charValues);
}
}

Expand All @@ -144,17 +144,17 @@ public void testRetryWithSecureCache() throws Exception {
String[] values = createCharValues(false);
TestUtils.dropTableIfExists(CHAR_TABLE_AE, stmt);
createTable(CHAR_TABLE_AE, cekAkv, charTable);
populateCharNormalCase(values, false);
populateCharNormalCase(values);
if (TestUtils.doesServerSupportEnclaveRetry(con)) {
testAlterColumnEncryption((SQLServerStatement) stmt, CHAR_TABLE_AE, charTable, cekAkv);
}
populateCharNormalCase(values, false);
populateCharNormalCase(values);
}
}

private long timedCharUpdate(String[] values) throws SQLException {
long timer = System.currentTimeMillis();
populateCharNormalCase(values, false);
populateCharNormalCase(values);
return System.currentTimeMillis() - timer;
}

Expand Down