add(ssl): add ssl cert config

MrHKing · Mar 18, 2022 · dec761b · dec761b
1 parent a1b4bef
commit dec761b
Show file tree

Hide file tree

Showing 24 changed files with 161 additions and 56 deletions.
diff --git a/.flattened-pom.xml b/.flattened-pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.monkey.mmq</groupId>
   <artifactId>mmq</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <packaging>pom</packaging>
   <name>Monkey mmq ${project.version}</name>
   <description>Top mmq project pom.xml file</description>
@@ -114,7 +114,7 @@
     <maven-surefire-plugin.version>2.20</maven-surefire-plugin.version>
     <servlet-api.version>3.0</servlet-api.version>
     <spring-boot-dependencies.version>2.1.6.RELEASE</spring-boot-dependencies.version>
-    <revision>1.1.0</revision>
+    <revision>1.1.1</revision>
   </properties>
   <dependencyManagement>
     <dependencies>

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/distribution/.flattened-pom.xml b/distribution/.flattened-pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.monkey.mmq</groupId>
     <artifactId>mmq</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>org.monkey.mmq</groupId>
   <artifactId>distribution</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <packaging>pom</packaging>
   <name>distribution ${project.version}</name>
   <licenses>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-broker</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -81,7 +81,7 @@
         <dependency>
           <groupId>org.monkey.mmq</groupId>
           <artifactId>mmq-web</artifactId>
-          <version>1.1.0</version>
+          <version>1.1.1</version>
           <scope>compile</scope>
         </dependency>
       </dependencies>

diff --git a/distribution/conf/application.properties b/distribution/conf/application.properties
@@ -24,7 +24,8 @@ server.port=8888
 mmq.broker.websocketPort=2883
 mmq.broker.port=3883
 mmq.broker.ssl.password=mmq@123
-mmq.broker.ssl.port=3663
+mmq.broker.ssl.certPath=cert/mmq.pfx
+mmq.broker.ssl.port=1663
 mmq.broker.ssl.websocketPort=2663
 mmq.broker.default.user=admin
 mmq.broker.default.password=admin@mmq

