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

Jump to bottom

Remove getUnsafeHttpClient in favor of a normal OkHttpClient #15

Merged
merged 1 commit into from
Jul 8, 2019
Merged

Remove getUnsafeHttpClient in favor of a normal OkHttpClient #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 1 addition & 38 deletions src/main/java/com/recurly/v3/BaseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ public abstract class BaseClient {
private static final String API_URL = "https://partner-api.recurly.com/";
private static final DateTimeFormatter DT_FORMATTER = ISODateTimeFormat.dateTimeParser();

//private static OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
// TODO will want to use safe ^ version by default
private static final OkHttpClient.Builder httpClientBuilder = getUnsafeOkHttpClientBuilder();
private static OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
private static final JsonSerializer jsonSerializer = new JsonSerializer();
private final String apiKey;
private final String siteId;
Expand Down Expand Up @@ -68,41 +66,6 @@ private static OkHttpClient newHttpClient(final String apiKey) {
return httpClientBuilder.build();
}

@SuppressWarnings("deprecation")
private static OkHttpClient.Builder getUnsafeOkHttpClientBuilder() {
try {
// Create a trust manager that does not validate certificate chains
final TrustManager[] trustAllCerts = new TrustManager[] {
new X509TrustManager() {
public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException { }

public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException { }
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return new java.security.cert.X509Certificate[]{};
}
}
};

// Install the all-trusting trust manager
final SSLContext sslContext = SSLContext.getInstance("SSL");
sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
// Create an ssl socket factory with our all-trusting manager
final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();

final OkHttpClient.Builder builder = new OkHttpClient.Builder();
builder.sslSocketFactory(sslSocketFactory);
builder.hostnameVerifier(new HostnameVerifier() {
public boolean verify(final String hostname, final SSLSession session) {
return true;
}
});

return builder;
} catch (Exception e) {
throw new RuntimeException(e);
}
}

protected void makeRequest(final String method, final String url) {
final okhttp3.Request request = buildRequest(method, url, null, null);

Expand Down