This is an automated email from the ASF dual-hosted git repository.
wuweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 7f6814d9a72 Enable Proxy frontend SSL in E2E (#25351)
7f6814d9a72 is described below
commit 7f6814d9a722c25f673b622d87edae46bd10f8ab
Author: 吴伟杰 <[email protected]>
AuthorDate: Thu Apr 27 16:17:54 2023 +0800
Enable Proxy frontend SSL in E2E (#25351)
* Enable Proxy frontend SSL in E2E
* Perform code format in DataSourceEnvironment
---
.../test/e2e/env/runtime/DataSourceEnvironment.java | 11 +++++++----
.../pipeline/src/test/resources/env/mysql/server-5.yaml | 1 +
.../pipeline/src/test/resources/env/mysql/server-8.yaml | 1 +
.../pipeline/src/test/resources/env/opengauss/server.yaml | 1 +
.../pipeline/src/test/resources/env/postgresql/server.yaml | 1 +
.../env/common/cluster/proxy/zookeeper/conf/server.yaml | 1 +
.../resources/env/common/standalone/proxy/conf/server.yaml | 1 +
.../transaction/src/test/resources/env/mysql/server.yaml | 1 +
.../transaction/src/test/resources/env/opengauss/server.yaml | 1 +
.../transaction/src/test/resources/env/postgresql/server.yaml | 1 +
.../test/resources/env/common/cluster/proxy/conf/server.yaml | 1 +
.../resources/env/common/standalone/proxy/conf/server.yaml | 1 +
12 files changed, 18 insertions(+), 4 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/DataSourceEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/DataSourceEnvironment.java
index 810e2203e96..3af135812b1 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/DataSourceEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/DataSourceEnvironment.java
@@ -64,9 +64,10 @@ public final class DataSourceEnvironment {
case "H2":
return
"jdbc:h2:mem:test_db;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL;USER=root;PASSWORD=Root@123";
case "MySQL":
- return
String.format("jdbc:mysql://%s:%s?useServerPrepStmts=true&serverTimezone=UTC&useSSL=false&useLocalSessionState=true&characterEncoding=utf-8",
host, port);
+ return
String.format("jdbc:mysql://%s:%s?useSSL=true&requireSSL=true&enabledTLSProtocols=TLSv1.2,TLSv1.3&verifyServerCertificate=false"
+ +
"&useServerPrepStmts=true&serverTimezone=UTC&useLocalSessionState=true&characterEncoding=utf-8",
host, port);
case "PostgreSQL":
- return String.format("jdbc:postgresql://%s:%s/", host, port);
+ return
String.format("jdbc:postgresql://%s:%s/?ssl=on&sslmode=prefer", host, port);
case "SQLServer":
return String.format("jdbc:sqlserver://%s:%s", host, port);
case "Oracle":
@@ -93,10 +94,12 @@ public final class DataSourceEnvironment {
case "H2":
return
String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL;USER=root;PASSWORD=Root@123",
dataSourceName);
case "MySQL":
- return
String.format("jdbc:mysql://%s:%s/%s?useServerPrepStmts=true&serverTimezone=UTC&useSSL=false&useLocalSessionState=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true",
+ return String.format(
+
"jdbc:mysql://%s:%s/%s?useSSL=true&requireSSL=true&enabledTLSProtocols=TLSv1.2,TLSv1.3&verifyServerCertificate=false"
+ +
"&useServerPrepStmts=true&serverTimezone=UTC&useLocalSessionState=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true",
host, port, dataSourceName);
case "PostgreSQL":
- return String.format("jdbc:postgresql://%s:%s/%s", host, port,
dataSourceName);
+ return
String.format("jdbc:postgresql://%s:%s/%s?ssl=on&sslmode=prefer", host, port,
dataSourceName);
case "SQLServer":
return String.format("jdbc:sqlserver://%s:%s;DatabaseName=%s",
host, port, dataSourceName);
case "Oracle":
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
index 56bbfca0663..4b6bbf9ccd5 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
@@ -42,3 +42,4 @@ props:
sql-show: false
sql-federation-type: ADVANCED
cdc-server-port: 33071 # CDC server port
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
index 56bbfca0663..4b6bbf9ccd5 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
@@ -42,3 +42,4 @@ props:
sql-show: false
sql-federation-type: ADVANCED
cdc-server-port: 33071 # CDC server port
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
index 3469ae1c26a..59698e8f31e 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
@@ -47,3 +47,4 @@ props:
sql-federation-type: NONE
proxy-frontend-database-protocol-type: openGauss
cdc-server-port: 33071 # CDC server port
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
index 995f6b62237..6a583247a65 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
@@ -50,3 +50,4 @@ props:
sql-federation-type: NONE
proxy-frontend-database-protocol-type: PostgreSQL
cdc-server-port: 33071 # CDC server port
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/server.yaml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/server.yaml
index 2175a2242bb..9125b104244 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/server.yaml
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/server.yaml
@@ -41,3 +41,4 @@ props:
proxy-hint-enabled: true
sql-show: false
sql-federation-type: ADVANCED
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/server.yaml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/server.yaml
index 145919e57f3..20839622ed5 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/server.yaml
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/server.yaml
@@ -29,3 +29,4 @@ props:
proxy-hint-enabled: true
sql-show: false
sql-federation-type: ADVANCED
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/mysql/server.yaml
b/test/e2e/operation/transaction/src/test/resources/env/mysql/server.yaml
index 3f6ca12fbe8..69732d66f53 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/mysql/server.yaml
+++ b/test/e2e/operation/transaction/src/test/resources/env/mysql/server.yaml
@@ -41,3 +41,4 @@ props:
proxy-hint-enabled: true
sql-show: true
sql-federation-type: ADVANCED
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/opengauss/server.yaml
b/test/e2e/operation/transaction/src/test/resources/env/opengauss/server.yaml
index 070b1db5856..bfcddffb782 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/opengauss/server.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/opengauss/server.yaml
@@ -45,3 +45,4 @@ props:
proxy-frontend-max-connections: 0 # Less than or equal to 0 means no
limitation.
sql-federation-type: ADVANCED
proxy-frontend-database-protocol-type: openGauss
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/postgresql/server.yaml
b/test/e2e/operation/transaction/src/test/resources/env/postgresql/server.yaml
index 2dbf471ac19..5678ed2d71b 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/postgresql/server.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/postgresql/server.yaml
@@ -48,3 +48,4 @@ props:
proxy-frontend-max-connections: 0 # Less than or equal to 0 means no
limitation.
sql-federation-type: ADVANCED
proxy-frontend-database-protocol-type: PostgreSQL
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
index 6029ddacb64..cb6d3fb631b 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++ b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
@@ -50,3 +50,4 @@ props:
proxy-hint-enabled: true
sql-show: false
sql-federation-type: ADVANCED
+ proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
index 0b93085a85c..313da7553ea 100644
---
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
@@ -50,3 +50,4 @@ props:
proxy-hint-enabled: true
sql-show: false
sql-federation-type: ADVANCED
+ proxy-frontend-ssl-enabled: true
