Skip to content

Commit 5c61f2f

Browse files
dingxiaobodingxiaobo
authored
Feat, support SSL(TLS), improve SHA2 password. (#5147)
* feat #4489, mysql SSL * feat #4489, mysql SHA2 and SSL * merge master, fix conflict. * improve SHA2 auth plugin, fix SSL status print. * SSL key store, use url rather than path, keep same as JDBC driver.
1 parent 7bb619c commit 5c61f2f

File tree

28 files changed

+956
-112
lines changed

28 files changed

+956
-112
lines changed

‎deployer/src/main/resources/spring/default-instance.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
<property name="defaultConnectionTimeoutInSeconds" value="${canal.instance.network.soTimeout:30}" />
112112

113113
<!-- 解析编码 -->
114-
<!-- property name="connectionCharsetNumber" value="${canal.instance.connectionCharsetNumber:33}" /-->
115114
<property name="connectionCharset" value="${canal.instance.connectionCharset:UTF-8}" />
116115

117116
<!-- 解析位点记录 -->
@@ -140,6 +139,18 @@
140139
<property name="pwdPublicKey" value="${canal.instance.pwdPublicKey:retl}" />
141140
<property name="enableDruid" value="${canal.instance.enableDruid:false}" />
142141
<property name="defaultDatabaseName" value="${canal.instance.defaultDatabaseName:}" />
142+
<property name="sslInfo">
143+
<bean class="com.alibaba.otter.canal.parse.driver.mysql.ssl.SslInfo">
144+
<property name="sslMode" value="${canal.instance.master.sslMode:DISABLED}"/>
145+
<property name="tlsVersions" value="${canal.instance.master.tlsVersions:}"/>
146+
<property name="trustCertificateKeyStoreType" value="${canal.instance.master.trustCertificateKeyStoreType:}"/>
147+
<property name="trustCertificateKeyStoreUrl" value="${canal.instance.master.trustCertificateKeyStoreUrl:}"/>
148+
<property name="trustCertificateKeyStorePassword" value="${canal.instance.master.trustCertificateKeyStorePassword:}"/>
149+
<property name="clientCertificateKeyStoreType" value="${canal.instance.master.clientCertificateKeyStoreType:}"/>
150+
<property name="clientCertificateKeyStoreUrl" value="${canal.instance.master.clientCertificateKeyStoreUrl:}"/>
151+
<property name="clientCertificateKeyStorePassword" value="${canal.instance.master.clientCertificateKeyStorePassword:}"/>
152+
</bean>
153+
</property>
143154
</bean>
144155
</property>
145156
<property name="standbyInfo">
@@ -150,6 +161,18 @@
150161
<property name="pwdPublicKey" value="${canal.instance.pwdPublicKey:retl}" />
151162
<property name="enableDruid" value="${canal.instance.enableDruid:false}" />
152163
<property name="defaultDatabaseName" value="${canal.instance.defaultDatabaseName:}" />
164+
<property name="sslInfo">
165+
<bean class="com.alibaba.otter.canal.parse.driver.mysql.ssl.SslInfo">
166+
<property name="sslMode" value="${canal.instance.standby.sslMode:DISABLED}"/>
167+
<property name="tlsVersions" value="${canal.instance.standby.tlsVersions:}"/>
168+
<property name="trustCertificateKeyStoreType" value="${canal.instance.standby.trustCertificateKeyStoreType:}"/>
169+
<property name="trustCertificateKeyStoreUrl" value="${canal.instance.standby.trustCertificateKeyStoreUrl:}"/>
170+
<property name="trustCertificateKeyStorePassword" value="${canal.instance.standby.trustCertificateKeyStorePassword:}"/>
171+
<property name="clientCertificateKeyStoreType" value="${canal.instance.standby.clientCertificateKeyStoreType:}"/>
172+
<property name="clientCertificateKeyStoreUrl" value="${canal.instance.standby.clientCertificateKeyStoreUrl:}"/>
173+
<property name="clientCertificateKeyStorePassword" value="${canal.instance.standby.clientCertificateKeyStorePassword:}"/>
174+
</bean>
175+
</property>
153176
</bean>
154177
</property>
155178

‎deployer/src/main/resources/spring/file-instance.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
<property name="defaultConnectionTimeoutInSeconds" value="${canal.instance.network.soTimeout:30}" />
9898

9999
<!-- 解析编码 -->
100-
<!-- property name="connectionCharsetNumber" value="${canal.instance.connectionCharsetNumber:33}" /-->
101100
<property name="connectionCharset" value="${canal.instance.connectionCharset:UTF-8}" />
102101

103102
<!-- 解析位点记录 -->

‎deployer/src/main/resources/spring/group-instance.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@
103103
<property name="defaultConnectionTimeoutInSeconds" value="${canal.instance.network.soTimeout:30}" />
104104

105105
<!-- 解析编码 -->
106-
<!-- property name="connectionCharsetNumber" value="${canal.instance.connectionCharsetNumber:33}" /-->
107106
<property name="connectionCharset" value="${canal.instance.connectionCharset:UTF-8}" />
108107

109108
<!-- 解析位点记录 -->
@@ -211,7 +210,6 @@
211210
<property name="defaultConnectionTimeoutInSeconds" value="${canal.instance.network.soTimeout:30}" />
212211

213212
<!-- 解析编码 -->
214-
<!-- property name="connectionCharsetNumber" value="${canal.instance.connectionCharsetNumber:33}" /-->
215213
<property name="connectionCharset" value="${canal.instance.connectionCharset:UTF-8}" />
216214

217215
<!-- 解析位点记录 -->

‎deployer/src/main/resources/spring/memory-instance.xml‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
<property name="defaultConnectionTimeoutInSeconds" value="${canal.instance.network.soTimeout:30}" />
9595

9696
<!-- 解析编码 -->
97-
<!-- property name="connectionCharsetNumber" value="${canal.instance.connectionCharsetNumber:33}" /-->
9897
<property name="connectionCharset" value="${canal.instance.connectionCharset:UTF-8}" />
9998

10099
<!-- 解析位点记录 -->
@@ -114,6 +113,18 @@
114113
<property name="pwdPublicKey" value="${canal.instance.pwdPublicKey:retl}" />
115114
<property name="enableDruid" value="${canal.instance.enableDruid:false}" />
116115
<property name="defaultDatabaseName" value="${canal.instance.defaultDatabaseName:}" />
116+
<property name="sslInfo">
117+
<bean class="com.alibaba.otter.canal.parse.driver.mysql.ssl.SslInfo">
118+
<property name="sslMode" value="${canal.instance.master.sslMode:DISABLED}"/>
119+
<property name="tlsVersions" value="${canal.instance.master.tlsVersions:}"/>
120+
<property name="trustCertificateKeyStoreType" value="${canal.instance.master.trustCertificateKeyStoreType:}"/>
121+
<property name="trustCertificateKeyStoreUrl" value="${canal.instance.master.trustCertificateKeyStoreUrl:}"/>
122+
<property name="trustCertificateKeyStorePassword" value="${canal.instance.master.trustCertificateKeyStorePassword:}"/>
123+
<property name="clientCertificateKeyStoreType" value="${canal.instance.master.clientCertificateKeyStoreType:}"/>
124+
<property name="clientCertificateKeyStoreUrl" value="${canal.instance.master.clientCertificateKeyStoreUrl:}"/>
125+
<property name="clientCertificateKeyStorePassword" value="${canal.instance.master.clientCertificateKeyStorePassword:}"/>
126+
</bean>
127+
</property>
117128
</bean>
118129
</property>
119130
<property name="standbyInfo">
@@ -124,6 +135,18 @@
124135
<property name="pwdPublicKey" value="${canal.instance.pwdPublicKey:retl}" />
125136
<property name="enableDruid" value="${canal.instance.enableDruid:false}" />
126137
<property name="defaultDatabaseName" value="${canal.instance.defaultDatabaseName:}" />
138+
<property name="sslInfo">
139+
<bean class="com.alibaba.otter.canal.parse.driver.mysql.ssl.SslInfo">
140+
<property name="sslMode" value="${canal.instance.standby.sslMode:DISABLED}"/>
141+
<property name="tlsVersions" value="${canal.instance.standby.tlsVersions:}"/>
142+
<property name="trustCertificateKeyStoreType" value="${canal.instance.standby.trustCertificateKeyStoreType:}"/>
143+
<property name="trustCertificateKeyStoreUrl" value="${canal.instance.standby.trustCertificateKeyStoreUrl:}"/>
144+
<property name="trustCertificateKeyStorePassword" value="${canal.instance.standby.trustCertificateKeyStorePassword:}"/>
145+
<property name="clientCertificateKeyStoreType" value="${canal.instance.standby.clientCertificateKeyStoreType:}"/>
146+
<property name="clientCertificateKeyStoreUrl" value="${canal.instance.standby.clientCertificateKeyStoreUrl:}"/>
147+
<property name="clientCertificateKeyStorePassword" value="${canal.instance.standby.clientCertificateKeyStorePassword:}"/>
148+
</bean>
149+
</property>
127150
</bean>
128151
</property>
129152

0 commit comments

Comments
 (0)