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.

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

Remove exception and validation for user/password with AccessTokenCallback #2549

Merged
merged 4 commits into from
Nov 29, 2024
Merged

Remove exception and validation for user/password with AccessTokenCallback #2549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a83a57
Removed the if statement, that throws exception R_AccessTokenCallback…
Ananya2 Nov 27, 2024
1358f94
Updated testDSPooledConnectionAccessTokenCallbackClassExceptions test…
Ananya2 Nov 27, 2024
df589e1
Updated testDSPooledConnectionAccessTokenCallbackClassExceptions test…
Ananya2 Nov 28, 2024
11866cb
Added import statement.
Ananya2 Nov 28, 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
7 changes: 0 additions & 7 deletions src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2802,13 +2802,6 @@ Connection connectInternal(Properties propsIn,
&& !activeConnectionProperties
.getProperty(SQLServerDriverStringProperty.ACCESS_TOKEN_CALLBACK_CLASS.toString())
.isEmpty();
if ((null != accessTokenCallback || hasAccessTokenCallbackClass) && (!activeConnectionProperties
.getProperty(SQLServerDriverStringProperty.USER.toString()).isEmpty()
|| !activeConnectionProperties.getProperty(SQLServerDriverStringProperty.PASSWORD.toString())
.isEmpty())) {
throw new SQLServerException(
SQLServerException.getErrString("R_AccessTokenCallbackWithUserPassword"), null);
}

sPropKey = SQLServerDriverStringProperty.ACCESS_TOKEN_CALLBACK_CLASS.toString();
sPropValue = activeConnectionProperties.getProperty(sPropKey);
Expand Down
23 changes: 6 additions & 17 deletions src/test/java/com/microsoft/sqlserver/jdbc/fedauth/PooledConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import java.lang.reflect.Field;
import java.sql.Connection;
Expand Down Expand Up @@ -435,27 +436,15 @@ public void testDSPooledConnectionAccessTokenCallbackClassExceptions() throws Ex

// User/password is not required for access token callback
AbstractTest.updateDataSource(accessTokenCallbackConnectionString, ds);

ds.setAccessTokenCallbackClass(AccessTokenCallbackClass.class.getName());
ds.setUser("user");
SQLServerPooledConnection pc;

// Should fail with user set
try {
pc = (SQLServerPooledConnection) ds.getPooledConnection();
fail(TestResource.getResource("R_expectedFailPassed"));
} catch (SQLServerException e) {
assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_AccessTokenCallbackWithUserPassword")));
}

ds.setUser("");
ds.setPassword(UUID.randomUUID().toString());
SQLServerPooledConnection pc;

// Should fail with password set
try {
pc = (SQLServerPooledConnection) ds.getPooledConnection();
fail(TestResource.getResource("R_expectedFailPassed"));
} catch (SQLServerException e) {
assertTrue(e.getMessage().matches(TestUtils.formatErrorMsg("R_AccessTokenCallbackWithUserPassword")));
pc = (SQLServerPooledConnection) ds.getPooledConnection();
try (Connection conn1 = pc.getConnection()) {
assertNotNull(conn1);
Ananya2 marked this conversation as resolved.
Show resolved Hide resolved
}

// Should fail with invalid accessTokenCallbackClass value
Expand Down