diff --git a/distribution/conf/cert/mmq.cer b/distribution/conf/cert/mmq.cer
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDozCCAougAwIBAgIUUJo/Ll3YJtLB6UDKoZ9H3k1BAQYwDQYJKoZIhvcNAQEL
+BQAwYTELMAkGA1UEBhMCQ04xEDAOBgNVBAgMB1FpbmdkYW8xEDAOBgNVBAcMB1Fp
+bmdkYW8xDzANBgNVBAoMBk1vbmtleTEPMA0GA1UECwwGTW9ua2V5MQwwCgYDVQQD
+DANtbXEwHhcNMjExMjE0MTUyODQyWhcNMjIxMjE0MTUyODQyWjBhMQswCQYDVQQG
+EwJDTjEQMA4GA1UECAwHUWluZ2RhbzEQMA4GA1UEBwwHUWluZ2RhbzEPMA0GA1UE
+CgwGTW9ua2V5MQ8wDQYDVQQLDAZNb25rZXkxDDAKBgNVBAMMA21tcTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANs5zhJowlbQlHMgVIc8hUVXCoCu8MmH
+Oi+0DMGb3oKvQdjLS/eDI5uZNAhKK6Caz0FMzYvWOzmQEXS56BMW8wB1WWj6Ifb8
+N+Hj69wOAU87j89q2i1BX+uaIi4T/VGLGU4V2+qeUm+X27uG2tKLo0siNHsvxM2F
+GUpib4QN+Oe6WJB2eO6XrEjRmOThR38YuhSu72hRO/ezfNnilQQYFnVNfyoAmgxu
+ZcCyg8xDd0Nt1r4OoRwofhVqtqnTP0WlnHopYOhmohxESf+8DKUbLB27FcgrFUJs
+nkWGHjh005dNo0dXnWl6P5lOie8bhF7wsiUBcyw7B3FCAOXPsVDIj78CAwEAAaNT
+MFEwHQYDVR0OBBYEFNfgQ7dJ0JGkvvMF4Roi5Qq870hgMB8GA1UdIwQYMBaAFNfg
+Q7dJ0JGkvvMF4Roi5Qq870hgMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBACnWx9DpFhyVXgWhm4/ttXNryo5wUD1AREiuP929V25pva6NfEvmlBoe
+J3/KrExIK3c6dIdSaf+fVjHtXf32kROvVOV2BsRcMScJuhRS2e50rkeWjfwlqEU4
+ERsNmObjpIMBg9Zn4v0TaByzJ+sS7tDVhPPcAnw+PuF5wJJX2dXOuQJKeFlVIxf5
+75yNggRTot07L3a4S+DDsSEkv0sX4OyDRl7EySNDy6+aq9QgUZNBj57X8PMdZXOq
+xc5dOVsoS+55nxqhQ9vF4YC2UKnxi0kNBAjTKipAQvqst8DilBIrS/LX8Dimqo0a
+obZtPSgMsMTpQLt+5pRhymh3UKoZ/CI=
+-----END CERTIFICATE-----
diff --git a/distribution/conf/cert/mmq.key b/distribution/conf/cert/mmq.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbOc4SaMJW0JRz
+IFSHPIVFVwqArvDJhzovtAzBm96Cr0HYy0v3gyObmTQISiugms9BTM2L1js5kBF0
+uegTFvMAdVlo+iH2/Dfh4+vcDgFPO4/PatotQV/rmiIuE/1RixlOFdvqnlJvl9u7
+htrSi6NLIjR7L8TNhRlKYm+EDfjnuliQdnjul6xI0Zjk4Ud/GLoUru9oUTv3s3zZ
+4pUEGBZ1TX8qAJoMbmXAsoPMQ3dDbda+DqEcKH4Varap0z9FpZx6KWDoZqIcREn/
+vAylGywduxXIKxVCbJ5Fhh44dNOXTaNHV51pej+ZTonvG4Re8LIlAXMsOwdxQgDl
+z7FQyI+/AgMBAAECggEBAJX/CiGMbhQKaNgQseVKIoGcGYKMsBGjpctH7UZ3SJqw
+IWSdTOAQaUeoXnKhlRIxekdarnTUYvdyvI7aOJD/LcsNf9yU8LJWRkIXuaR6LKky
+vqYTnS5DwcapUmOmp7eobesAh9US+KKEDANWNNjEVDkvMStsNsLMI87CZTy8dqbN
+lGWXkhoE2qmO622kWNZmUpWLt0trNt3eCgVni6yyepgdsg762g+yKMSqkrjI2nh8
+fPrFpoe8Az62EqIpvOz41t7TzlLyu+/l60lDZlgT+Uxx/hQ+R2UHHzx3Ri+Kgk+D
+zsrOvSO10ZJ2qtHRsUOZhgay8VqQ4OZkDdSciARtB8kCgYEA7ecpXmAE1wXEHe6H
+Y/DzcxbLuHpbFaK6xCsGzyrHPVBUUZR0dfrsvoqm+u44sFleSw1iyaSxA8TNltcL
+4cYHojOVhjEu5JQlmh5YU5orjOklzkrjonFJJHRUDvjG5j//bE0bBL2iN2fkL/7j
+4sfHXn6dg8qtaV4RwxH84JHJbxMCgYEA6+buQVFuBdlxcLp8uQwKeS5MdkbJMHKq
+OPOh3wBqklNqN2rCLsCrrMdIGBmVle255sD9Z8FZq8BQwJJw9UUT5jFwUf8bHC26
+qFOIV82i0kscApXaxGXOJwVhEHLeW6Dn88osv5H7aNE425x2Y/QrQLqW1jZua6an
+XBw2WuH8tiUCgYEAsVE9TUFF+joq/aA+u2fpHFveRca0wwCCMhpbveeFjxajchaz
+Ywg+kppncNpD2HUTyd7VRbQB1+xEy+vGyGXAZM4L4XQhHm+pQyDg9pcPZLyV2BeL
+aRUEzi4CRRJ5tT34E/G4dKUfFirSMk/J7Mq4t56pqoRTEhjyJjHvCDbBK48CgYBa
+/g2CtmUo7nG6WMSJICLeEUS/DpjGDkSoiRk0ClYRMQm0bIKQRBM0Jv4hBaVUWokt
+f91+6u6quBit3w6hHM8LKKC5kBwl52GrUeUycQhP81bPjHwA63/0Pzfsf1JTp6Iw
+wBg4oJeIG8PBuf1UmrcgVZie8gnvji3Z8qvorGis3QKBgHlw4CyOATXWHA/HPa8S
+LEa8jgbXcLBZIjUEASYYVJGDcwsJtgL6FuTt0t0CvNrbv+0s7PkVX899ROtdmiQ0
+KZVNjx3MR1bflhnTix40JSntdDpNmD0tmdXe3k9POdIddwa+HURwcTQnSsqE+u6W
+haHxZbOfq2BOo6ASJYYFVl6y
+-----END PRIVATE KEY-----
diff --git a/...roker/src/main/resources/keystore/mmq.pfx → distribution/conf/cert/mmq.pfx b/...roker/src/main/resources/keystore/mmq.pfx → distribution/conf/cert/mmq.pfx
diff --git a/mmq-api/.flattened-pom.xml b/mmq-api/.flattened-pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.monkey.mmq</groupId>
     <artifactId>mmq</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>org.monkey.mmq</groupId>
   <artifactId>mmq-api</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>

