Skip to content

[fix] Okhttp39verifier on cn fallback #907

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 4 commits into from
Dec 20, 2018
Merged

[fix] Okhttp39verifier on cn fallback #907

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
9cf21e2
ignore eclipse generated
tpetracca Dec 19, 2018
42bd6a1
wire up configs
tpetracca Dec 10, 2018
22de20c
Backport HostnameVerifier from okhttp 3.9
iamdanfox Oct 15, 2018
705bb57
only use 39 verifier when fallback is true
tpetracca Dec 10, 2018
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
2 changes: 2 additions & 0 deletions .baseline/checkstyle/checkstyle-suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@

<suppress files=".*AsyncSerializableErrorCallAdapterFactory\.java" checks="RegexpHeader" />
<suppress files=".*BlockingLimiter\.java" checks="RegexpHeader" />
<suppress files=".*DistinguishedNameParser\.java" checks="." />
<suppress files=".*Okhttp39HostnameVerifier\.java" checks="." />
</suppressions>
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ build/
.project
.settings
bin/
generated/

# Idea
*.iml
Expand Down
6 changes: 6 additions & 0 deletions client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ public interface ClientConfiguration {
/** See {@link com.palantir.conjure.java.api.config.service.PartialServiceConfiguration#enableGcmCipherSuites}. */
boolean enableGcmCipherSuites();

/**
* See {@link
* com.palantir.conjure.java.api.config.service.PartialServiceConfiguration#fallbackToCommonNameVerification}.
*/
boolean fallbackToCommonNameVerification();

/** The proxy to use for the HTTP connection. */
ProxySelector proxy();

Expand Down
4 changes: 4 additions & 0 deletions ...nt-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public final class ClientConfigurations {
private static final Duration DEFAULT_BACKOFF_SLOT_SIZE = Duration.ofMillis(250);
private static final Duration DEFAULT_FAILED_URL_COOLDOWN = Duration.ZERO;
private static final boolean DEFAULT_ENABLE_GCM_CIPHERS = false;
private static final boolean DEFAULT_FALLBACK_TO_COMMON_NAME_VERIFICATION = false;
private static final NodeSelectionStrategy DEFAULT_NODE_SELECTION_STRATEGY = NodeSelectionStrategy.PIN_UNTIL_ERROR;
private static final int DEFAULT_MAX_NUM_RETRIES = 4;

Expand All @@ -61,6 +62,8 @@ public static ClientConfiguration of(ServiceConfiguration config) {
.readTimeout(config.readTimeout().orElse(DEFAULT_READ_TIMEOUT))
.writeTimeout(config.writeTimeout().orElse(DEFAULT_WRITE_TIMEOUT))
.enableGcmCipherSuites(config.enableGcmCipherSuites().orElse(DEFAULT_ENABLE_GCM_CIPHERS))
.fallbackToCommonNameVerification(config.fallbackToCommonNameVerification()
.orElse(DEFAULT_FALLBACK_TO_COMMON_NAME_VERIFICATION))
.proxy(config.proxy().map(ClientConfigurations::createProxySelector).orElse(ProxySelector.getDefault()))
.proxyCredentials(config.proxy().flatMap(ProxyConfiguration::credentials))
.meshProxy(meshProxy(config.proxy()))
Expand All @@ -85,6 +88,7 @@ public static ClientConfiguration of(
.readTimeout(DEFAULT_READ_TIMEOUT)
.writeTimeout(DEFAULT_WRITE_TIMEOUT)
.enableGcmCipherSuites(DEFAULT_ENABLE_GCM_CIPHERS)
.fallbackToCommonNameVerification(DEFAULT_FALLBACK_TO_COMMON_NAME_VERIFICATION)
.proxy(ProxySelector.getDefault())
.proxyCredentials(Optional.empty())
.maxNumRetries(DEFAULT_MAX_NUM_RETRIES)
Expand Down
2 changes: 2 additions & 0 deletions ...onfig/src/test/java/com/palantir/conjure/java/client/config/ClientConfigurationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ public void testFromServiceConfig_fillsInDefaults() {
assertThat(actual.readTimeout()).isEqualTo(Duration.ofMinutes(10));
assertThat(actual.writeTimeout()).isEqualTo(Duration.ofMinutes(10));
assertThat(actual.enableGcmCipherSuites()).isFalse();
assertThat(actual.fallbackToCommonNameVerification()).isFalse();
assertThat(actual.proxy().select(URI.create("https://foo"))).containsExactly(Proxy.NO_PROXY);
}

Expand All @@ -70,6 +71,7 @@ public void testFromParameters_fillsInDefaults() {
assertThat(actual.readTimeout()).isEqualTo(Duration.ofMinutes(10));
assertThat(actual.writeTimeout()).isEqualTo(Duration.ofMinutes(10));
assertThat(actual.enableGcmCipherSuites()).isFalse();
assertThat(actual.fallbackToCommonNameVerification()).isFalse();
assertThat(actual.proxy().select(URI.create("https://foo"))).containsExactly(Proxy.NO_PROXY);
}

Expand Down
Loading