You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by mi...@apache.org on 2022/10/18 01:55:43 UTC
[incubator-eventmesh] branch master updated: config of SSLContextFactory configure in EventMeshHTTPConfiguration
This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 17fd1392 config of SSLContextFactory configure in EventMeshHTTPConfiguration
new 94760c21 Merge pull request #1634 from mroccyen/issue-1628
17fd1392 is described below
commit 17fd13922ac7b892e2a57dad549900d9863557ba
Author: mroccyen <qi...@126.com>
AuthorDate: Mon Oct 17 21:10:58 2022 +0800
config of SSLContextFactory configure in EventMeshHTTPConfiguration
---
.../eventmesh/runtime/boot/AbstractHTTPServer.java | 2 +-
.../eventmesh/runtime/boot/SSLContextFactory.java | 9 ++++----
.../configuration/EventMeshHTTPConfiguration.java | 26 ++++++++++++++++++++++
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
index 008c62c7..75449ae1 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/AbstractHTTPServer.java
@@ -167,7 +167,7 @@ public abstract class AbstractHTTPServer extends AbstractRemotingServer {
super.start();
Runnable r = () -> {
ServerBootstrap b = new ServerBootstrap();
- SSLContext sslContext = useTLS ? SSLContextFactory.getSslContext() : null;
+ SSLContext sslContext = useTLS ? SSLContextFactory.getSslContext(eventMeshHttpConfiguration) : null;
b.group(this.bossGroup, this.workerGroup)
.channel(NioServerSocketChannel.class)
.childHandler(new HttpsServerInitializer(sslContext))
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/SSLContextFactory.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/SSLContextFactory.java
index 0d7fff5d..80659ac2 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/SSLContextFactory.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/SSLContextFactory.java
@@ -19,6 +19,7 @@
package org.apache.eventmesh.runtime.boot;
+import org.apache.eventmesh.runtime.configuration.EventMeshHTTPConfiguration;
import org.apache.eventmesh.runtime.constants.EventMeshConstants;
import org.apache.commons.lang3.StringUtils;
@@ -45,15 +46,15 @@ public class SSLContextFactory {
private static String pass;
- public static SSLContext getSslContext() {
+ public static SSLContext getSslContext(EventMeshHTTPConfiguration eventMeshHttpConfiguration) {
SSLContext sslContext;
try {
- protocol = System.getProperty("ssl.server.protocol", "TLSv1.1");
+ protocol = eventMeshHttpConfiguration.eventMeshServerSSLProtocol;
- fileName = System.getProperty("ssl.server.cer", "sChat2.jks");
+ fileName = eventMeshHttpConfiguration.eventMeshServerSSLCer;
char[] filePass = null;
- pass = System.getProperty("ssl.server.pass", "sNetty");
+ pass = eventMeshHttpConfiguration.eventMeshServerSSLPass;
if (StringUtils.isNotBlank(pass)) {
filePass = pass.toCharArray();
}
diff --git a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java
index 287fce91..95e06d44 100644
--- a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java
+++ b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/configuration/EventMeshHTTPConfiguration.java
@@ -85,6 +85,12 @@ public class EventMeshHTTPConfiguration extends CommonConfiguration {
public boolean eventMeshServerUseTls = false;
+ public String eventMeshServerSSLProtocol = "TLSv1.1";
+
+ public String eventMeshServerSSLCer = "sChat2.jks";
+
+ public String eventMeshServerSSLPass = "sNetty";
+
public int eventMeshHttpMsgReqNumPerSecond = 15000;
public int eventMeshBatchMsgRequestNumPerSecond = 20000;
@@ -275,6 +281,20 @@ public class EventMeshHTTPConfiguration extends CommonConfiguration {
eventMeshServerUseTls = Boolean.parseBoolean(StringUtils.deleteWhitespace(eventMeshServerUseTlsStr));
}
+ String eventMeshServerSslProtocolStr = configurationWrapper.getProp(ConfKeys.KEY_EVENTMESH_HTTPS_SSL_PROTOCOL);
+ if (StringUtils.isNotEmpty(eventMeshServerSslProtocolStr)) {
+ eventMeshServerSSLProtocol = StringUtils.deleteWhitespace(eventMeshServerSslProtocolStr);
+ }
+
+ String eventMeshServerSslCerStr = configurationWrapper.getProp(ConfKeys.KEY_EVENTMESH_HTTPS_SSL_CER);
+ if (StringUtils.isNotEmpty(eventMeshServerSslCerStr)) {
+ eventMeshServerSSLCer = StringUtils.deleteWhitespace(eventMeshServerSslCerStr);
+ }
+
+ String eventMeshServerSslPassStr = configurationWrapper.getProp(ConfKeys.KEY_EVENTMESH_HTTPS_SSL_PASS);
+ if (StringUtils.isNotEmpty(eventMeshServerSslPassStr)) {
+ eventMeshServerSSLPass = StringUtils.deleteWhitespace(eventMeshServerSslPassStr);
+ }
String eventMeshHttpMsgReqNumPerSecondStr =
configurationWrapper.getProp(ConfKeys.KEY_EVENTMESH_SERVER_MSG_REQ_NUM_PER_SECOND);
@@ -367,6 +387,12 @@ public class EventMeshHTTPConfiguration extends CommonConfiguration {
public static final String KEY_EVENTMESH_HTTPS_ENABLED = "eventMesh.server.useTls.enabled";
+ public static final String KEY_EVENTMESH_HTTPS_SSL_PROTOCOL = "eventMesh.server.ssl.protocol";
+
+ public static final String KEY_EVENTMESH_HTTPS_SSL_CER = "eventMesh.server.ssl.cer";
+
+ public static final String KEY_EVENTMESH_HTTPS_SSL_PASS = "eventMesh.server.ssl.pass";
+
public static final String KEY_EVENTMESH_SERVER_MSG_REQ_NUM_PER_SECOND = "eventMesh.server.http.msgReqnumPerSecond";
public static final String KEY_EVENTMESH_SERVER_EVENTSIZE = "eventMesh.server.maxEventSize";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org