Skip to content
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: 5 additions & 1 deletion duo-universal-sdk/src/main/java/com/duosecurity/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ public class Client {

private static final String USER_AGENT_VERSION = "1.3.3-SNAPSHOT";

private static final String CA_BUNDLE_VERSION = "1.0";

// **************************************************
// Fields
// **************************************************
Expand Down Expand Up @@ -373,7 +375,9 @@ public Client build() throws DuoException {
client.apiHost = apiHost;
client.redirectUri = redirectUri;
client.useDuoCodeAttribute = useDuoCodeAttribute;
client.userAgent = userAgent;
String caPinningStatus = caPinningDisabled ? "disabled" : "enabled";
client.userAgent = format("%s ca_bundle/%s (ca_pinning=%s)",
userAgent, CA_BUNDLE_VERSION, caPinningStatus);
client.duoConnector = new DuoConnector(apiHost, proxyHost, proxyPort,
caPinningDisabled ? null : caCerts);

Expand Down
55 changes: 54 additions & 1 deletion duo-universal-sdk/src/test/java/com/duosecurity/ClientTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,60 @@ void custom_useragent() throws DuoException {
ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
verify(client.duoConnector).exchangeAuthorizationCodeFor2FAResult(stringCaptor.capture(), anyString(), anyString(), anyString(), anyString(), anyString());
String sentUserAgent = stringCaptor.getValue();
assertTrue(sentUserAgent.startsWith("duo_universal_java") && sentUserAgent.endsWith(appendedUserAgent));
assertTrue(sentUserAgent.startsWith("duo_universal_java") && sentUserAgent.contains(appendedUserAgent));
}

@Test
void userAgent_includes_ca_bundle_version() throws DuoException {
Client client = new Client.Builder(CLIENT_ID, CLIENT_SECRET, API_HOST, HTTPS_REDIRECT_URI).build();
client.duoConnector = Mockito.mock(DuoConnector.class);

try {
client.exchangeAuthorizationCodeFor2FAResult("duo_code", Mockito.mock(TokenValidator.class));
} catch (Exception e) {
// ignored
}

ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
verify(client.duoConnector).exchangeAuthorizationCodeFor2FAResult(stringCaptor.capture(), anyString(), anyString(), anyString(), anyString(), anyString());
String sentUserAgent = stringCaptor.getValue();
assertTrue(sentUserAgent.contains("ca_bundle/1.0"));
}

@Test
void userAgent_includes_ca_pinning_enabled() throws DuoException {
Client client = new Client.Builder(CLIENT_ID, CLIENT_SECRET, API_HOST, HTTPS_REDIRECT_URI).build();
client.duoConnector = Mockito.mock(DuoConnector.class);

try {
client.exchangeAuthorizationCodeFor2FAResult("duo_code", Mockito.mock(TokenValidator.class));
} catch (Exception e) {
// ignored
}

ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
verify(client.duoConnector).exchangeAuthorizationCodeFor2FAResult(stringCaptor.capture(), anyString(), anyString(), anyString(), anyString(), anyString());
String sentUserAgent = stringCaptor.getValue();
assertTrue(sentUserAgent.contains("(ca_pinning=enabled)"));
}

@Test
void userAgent_includes_ca_pinning_disabled() throws DuoException {
Client client = new Client.Builder(CLIENT_ID, CLIENT_SECRET, API_HOST, HTTPS_REDIRECT_URI)
.disableCaPinning()
.build();
client.duoConnector = Mockito.mock(DuoConnector.class);

try {
client.exchangeAuthorizationCodeFor2FAResult("duo_code", Mockito.mock(TokenValidator.class));
} catch (Exception e) {
// ignored
}

ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
verify(client.duoConnector).exchangeAuthorizationCodeFor2FAResult(stringCaptor.capture(), anyString(), anyString(), anyString(), anyString(), anyString());
String sentUserAgent = stringCaptor.getValue();
assertTrue(sentUserAgent.contains("(ca_pinning=disabled)"));
}

@Test
Expand Down
Loading