新增用户名密码加密 TSG-8835

6 files changed, 26 insertions, 16 deletions

diff --git a/pom.xml b/pom.xml
index 64defb4..003d904 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zdjizhi</groupId>
     <artifactId>log-stream-voip-relation</artifactId>
-    <version>220309-inner</version>
+    <version>220316-encryption</version>
 
     <name>log-stream-voip-relation</name>
     <url>http://www.example.com</url>
@@ -236,6 +236,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/org.jasypt/jasypt -->
+        <dependency>
+            <groupId>org.jasypt</groupId>
+            <artifactId>jasypt</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+
     </dependencies>
 </project>
 
diff --git a/properties/default_config.properties b/properties/default_config.properties
index 772658e..158577b 100644
--- a/properties/default_config.properties
+++ b/properties/default_config.properties
@@ -28,12 +28,11 @@ buffer.memory=134217728
 #10M
 max.request.size=10485760
 #====================kafka default====================#
-#kafka SASL验证用户名
-kafka.user=admin
-
-#kafka SASL及SSL验证密码
-kafka.pin=galaxy2019
+#kafka SASL验证用户名-加密
+kafka.user=nsyGpHKGFA4KW0zro9MDdw==
 
+#kafka SASL及SSL验证密码-加密
+kafka.pin=6MleDyA3Z73HSaXiKsDJ2k7Ys8YWLhEJ
 #====================Topology Default====================#
 #check ip is Inner network;0 off, 1 on.
 check.inner.network=1
diff --git a/properties/service_flow_config.properties b/properties/service_flow_config.properties
index 2b49df7..85d3d17 100644
--- a/properties/service_flow_config.properties
+++ b/properties/service_flow_config.properties
@@ -8,7 +8,7 @@ sink.kafka.servers=192.168.44.12:9094
 
 #--------------------------------HTTP------------------------------#
 #定位库地址
-tools.library=D:\\workerspace\\dat
+tools.library=D:\\workerspace\\dat\\
 
 #网关的schema位置
 schema.http=http://192.168.44.67:9999/metadata/schema/v1/fields/voip_record
diff --git a/src/main/java/com/zdjizhi/common/VoipRelationConfig.java b/src/main/java/com/zdjizhi/common/VoipRelationConfig.java
index 1a2f78e..41884b9 100644
--- a/src/main/java/com/zdjizhi/common/VoipRelationConfig.java
+++ b/src/main/java/com/zdjizhi/common/VoipRelationConfig.java
@@ -2,12 +2,19 @@ package com.zdjizhi.common;
 
 
 import com.zdjizhi.utils.system.VoipRelationConfigurations;
