Skip to content

fix: remove verification when ca is empty #164

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
yndu13 merged 1 commit into from
Feb 17, 2023
Merged

fix: remove verification when ca is empty #164

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions src/main/java/com/aliyun/tea/okhttp/OkHttpClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

import com.aliyun.tea.TeaException;
import com.aliyun.tea.okhttp.interceptors.SocksProxyAuthInterceptor;
import com.aliyun.tea.utils.StringUtils;
import com.aliyun.tea.utils.TrueHostnameVerifier;
import com.aliyun.tea.utils.X509TrustManagerImp;
import okhttp3.*;
Expand Down Expand Up @@ -71,10 +72,11 @@ public OkHttpClientBuilder certificate(Map<String, Object> map) {
sslContext.init(null, new TrustManager[]{compositeX509TrustManager}, new java.security.SecureRandom());
this.builder.sslSocketFactory(sslContext.getSocketFactory(), compositeX509TrustManager).
hostnameVerifier(new TrueHostnameVerifier());
} else if (map.containsKey("ca")) {
} else if (map.containsKey("ca") && !StringUtils.isEmpty(map.get("ca"))) {
SSLContext sslContext = SSLContext.getInstance("TLS");
KeyManagerFactory keyManagerFactory = null;
if (map.containsKey("key") && map.containsKey("cert")) {
if (map.containsKey("key") && !StringUtils.isEmpty(map.get("key"))
&& map.containsKey("cert") && !StringUtils.isEmpty(map.get("cert"))) {
KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
String cert = String.valueOf(map.get("cert"));
try (InputStream is = new ByteArrayInputStream(cert.getBytes(charset))) {
Expand Down
24 changes: 23 additions & 1 deletion src/test/java/com/aliyun/tea/okhttp/OkHttpClientBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
import sun.security.ssl.SSLSocketFactoryImpl;

import java.io.IOException;
import java.util.HashMap;
Expand Down Expand Up @@ -63,12 +62,35 @@ public void certificateTest() throws IOException {
Assert.assertTrue(e.getMessage().contains("Unable to initialize"));
}

map.put("ca", null);
new OkHttpClientBuilder().certificate(map);
map.put("ca", "");
new OkHttpClientBuilder().certificate(map);

map.put("ca", System.getenv("CA"));
OkHttpClientBuilder builder = new OkHttpClientBuilder().certificate(map);

OkHttpClient client = builder.buildOkHttpClient();
Assert.assertTrue(client.hostnameVerifier() instanceof TrueHostnameVerifier);
Assert.assertNotNull(client.sslSocketFactory());

map.put("key", null);
map.put("cert", null);
new OkHttpClientBuilder().certificate(map);

map.put("key", "");
map.put("cert", "");
new OkHttpClientBuilder().certificate(map);

map.put("ca", "-----BEGIN CERTIFICATE-----\nwrong ca-----END CERTIFICATE-----");
map.put("key", "wrong key");
map.put("cert", "-----BEGIN CERTIFICATE-----\nwrong cert-----END CERTIFICATE-----");
try {
new OkHttpClientBuilder().certificate(map);
Assert.fail();
} catch (Exception e) {
Assert.assertTrue(e instanceof TeaException);
}
}

@Test
Expand Down