diff --git a/mmq-auth/.flattened-pom.xml b/mmq-auth/.flattened-pom.xml
@@ -20,11 +20,11 @@
   <parent>
     <groupId>org.monkey.mmq</groupId>
     <artifactId>mmq</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>org.monkey.mmq</groupId>
   <artifactId>mmq-auth</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -36,13 +36,13 @@
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-core</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-config</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/mmq-broker/.flattened-pom.xml b/mmq-broker/.flattened-pom.xml
@@ -20,11 +20,11 @@
   <parent>
     <groupId>org.monkey.mmq</groupId>
     <artifactId>mmq</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>org.monkey.mmq</groupId>
   <artifactId>mmq-broker</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -64,19 +64,19 @@
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-core</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-auth</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-config</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/mmq-broker/src/main/java/org/monkey/mmq/config/BrokerProperties.java b/mmq-broker/src/main/java/org/monkey/mmq/config/BrokerProperties.java
@@ -41,20 +41,16 @@ public class BrokerProperties {
 	private static final String MMQ_BROKER_WEBSOCKET_SSL_PROPERTY = "mmq.broker.ssl.websocketPort";
 	private static final String DEFAULT_MMQ_BROKER_SSL_WEBSOCKET = "2663";
 
-	/**
-	 * WebSocket Path值, 默认值 /mqtt
-	 */
-	private String websocketPath = "/mqtt";
+	private static final String MMQ_BROKER_SSL_PASSWORD = "mmq.broker.ssl.password";
+	private static final String DEFAULT_MMQ_BROKER_SSL_PASSWORD = "mmq";
 
-	/**
-	 * SSL密钥文件密码
-	 */
-	private String sslPassword = "mmq";
+	private static final String MMQ_BROKER_SSL_CERT_PATH = "mmq.broker.ssl.certPath";
+	private static final String DEFAULT_MMQ_BROKER_SSL_CERT_PATH  = "cert/mmq.pfx";
 
 	/**
-	 * SSL是否启用
+	 * WebSocket Path值, 默认值 /mqtt
 	 */
-	private boolean sslEnabled = false;
+	private String websocketPath = "/mqtt";
 
 	/**
 	 * 心跳时间(秒), 默认60秒, 该值可被客户端连接时相应配置覆盖
@@ -97,11 +93,11 @@ public String getWebsocketPath() {
 	}
 
 	public String getSslPassword() {
-		return sslPassword;
+		return EnvUtil.getProperty(MMQ_BROKER_SSL_PASSWORD, DEFAULT_MMQ_BROKER_SSL_PASSWORD);
 	}
 
-	public boolean getSslEnabled() {
-		return sslEnabled;
+	public String getSslCertPath() {
+		return EnvUtil.getProperty(MMQ_BROKER_SSL_CERT_PATH, DEFAULT_MMQ_BROKER_SSL_CERT_PATH);
 	}
 
 	public int getKeepAlive() {

diff --git a/mmq-broker/src/main/java/org/monkey/mmq/protocol/SSLBrokerServer.java b/mmq-broker/src/main/java/org/monkey/mmq/protocol/SSLBrokerServer.java
@@ -89,7 +89,7 @@ public void start() throws Exception {
 		bossGroup = brokerProperties.isUseEpoll() ? new EpollEventLoopGroup() : new NioEventLoopGroup();
 		workerGroup = brokerProperties.isUseEpoll() ? new EpollEventLoopGroup() : new NioEventLoopGroup();
 		KeyStore keyStore = KeyStore.getInstance("PKCS12");
-		InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("keystore/mmq.pfx");
+		InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(brokerProperties.getSslCertPath());
 		keyStore.load(inputStream, brokerProperties.getSslPassword().toCharArray());
 		KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
 		kmf.init(keyStore, brokerProperties.getSslPassword().toCharArray());
@@ -101,7 +101,7 @@ public void start() throws Exception {
 
 	@PreDestroy
 	public void stop() {
-		LoggerUtils.printIfInfoEnabled(Loggers.BROKER_PROTOCOL,"Shutdown {} MQTT Broker ...", "[" +id + "]");
+		LoggerUtils.printIfInfoEnabled(Loggers.BROKER_PROTOCOL,"Shutdown {} MQTT SSL Broker ...", "[" +id + "]");
 		bossGroup.shutdownGracefully();
 		bossGroup = null;
 		workerGroup.shutdownGracefully();
@@ -110,7 +110,7 @@ public void stop() {
 		channel = null;
 		websocketChannel.closeFuture().syncUninterruptibly();
 		websocketChannel = null;
-		LoggerUtils.printIfInfoEnabled(Loggers.BROKER_PROTOCOL,"MQTT Broker {} shutdown finish.", "[" + id + "]");
+		LoggerUtils.printIfInfoEnabled(Loggers.BROKER_PROTOCOL,"MQTT SSL Broker {} shutdown finish.", "[" + id + "]");
 	}
 
 	private void mqttServer() throws Exception {
@@ -133,6 +133,9 @@ protected void initChannel(SocketChannel socketChannel) throws Exception {
 					sslEngine.setNeedClientAuth(false);        // 不需要验证客户端
 					sslEngine.setEnabledCipherSuites(new String[]{
 							"TLS_RSA_WITH_AES_256_CBC_SHA256",
+							"SSL_RSA_WITH_RC4_128_MD5",
+							"SSL_RSA_WITH_RC4_128_SHA",
+							"TLS_RSA_WITH_AES_128_CBC_SHA",
 							"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
 							"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
 					});
@@ -171,6 +174,9 @@ protected void initChannel(SocketChannel socketChannel) throws Exception {
 					sslEngine.setNeedClientAuth(false);        // 不需要验证客户端
 					sslEngine.setEnabledCipherSuites(new String[]{
 							"TLS_RSA_WITH_AES_256_CBC_SHA256",
+							"SSL_RSA_WITH_RC4_128_MD5",
+							"SSL_RSA_WITH_RC4_128_SHA",
+							"TLS_RSA_WITH_AES_128_CBC_SHA",
 							"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA",
 							"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256"
 					});

diff --git a/mmq-broker/src/main/resources/application.properties b/mmq-broker/src/main/resources/application.properties
@@ -24,6 +24,7 @@ server.port=8888
 mmq.broker.websocketPort=2883
 mmq.broker.port=3883
 mmq.broker.ssl.password=mmq
+mmq.broker.ssl.certPath=cert/mmq.pfx
 mmq.broker.ssl.port=3663
 mmq.broker.ssl.websocketPort=2663
 mmq.broker.default.user=admin

diff --git a/mmq-broker/src/main/resources/cert/mmq.cer b/mmq-broker/src/main/resources/cert/mmq.cer
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDozCCAougAwIBAgIUUJo/Ll3YJtLB6UDKoZ9H3k1BAQYwDQYJKoZIhvcNAQEL
+BQAwYTELMAkGA1UEBhMCQ04xEDAOBgNVBAgMB1FpbmdkYW8xEDAOBgNVBAcMB1Fp
+bmdkYW8xDzANBgNVBAoMBk1vbmtleTEPMA0GA1UECwwGTW9ua2V5MQwwCgYDVQQD
+DANtbXEwHhcNMjExMjE0MTUyODQyWhcNMjIxMjE0MTUyODQyWjBhMQswCQYDVQQG
+EwJDTjEQMA4GA1UECAwHUWluZ2RhbzEQMA4GA1UEBwwHUWluZ2RhbzEPMA0GA1UE
+CgwGTW9ua2V5MQ8wDQYDVQQLDAZNb25rZXkxDDAKBgNVBAMMA21tcTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBANs5zhJowlbQlHMgVIc8hUVXCoCu8MmH
+Oi+0DMGb3oKvQdjLS/eDI5uZNAhKK6Caz0FMzYvWOzmQEXS56BMW8wB1WWj6Ifb8
+N+Hj69wOAU87j89q2i1BX+uaIi4T/VGLGU4V2+qeUm+X27uG2tKLo0siNHsvxM2F
+GUpib4QN+Oe6WJB2eO6XrEjRmOThR38YuhSu72hRO/ezfNnilQQYFnVNfyoAmgxu
+ZcCyg8xDd0Nt1r4OoRwofhVqtqnTP0WlnHopYOhmohxESf+8DKUbLB27FcgrFUJs
+nkWGHjh005dNo0dXnWl6P5lOie8bhF7wsiUBcyw7B3FCAOXPsVDIj78CAwEAAaNT
+MFEwHQYDVR0OBBYEFNfgQ7dJ0JGkvvMF4Roi5Qq870hgMB8GA1UdIwQYMBaAFNfg
+Q7dJ0JGkvvMF4Roi5Qq870hgMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBACnWx9DpFhyVXgWhm4/ttXNryo5wUD1AREiuP929V25pva6NfEvmlBoe
+J3/KrExIK3c6dIdSaf+fVjHtXf32kROvVOV2BsRcMScJuhRS2e50rkeWjfwlqEU4
+ERsNmObjpIMBg9Zn4v0TaByzJ+sS7tDVhPPcAnw+PuF5wJJX2dXOuQJKeFlVIxf5
+75yNggRTot07L3a4S+DDsSEkv0sX4OyDRl7EySNDy6+aq9QgUZNBj57X8PMdZXOq
+xc5dOVsoS+55nxqhQ9vF4YC2UKnxi0kNBAjTKipAQvqst8DilBIrS/LX8Dimqo0a
+obZtPSgMsMTpQLt+5pRhymh3UKoZ/CI=
+-----END CERTIFICATE-----
diff --git a/mmq-broker/src/main/resources/cert/mmq.key b/mmq-broker/src/main/resources/cert/mmq.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbOc4SaMJW0JRz
+IFSHPIVFVwqArvDJhzovtAzBm96Cr0HYy0v3gyObmTQISiugms9BTM2L1js5kBF0
+uegTFvMAdVlo+iH2/Dfh4+vcDgFPO4/PatotQV/rmiIuE/1RixlOFdvqnlJvl9u7
+htrSi6NLIjR7L8TNhRlKYm+EDfjnuliQdnjul6xI0Zjk4Ud/GLoUru9oUTv3s3zZ
+4pUEGBZ1TX8qAJoMbmXAsoPMQ3dDbda+DqEcKH4Varap0z9FpZx6KWDoZqIcREn/
+vAylGywduxXIKxVCbJ5Fhh44dNOXTaNHV51pej+ZTonvG4Re8LIlAXMsOwdxQgDl
+z7FQyI+/AgMBAAECggEBAJX/CiGMbhQKaNgQseVKIoGcGYKMsBGjpctH7UZ3SJqw
+IWSdTOAQaUeoXnKhlRIxekdarnTUYvdyvI7aOJD/LcsNf9yU8LJWRkIXuaR6LKky
+vqYTnS5DwcapUmOmp7eobesAh9US+KKEDANWNNjEVDkvMStsNsLMI87CZTy8dqbN
+lGWXkhoE2qmO622kWNZmUpWLt0trNt3eCgVni6yyepgdsg762g+yKMSqkrjI2nh8
+fPrFpoe8Az62EqIpvOz41t7TzlLyu+/l60lDZlgT+Uxx/hQ+R2UHHzx3Ri+Kgk+D
+zsrOvSO10ZJ2qtHRsUOZhgay8VqQ4OZkDdSciARtB8kCgYEA7ecpXmAE1wXEHe6H
+Y/DzcxbLuHpbFaK6xCsGzyrHPVBUUZR0dfrsvoqm+u44sFleSw1iyaSxA8TNltcL
+4cYHojOVhjEu5JQlmh5YU5orjOklzkrjonFJJHRUDvjG5j//bE0bBL2iN2fkL/7j
+4sfHXn6dg8qtaV4RwxH84JHJbxMCgYEA6+buQVFuBdlxcLp8uQwKeS5MdkbJMHKq
+OPOh3wBqklNqN2rCLsCrrMdIGBmVle255sD9Z8FZq8BQwJJw9UUT5jFwUf8bHC26
+qFOIV82i0kscApXaxGXOJwVhEHLeW6Dn88osv5H7aNE425x2Y/QrQLqW1jZua6an
+XBw2WuH8tiUCgYEAsVE9TUFF+joq/aA+u2fpHFveRca0wwCCMhpbveeFjxajchaz
+Ywg+kppncNpD2HUTyd7VRbQB1+xEy+vGyGXAZM4L4XQhHm+pQyDg9pcPZLyV2BeL
+aRUEzi4CRRJ5tT34E/G4dKUfFirSMk/J7Mq4t56pqoRTEhjyJjHvCDbBK48CgYBa
+/g2CtmUo7nG6WMSJICLeEUS/DpjGDkSoiRk0ClYRMQm0bIKQRBM0Jv4hBaVUWokt
+f91+6u6quBit3w6hHM8LKKC5kBwl52GrUeUycQhP81bPjHwA63/0Pzfsf1JTp6Iw
+wBg4oJeIG8PBuf1UmrcgVZie8gnvji3Z8qvorGis3QKBgHlw4CyOATXWHA/HPa8S
+LEa8jgbXcLBZIjUEASYYVJGDcwsJtgL6FuTt0t0CvNrbv+0s7PkVX899ROtdmiQ0
+KZVNjx3MR1bflhnTix40JSntdDpNmD0tmdXe3k9POdIddwa+HURwcTQnSsqE+u6W
+haHxZbOfq2BOo6ASJYYFVl6y
+-----END PRIVATE KEY-----
diff --git a/mmq-broker/src/main/resources/cert/mmq.pfx b/mmq-broker/src/main/resources/cert/mmq.pfx
diff --git a/mmq-config/.flattened-pom.xml b/mmq-config/.flattened-pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.monkey.mmq</groupId>
     <artifactId>mmq</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
   </parent>
   <groupId>org.monkey.mmq</groupId>
   <artifactId>mmq-config</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-core</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.monkey.mmq</groupId>
       <artifactId>mmq-rule-engine</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>