-
-
Notifications
You must be signed in to change notification settings - Fork 9.1k
fix(security): 默认校验服务器证书，随机串改用 SecureRandom，签名比较改为定时安全 #4081
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.
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
Open
devin-ai-integration
wants to merge
3
commits into
develop
Choose a base branch
from
devin/1785469108-security-tls-and-random
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
154 changes: 154 additions & 0 deletions
154
...n/src/test/java/me/chanjar/weixin/common/util/http/ServerCertificateVerificationTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| package me.chanjar.weixin.common.util.http; | ||
|
|
||
| import com.sun.net.httpserver.HttpsConfigurator; | ||
| import com.sun.net.httpserver.HttpsServer; | ||
| import me.chanjar.weixin.common.util.http.apache.DefaultApacheHttpClientBuilder; | ||
| import me.chanjar.weixin.common.util.http.hc.DefaultHttpComponentsClientBuilder; | ||
| import org.apache.http.client.methods.CloseableHttpResponse; | ||
| import org.apache.http.client.methods.HttpGet; | ||
| import org.apache.http.impl.client.CloseableHttpClient; | ||
| import org.bouncycastle.asn1.x500.X500Name; | ||
| import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; | ||
| import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder; | ||
| import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; | ||
| import org.testng.Assert; | ||
| import org.testng.annotations.AfterClass; | ||
| import org.testng.annotations.BeforeClass; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| import javax.net.ssl.KeyManagerFactory; | ||
| import javax.net.ssl.SSLContext; | ||
| import javax.net.ssl.SSLException; | ||
| import java.io.OutputStream; | ||
| import java.lang.reflect.Constructor; | ||
| import java.math.BigInteger; | ||
| import java.net.InetSocketAddress; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.security.KeyPair; | ||
| import java.security.KeyPairGenerator; | ||
| import java.security.KeyStore; | ||
| import java.security.cert.Certificate; | ||
| import java.security.cert.X509Certificate; | ||
| import java.util.Date; | ||
|
|
||
| /** | ||
| * 验证默认情况下会校验服务器端证书（避免中间人攻击），且显式跳过校验的开关确实生效. | ||
| */ | ||
| public class ServerCertificateVerificationTest { | ||
|
|
||
| private static final char[] KEY_STORE_PASSWORD = "wxjava".toCharArray(); | ||
|
|
||
| private HttpsServer httpsServer; | ||
| private String selfSignedUrl; | ||
|
|
||
| @BeforeClass | ||
| public void startSelfSignedHttpsServer() throws Exception { | ||
| KeyStore keyStore = createSelfSignedKeyStore(); | ||
| KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm()); | ||
| keyManagerFactory.init(keyStore, KEY_STORE_PASSWORD); | ||
|
|
||
| SSLContext sslContext = SSLContext.getInstance("TLS"); | ||
| sslContext.init(keyManagerFactory.getKeyManagers(), null, null); | ||
|
|
||
| this.httpsServer = HttpsServer.create(new InetSocketAddress(0), 0); | ||
| this.httpsServer.setHttpsConfigurator(new HttpsConfigurator(sslContext)); | ||
| this.httpsServer.createContext("/", exchange -> { | ||
| byte[] body = "ok".getBytes(StandardCharsets.UTF_8); | ||
| exchange.sendResponseHeaders(200, body.length); | ||
| try (OutputStream out = exchange.getResponseBody()) { | ||
| out.write(body); | ||
| } | ||
| }); | ||
| this.httpsServer.start(); | ||
| this.selfSignedUrl = "https://localhost:" + this.httpsServer.getAddress().getPort() + "/"; | ||
| } | ||
|
|
||
| @AfterClass(alwaysRun = true) | ||
| public void stopSelfSignedHttpsServer() { | ||
| if (this.httpsServer != null) { | ||
| this.httpsServer.stop(0); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testApacheBuilderRejectsUntrustedCertificateByDefault() throws Exception { | ||
| DefaultApacheHttpClientBuilder builder = newApacheBuilder(); | ||
| Assert.assertFalse(builder.isSkipServerCertificateVerification(), "默认应校验服务器端证书"); | ||
|
|
||
| try (CloseableHttpClient client = builder.build()) { | ||
| client.execute(new HttpGet(this.selfSignedUrl)); | ||
| Assert.fail("默认配置下应拒绝自签名证书"); | ||
| } catch (SSLException e) { | ||
| // 期望的结果：证书校验失败 | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testApacheBuilderAcceptsUntrustedCertificateWhenSkipEnabled() throws Exception { | ||
| DefaultApacheHttpClientBuilder builder = newApacheBuilder(); | ||
| builder.setSkipServerCertificateVerification(true); | ||
|
|
||
| try (CloseableHttpClient client = builder.build(); | ||
| CloseableHttpResponse response = client.execute(new HttpGet(this.selfSignedUrl))) { | ||
| Assert.assertEquals(response.getStatusLine().getStatusCode(), 200); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testHttpComponentsBuilderRejectsUntrustedCertificateByDefault() throws Exception { | ||
| DefaultHttpComponentsClientBuilder builder = newHttpComponentsBuilder(); | ||
| Assert.assertFalse(builder.isSkipServerCertificateVerification(), "默认应校验服务器端证书"); | ||
|
|
||
| try (org.apache.hc.client5.http.impl.classic.CloseableHttpClient client = builder.build()) { | ||
| client.execute(new org.apache.hc.client5.http.classic.methods.HttpGet(this.selfSignedUrl)); | ||
| Assert.fail("默认配置下应拒绝自签名证书"); | ||
| } catch (SSLException e) { | ||
| // 期望的结果：证书校验失败 | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testHttpComponentsBuilderAcceptsUntrustedCertificateWhenSkipEnabled() throws Exception { | ||
| DefaultHttpComponentsClientBuilder builder = newHttpComponentsBuilder(); | ||
| builder.setSkipServerCertificateVerification(true); | ||
|
|
||
| try (org.apache.hc.client5.http.impl.classic.CloseableHttpClient client = builder.build(); | ||
| org.apache.hc.client5.http.impl.classic.CloseableHttpResponse response = | ||
| client.execute(new org.apache.hc.client5.http.classic.methods.HttpGet(this.selfSignedUrl))) { | ||
| Assert.assertEquals(response.getCode(), 200); | ||
| } | ||
| } | ||
|
|
||
| private DefaultApacheHttpClientBuilder newApacheBuilder() throws Exception { | ||
| Constructor<DefaultApacheHttpClientBuilder> constructor = | ||
| DefaultApacheHttpClientBuilder.class.getDeclaredConstructor(); | ||
| constructor.setAccessible(true); | ||
| return constructor.newInstance(); | ||
| } | ||
|
|
||
| private DefaultHttpComponentsClientBuilder newHttpComponentsBuilder() throws Exception { | ||
| Constructor<DefaultHttpComponentsClientBuilder> constructor = | ||
| DefaultHttpComponentsClientBuilder.class.getDeclaredConstructor(); | ||
| constructor.setAccessible(true); | ||
| return constructor.newInstance(); | ||
| } | ||
|
|
||
| private KeyStore createSelfSignedKeyStore() throws Exception { | ||
| KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); | ||
| keyPairGenerator.initialize(2048); | ||
| KeyPair keyPair = keyPairGenerator.generateKeyPair(); | ||
|
|
||
| long now = System.currentTimeMillis(); | ||
| X500Name subject = new X500Name("CN=localhost"); | ||
| X509Certificate certificate = new JcaX509CertificateConverter().getCertificate( | ||
| new JcaX509v3CertificateBuilder(subject, BigInteger.valueOf(now), | ||
| new Date(now - 86400_000L), new Date(now + 86400_000L), subject, keyPair.getPublic()) | ||
| .build(new JcaContentSignerBuilder("SHA256withRSA").build(keyPair.getPrivate()))); | ||
|
|
||
| KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType()); | ||
| keyStore.load(null, null); | ||
| keyStore.setKeyEntry("wxjava-test", keyPair.getPrivate(), KEY_STORE_PASSWORD, | ||
| new Certificate[]{certificate}); | ||
| return keyStore; | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
当调用者把
DefaultApacheHttpClientBuilder.get().setSkipServerCertificateVerification(true)用于自签名抓包或测试环境时，这里创建的 trust-allSSLConnectionSocketFactory实际不会参与建连：prepare()已经用注册表里的this.sslConnectionSocketFactory构造了PoolingHttpClientConnectionManager，随后在 builder 上调用的setSSLSocketFactory(...)会被该 connection manager 覆盖。因此 Apache 4 默认客户端仍会按默认 trust store 校验证书，和本次改好的 HC5 客户端行为不一致；应把根据开关生成的 socket factory 注册进 connection manager。Useful? React with 👍 / 👎.