fix(#verify host) : verify host (#12)

qwangseu · mike.wq · web-flow · commit 0e85d3525bf7 · 2024-08-12T18:36:56.000+08:00
Co-authored-by: mike.wq &lt;mike.wq@alibaba-inc.com&gt;
diff --git a/app-stream-api/pom.xml b/app-stream-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/app-stream-client/pom.xml b/app-stream-client/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-client</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <name>app-stream-client</name>
 
     <dependencies>
diff --git a/app-stream-network/app-stream-network-api/pom.xml b/app-stream-network/app-stream-network-api/pom.xml
@@ -4,12 +4,12 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>app-stream-network-api</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <packaging>jar</packaging>
 
     <name>app-stream-network-api</name>
diff --git a/app-stream-network/app-stream-network-core/pom.xml b/app-stream-network/app-stream-network-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-rsocket/pom.xml b/app-stream-network/app-stream-network-rsocket/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-ws/pom.xml b/app-stream-network/app-stream-network-ws/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>app-stream-network</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/WebsocketTransportConnector.java b/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/WebsocketTransportConnector.java
@@ -51,9 +51,10 @@ protected void initChannel(SocketChannel socketChannel) throws Exception {
                         .dropPongFrames(false).webSocketUri(configureWebsocketUri(connection)).handshakeTimeoutMillis(option.getTtl()).dropPongFrames(false).handleCloseFrames(true).build();
                 SslContext sslContext = SslContextBuilder.forClient().build();
                 if (connection.getProtocol().isTls()) {
-                    final SSLEngine engine = sslContext.newEngine(socketChannel.alloc());
+                    final SSLEngine engine = sslContext.newEngine(socketChannel.alloc(), connection.getEndPoint().getHost(), connection.getEndPoint().getPort());
                     final SSLParameters sslParameters = new SSLParameters();
                     sslParameters.setServerNames(Collections.singletonList(new SNIHostName(connection.getEndPoint().getHost())));
+                    sslParameters.setEndpointIdentificationAlgorithm("HTTPS");
                     engine.setSSLParameters(sslParameters);
                     socketChannel.pipeline().addLast(new SslHandler(engine));
                 }
diff --git a/app-stream-network/pom.xml b/app-stream-network/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>open-app-stream-client</artifactId>
         <groupId>com.dingtalk.open</groupId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
diff --git a/app-stream-protocol/pom.xml b/app-stream-protocol/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
     </parent>
 
     <artifactId>app-stream-protocol</artifactId>
diff --git a/dingtalk-stream/pom.xml b/dingtalk-stream/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>com.dingtalk.open</groupId>
         <artifactId>open-app-stream-client</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>dingtalk-stream</artifactId>
     <packaging>jar</packaging>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <name>app-stream-client</name>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.dingtalk.open</groupId>
     <artifactId>open-app-stream-client</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <modules>
         <module>app-stream-client</module>
         <module>app-stream-api</module>
diff --git a/version.sh b/version.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-mvn versions:set -DnewVersion=1.3.5
+mvn versions:set -DnewVersion=1.3.6