+import org.jasypt.encryption.pbe.StandardPBEStringEncryptor;
 
 /**
  * @author Administrator
  */
 public class VoipRelationConfig {
 
+    private static StandardPBEStringEncryptor encryptor = new StandardPBEStringEncryptor();
+
+    static {
+        encryptor.setPassword("galaxy");
+    }
+
     /**
      * 四元组的拼接连接字符
      */
@@ -33,8 +40,8 @@ public class VoipRelationConfig {
     public static final String GROUP_ID = VoipRelationConfigurations.getStringProperty(0, "group.id");
     public static final String PRODUCER_ACK = VoipRelationConfigurations.getStringProperty(0, "producer.ack");
     public static final String PRODUCER_KAFKA_COMPRESSION_TYPE = VoipRelationConfigurations.getStringProperty(0, "producer.kafka.compression.type");
-    public static final String KAFKA_USER = VoipRelationConfigurations.getStringProperty(1, "kafka.user");
-    public static final String KAFKA_PIN = VoipRelationConfigurations.getStringProperty(1, "kafka.pin");
+    public static final String KAFKA_SASL_JAAS_USER = encryptor.decrypt(VoipRelationConfigurations.getStringProperty(1, "kafka.user"));
+    public static final String KAFKA_SASL_JAAS_PIN = encryptor.decrypt(VoipRelationConfigurations.getStringProperty(1, "kafka.pin"));
 
     /**
      * kafka source config
@@ -52,8 +59,6 @@ public class VoipRelationConfig {
     public static final Integer BATCH_SIZE = VoipRelationConfigurations.getIntProperty(1, "batch.size");
     public static final Integer BUFFER_MEMORY = VoipRelationConfigurations.getIntProperty(1, "buffer.memory");
     public static final Integer MAX_REQUEST_SIZE = VoipRelationConfigurations.getIntProperty(1, "max.request.size");
-    public static final String KAFKA_SOURCE_PROTOCOL = VoipRelationConfigurations.getStringProperty(1, "kafka.source.protocol");
-    public static final String KAFKA_SINK_PROTOCOL = VoipRelationConfigurations.getStringProperty(1, "kafka.sink.protocol");
     public static final String TOOLS_LIBRARY = VoipRelationConfigurations.getStringProperty(0, "tools.library");
 
     /**
diff --git a/src/main/java/com/zdjizhi/utils/functions/SipCalibrationWindowFunction.java b/src/main/java/com/zdjizhi/utils/functions/SipCalibrationWindowFunction.java
index 3718775..8b92c10 100644
--- a/src/main/java/com/zdjizhi/utils/functions/SipCalibrationWindowFunction.java
+++ b/src/main/java/com/zdjizhi/utils/functions/SipCalibrationWindowFunction.java
@@ -56,7 +56,6 @@ public class SipCalibrationWindowFunction extends ProcessAllWindowFunction<Tuple
 
     @Override
     public void process(Context context, Iterable<Tuple3<String, String, String>> input, Collector<String> output) throws Exception {
-        logger.error("windowall窗口运行");
         for (Tuple3<String, String, String> tuple : input) {
             //拼接的四元组
             String fourKey = tuple.f0;
diff --git a/src/main/java/com/zdjizhi/utils/kafka/CertUtils.java b/src/main/java/com/zdjizhi/utils/kafka/CertUtils.java
index b5273fa..808723a 100644
--- a/src/main/java/com/zdjizhi/utils/kafka/CertUtils.java
+++ b/src/main/java/com/zdjizhi/utils/kafka/CertUtils.java
@@ -33,15 +33,15 @@ class CertUtils {
             properties.put("security.protocol", "SASL_PLAINTEXT");
             properties.put("sasl.mechanism", "PLAIN");
             properties.put("sasl.jaas.config", "org.apache.kafka.common.security.plain.PlainLoginModule required username="
-                    + VoipRelationConfig.KAFKA_USER + " password=" + VoipRelationConfig.KAFKA_PIN + ";");
+                    + VoipRelationConfig.KAFKA_SASL_JAAS_USER + " password=" + VoipRelationConfig.KAFKA_SASL_JAAS_PIN + ";");
         } else if (servers.contains(SSL_PORT)) {
             properties.put("security.protocol", "SSL");
             properties.put(SslConfigs.SSL_ENDPOINT_IDENTIFICATION_ALGORITHM_CONFIG, "");
             properties.put("ssl.keystore.location", VoipRelationConfig.TOOLS_LIBRARY + "keystore.jks");
-            properties.put("ssl.keystore.password", VoipRelationConfig.KAFKA_PIN);
+            properties.put("ssl.keystore.password", VoipRelationConfig.KAFKA_SASL_JAAS_PIN);
             properties.put("ssl.truststore.location", VoipRelationConfig.TOOLS_LIBRARY + "truststore.jks");
-            properties.put("ssl.truststore.password", VoipRelationConfig.KAFKA_PIN);
-            properties.put("ssl.key.password", VoipRelationConfig.KAFKA_PIN);
+            properties.put("ssl.truststore.password", VoipRelationConfig.KAFKA_SASL_JAAS_PIN);
+            properties.put("ssl.key.password", VoipRelationConfig.KAFKA_SASL_JAAS_PIN);
         }
 
     }