This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 114f1db62 [type:refactor] refactor log module (#4526)
114f1db62 is described below
commit 114f1db623a7829c0fed03722bd5bae293587c68
Author: moremind <[email protected]>
AuthorDate: Mon Apr 3 11:58:40 2023 +0800
[type:refactor] refactor log module (#4526)
* [type:refactor] rename log module
* [type:refactor] rename log module
* [type:refactor] rename log module
---------
Co-authored-by: xiaoyu <[email protected]>
---
shenyu-plugin/shenyu-plugin-logging/pom.xml | 2 +-
.../sls/collector/AliyunSlsLogCollector.java | 4 +-
.../collector/ClickHouseLogCollector.java | 4 +-
.../shenyu-plugin-logging-common/pom.xml | 2 +-
.../logging/common/AbstractLoggingPlugin.java | 16 +--
.../common/body/LoggingServerHttpResponse.java | 30 +++---
.../common/collector/AbstractLogCollector.java | 74 ++++++-------
.../logging/common/collector/LogCollector.java | 8 +-
.../common/entity/CommonLoggingRuleHandle.java | 28 ++---
.../logging/console/LoggingConsolePlugin.java | 46 ++++----
.../pom.xml | 2 +-
.../api/enums/DataDesensitizeEnum.java} | 20 ++--
.../api/factory/DataDesensitizeFactory.java} | 22 ++--
.../desensitize}/api/matcher/KeyWordMatch.java | 2 +-
.../api/spi/AbstractShenyuDataDesensitize.java} | 16 +--
.../api/spi/CharacterReplaceDataDesensitize.java} | 18 ++--
.../api/spi/Md5EncryptDataDesensitize.java} | 8 +-
.../api/spi/ShenyuDataDesensitize.java} | 12 +--
.../api/utils/DataDesensitizeUtils.java | 120 +++++++++++++++++++++
...ging.desensitize.api.spi.ShenyuDataDesensitize} | 4 +-
.../api/factory/DataDesensitizeFactoryTest.java} | 16 +--
.../desensitize}/api/matcher/KeyWordMatchTest.java | 2 +-
.../spi/CharacterReplaceDataDesensitizeTest.java} | 16 +--
.../api/spi/Md5EncryptDataDesensitizeTest.java} | 10 +-
.../api/utils/DataDesensitizeUtilsTest.java} | 38 +++----
.../collector/ElasticSearchLogCollector.java | 4 +-
.../logging/kafka/collector/KafkaLogCollector.java | 4 +-
.../logging/mask/api/utils/DataMaskUtils.java | 120 ---------------------
.../pulsar/collector/PulsarLogCollector.java | 4 +-
.../rocketmq/collector/RocketMQLogCollector.java | 4 +-
.../cls/collector/TencentClsSlsLogCollector.java | 4 +-
31 files changed, 330 insertions(+), 330 deletions(-)
diff --git a/shenyu-plugin/shenyu-plugin-logging/pom.xml
b/shenyu-plugin/shenyu-plugin-logging/pom.xml
index 9f5c2faa1..afb705c64 100644
--- a/shenyu-plugin/shenyu-plugin-logging/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-logging/pom.xml
@@ -36,6 +36,6 @@
<module>shenyu-plugin-logging-pulsar</module>
<module>shenyu-plugin-logging-tencent-cls</module>
<module>shenyu-plugin-logging-clickhouse</module>
- <module>shenyu-plugin-logging-mask-api</module>
+ <module>shenyu-plugin-logging-desensitize-api</module>
</modules>
</project>
\ No newline at end of file
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
index c9011c28e..469dd0faa 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-aliyun-sls/src/main/java/org/apache/shenyu/plugin/aliyun/sls/collector/AliyunSlsLogCollector.java
@@ -22,7 +22,7 @@ import
org.apache.shenyu.plugin.aliyun.sls.handler.LoggingAliyunSlsPluginDataHan
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
/**
* aliyun sls log collector，depend a LogConsumeClient for consume logs.
@@ -46,6 +46,6 @@ public class AliyunSlsLogCollector extends
AbstractLogCollector<AliyunSlsLogColl
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
index 6018c7369..0a4fcd3d2 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-clickhouse/src/main/java/org/apache/shenyu/plugin/logging/clickhouse/collector/ClickHouseLogCollector.java
@@ -22,7 +22,7 @@ import
org.apache.shenyu.plugin.logging.clickhouse.handler.LoggingClickHousePlug
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
public class ClickHouseLogCollector extends
AbstractLogCollector<ClickHouseLogCollectClient, ShenyuRequestLog> {
@@ -43,6 +43,6 @@ public class ClickHouseLogCollector extends
AbstractLogCollector<ClickHouseLogCo
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/pom.xml
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/pom.xml
index e9e3950d4..299d339b6 100644
--- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/pom.xml
+++ b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/pom.xml
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.apache.shenyu</groupId>
- <artifactId>shenyu-plugin-logging-mask-api</artifactId>
+ <artifactId>shenyu-plugin-logging-desensitize-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/AbstractLoggingPlugin.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/AbstractLoggingPlugin.java
index 3c190e3f9..843bd0317 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/AbstractLoggingPlugin.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/AbstractLoggingPlugin.java
@@ -34,7 +34,7 @@ import
org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import
org.apache.shenyu.plugin.logging.common.handler.AbstractLogPluginDataHandler;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectConfigUtils;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectUtils;
-import org.apache.shenyu.plugin.logging.mask.api.enums.DataMaskEnums;
+import
org.apache.shenyu.plugin.logging.desensitize.api.enums.DataDesensitizeEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -55,7 +55,7 @@ public abstract class AbstractLoggingPlugin<L extends
ShenyuRequestLog> extends
private static final Logger LOG =
LoggerFactory.getLogger(AbstractLoggingPlugin.class);
- private static String dataMaskAlg;
+ private static String dataDesensitizeAlg;
/**
* LogCollector.
@@ -85,15 +85,15 @@ public abstract class AbstractLoggingPlugin<L extends
ShenyuRequestLog> extends
public Mono<Void> doExecute(final ServerWebExchange exchange, final
ShenyuPluginChain chain,
final SelectorData selector, final RuleData
rule) {
CommonLoggingRuleHandle commonLoggingRuleHandle =
AbstractLogPluginDataHandler.CACHED_HANDLE.get().obtainHandle(CacheKeyUtils.INST.getKey(rule));
- boolean masked = false;
+ boolean desensitized = false;
Set<String> keywordSets = Sets.newHashSet();
if (Objects.nonNull(commonLoggingRuleHandle)) {
String keywords = commonLoggingRuleHandle.getKeyword();
- masked = StringUtils.isNotBlank(keywords) &&
commonLoggingRuleHandle.getMaskStatus();
- if (masked) {
+ desensitized = StringUtils.isNotBlank(keywords) &&
commonLoggingRuleHandle.getMaskStatus();
+ if (desensitized) {
Collections.addAll(keywordSets, keywords.split(";"));
- dataMaskAlg =
Optional.ofNullable(commonLoggingRuleHandle.getMaskType()).orElse(DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
- LOG.info("current plugin:{}, keyword:{}, dataMaskAlg:{}",
pluginEnum().getName(), keywords, dataMaskAlg);
+ dataDesensitizeAlg =
Optional.ofNullable(commonLoggingRuleHandle.getMaskType()).orElse(DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
+ LOG.info("current plugin:{}, keyword:{},
dataDesensitizeAlg:{}", pluginEnum().getName(), keywords, dataDesensitizeAlg);
}
}
ServerHttpRequest request = exchange.getRequest();
@@ -112,7 +112,7 @@ public abstract class AbstractLoggingPlugin<L extends
ShenyuRequestLog> extends
requestInfo.setPath(request.getURI().getPath());
LoggingServerHttpRequest<L> loggingServerHttpRequest = new
LoggingServerHttpRequest<>(request, requestInfo);
LoggingServerHttpResponse<L> loggingServerHttpResponse = new
LoggingServerHttpResponse<>(exchange.getResponse(),
- requestInfo, this.logCollector(), masked, keywordSets,
dataMaskAlg);
+ requestInfo, this.logCollector(), desensitized, keywordSets,
dataDesensitizeAlg);
ServerWebExchange webExchange =
exchange.mutate().request(loggingServerHttpRequest)
.response(loggingServerHttpResponse).build();
loggingServerHttpResponse.setExchange(webExchange);
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/body/LoggingServerHttpResponse.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/body/LoggingServerHttpResponse.java
index cbacd6d9b..05d42826d 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/body/LoggingServerHttpResponse.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/body/LoggingServerHttpResponse.java
@@ -29,7 +29,7 @@ import
org.apache.shenyu.plugin.logging.common.constant.GenericLoggingConstant;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectConfigUtils;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectUtils;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -67,9 +67,9 @@ public class LoggingServerHttpResponse<L extends
ShenyuRequestLog> extends Serve
private final LogCollector<L> logCollector;
- private final boolean maskFlag;
+ private final boolean desensitized;
- private final String dataMaskAlg;
+ private final String dataDesensitizeAlg;
private final KeyWordMatch keyWordMatch;
@@ -79,18 +79,18 @@ public class LoggingServerHttpResponse<L extends
ShenyuRequestLog> extends Serve
* @param delegate delegate ServerHttpResponse
* @param logInfo access log
* @param logCollector LogCollector instance
- * @param maskFlag mask flag
+ * @param desensitized desensitize flag
* @param keyWordSet user keyWord set
- * @param dataMaskAlg mask function
+ * @param dataDesensitizeAlg desensitize function
*/
public LoggingServerHttpResponse(final ServerHttpResponse delegate, final
L logInfo,
- final LogCollector<L> logCollector, final
boolean maskFlag,
- final Set<String> keyWordSet, final
String dataMaskAlg) {
+ final LogCollector<L> logCollector, final
boolean desensitized,
+ final Set<String> keyWordSet, final
String dataDesensitizeAlg) {
super(delegate);
this.logInfo = logInfo;
this.logCollector = logCollector;
- this.maskFlag = maskFlag;
- this.dataMaskAlg = dataMaskAlg;
+ this.desensitized = desensitized;
+ this.dataDesensitizeAlg = dataDesensitizeAlg;
this.keyWordMatch = new KeyWordMatch(keyWordSet);
}
@@ -167,9 +167,9 @@ public class LoggingServerHttpResponse<L extends
ShenyuRequestLog> extends Serve
}
// collect log
if (Objects.nonNull(logCollector)) {
- // mask log
- if (maskFlag) {
- logCollector.mask(logInfo, keyWordMatch, dataMaskAlg);
+ // desensitize log
+ if (desensitized) {
+ logCollector.desensitize(logInfo, keyWordMatch,
dataDesensitizeAlg);
}
logCollector.collect(logInfo);
}
@@ -253,9 +253,9 @@ public class LoggingServerHttpResponse<L extends
ShenyuRequestLog> extends Serve
}
// collect log
if (Objects.nonNull(logCollector)) {
- // mask log
- if (maskFlag) {
- logCollector.mask(logInfo, keyWordMatch, dataMaskAlg);
+ // desensitize log
+ if (desensitized) {
+ logCollector.desensitize(logInfo, keyWordMatch,
dataDesensitizeAlg);
}
logCollector.collect(logInfo);
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
index 5f443d5f6..bd0954aca 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/AbstractLogCollector.java
@@ -28,7 +28,7 @@ import
org.apache.shenyu.plugin.logging.common.client.AbstractLogConsumeClient;
import org.apache.shenyu.plugin.logging.common.constant.GenericLoggingConstant;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.logging.common.utils.LogCollectConfigUtils;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,8 +42,8 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import static
org.apache.shenyu.plugin.logging.mask.api.utils.DataMaskUtils.maskForBody;
-import static
org.apache.shenyu.plugin.logging.mask.api.utils.DataMaskUtils.maskForSingleWord;
+import static
org.apache.shenyu.plugin.logging.desensitize.api.utils.DataDesensitizeUtils.desensitizeForBody;
+import static
org.apache.shenyu.plugin.logging.desensitize.api.utils.DataDesensitizeUtils.desensitizeForSingleWord;
/**
* abstract log collector,Contains common methods.
@@ -87,9 +87,9 @@ public abstract class AbstractLogCollector<T extends
AbstractLogConsumeClient<?,
}
@Override
- public void mask(final L logInfo, final KeyWordMatch keyWordMatch, final
String dataMaskAlg) {
- this.maskShenyuRequestLog(logInfo, keyWordMatch, dataMaskAlg);
- this.maskLog(logInfo, keyWordMatch, dataMaskAlg);
+ public void desensitize(final L logInfo, final KeyWordMatch keyWordMatch,
final String desensitizeAlg) {
+ this.desensitizeShenyuRequestLog(logInfo, keyWordMatch,
desensitizeAlg);
+ this.desensitizeLog(logInfo, keyWordMatch, desensitizeAlg);
}
/**
@@ -121,34 +121,34 @@ public abstract class AbstractLogCollector<T extends
AbstractLogConsumeClient<?,
}
}
- private void maskShenyuRequestLog(final L logInfo, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
-
logInfo.setClientIp(maskForSingleWord(GenericLoggingConstant.CLIENT_IP,
logInfo.getClientIp(), keyWordMatch, dataMaskAlg));
-
logInfo.setTimeLocal(maskForSingleWord(GenericLoggingConstant.TIME_LOCAL,
logInfo.getTimeLocal(), keyWordMatch, dataMaskAlg));
- logInfo.setMethod(maskForSingleWord(GenericLoggingConstant.METHOD,
logInfo.getMethod(), keyWordMatch, dataMaskAlg));
-
logInfo.setRequestUri(maskForSingleWord(GenericLoggingConstant.REQUEST_URI,
logInfo.getRequestUri(), keyWordMatch, dataMaskAlg));
-
logInfo.setResponseContentLength(Integer.valueOf(maskForSingleWord(GenericLoggingConstant.RESPONSE_CONTENT_LENGTH,
- logInfo.getResponseContentLength().toString(), keyWordMatch,
dataMaskAlg)));
- logInfo.setRpcType(maskForSingleWord(GenericLoggingConstant.RPC_TYPE,
logInfo.getRpcType(), keyWordMatch, dataMaskAlg));
-
logInfo.setStatus(Integer.valueOf(maskForSingleWord(GenericLoggingConstant.STATUS,
logInfo.getStatus().toString(), keyWordMatch, dataMaskAlg)));
-
logInfo.setUpstreamIp(maskForSingleWord(GenericLoggingConstant.UP_STREAM_IP,
logInfo.getUpstreamIp(), keyWordMatch, dataMaskAlg));
-
logInfo.setUpstreamResponseTime(Long.valueOf(maskForSingleWord(GenericLoggingConstant.UP_STREAM_RESPONSE_TIME,
- logInfo.getUpstreamResponseTime().toString(), keyWordMatch,
dataMaskAlg)));
-
logInfo.setUserAgent(maskForSingleWord(GenericLoggingConstant.USERAGENT,
logInfo.getUserAgent(), keyWordMatch, dataMaskAlg));
- logInfo.setHost(maskForSingleWord(GenericLoggingConstant.HOST,
logInfo.getHost(), keyWordMatch, dataMaskAlg));
- logInfo.setModule(maskForSingleWord(GenericLoggingConstant.MODULE,
logInfo.getModule(), keyWordMatch, dataMaskAlg));
- logInfo.setTraceId(maskForSingleWord(GenericLoggingConstant.TRACE_ID,
logInfo.getTraceId(), keyWordMatch, dataMaskAlg));
- logInfo.setPath(maskForSingleWord(GenericLoggingConstant.PATH,
logInfo.getPath(), keyWordMatch, dataMaskAlg));
-
logInfo.setRequestHeader(maskForSingleWord(GenericLoggingConstant.REQUEST_HEADER,
logInfo.getRequestHeader(), keyWordMatch, dataMaskAlg));
-
logInfo.setResponseHeader(maskForSingleWord(GenericLoggingConstant.RESPONSE_HEADER,
logInfo.getResponseHeader(),
- keyWordMatch, dataMaskAlg));
-
logInfo.setQueryParams(maskForSingleWord(GenericLoggingConstant.QUERY_PARAMS,
logInfo.getQueryParams(), keyWordMatch, dataMaskAlg));
-
logInfo.setRequestBody(maskForSingleWord(GenericLoggingConstant.REQUEST_BODY,
logInfo.getRequestBody(), keyWordMatch, dataMaskAlg));
-
logInfo.setResponseBody(maskForSingleWord(GenericLoggingConstant.RESPONSE_BODY,
logInfo.getResponseBody(), keyWordMatch, dataMaskAlg));
- logInfo.setRequestHeader(maskForBody(logInfo.getRequestHeader(),
keyWordMatch, dataMaskAlg));
- logInfo.setResponseHeader(maskForBody(logInfo.getResponseHeader(),
keyWordMatch, dataMaskAlg));
- logInfo.setQueryParams(maskForBody(logInfo.getQueryParams(),
keyWordMatch, dataMaskAlg));
- logInfo.setRequestBody(maskForBody(logInfo.getRequestBody(),
keyWordMatch, dataMaskAlg));
- logInfo.setResponseBody(maskForBody(logInfo.getResponseBody(),
keyWordMatch, dataMaskAlg));
+ private void desensitizeShenyuRequestLog(final L logInfo, final
KeyWordMatch keyWordMatch, final String desensitizedAlg) {
+
logInfo.setClientIp(desensitizeForSingleWord(GenericLoggingConstant.CLIENT_IP,
logInfo.getClientIp(), keyWordMatch, desensitizedAlg));
+
logInfo.setTimeLocal(desensitizeForSingleWord(GenericLoggingConstant.TIME_LOCAL,
logInfo.getTimeLocal(), keyWordMatch, desensitizedAlg));
+
logInfo.setMethod(desensitizeForSingleWord(GenericLoggingConstant.METHOD,
logInfo.getMethod(), keyWordMatch, desensitizedAlg));
+
logInfo.setRequestUri(desensitizeForSingleWord(GenericLoggingConstant.REQUEST_URI,
logInfo.getRequestUri(), keyWordMatch, desensitizedAlg));
+
logInfo.setResponseContentLength(Integer.valueOf(desensitizeForSingleWord(GenericLoggingConstant.RESPONSE_CONTENT_LENGTH,
+ logInfo.getResponseContentLength().toString(), keyWordMatch,
desensitizedAlg)));
+
logInfo.setRpcType(desensitizeForSingleWord(GenericLoggingConstant.RPC_TYPE,
logInfo.getRpcType(), keyWordMatch, desensitizedAlg));
+
logInfo.setStatus(Integer.valueOf(desensitizeForSingleWord(GenericLoggingConstant.STATUS,
logInfo.getStatus().toString(), keyWordMatch, desensitizedAlg)));
+
logInfo.setUpstreamIp(desensitizeForSingleWord(GenericLoggingConstant.UP_STREAM_IP,
logInfo.getUpstreamIp(), keyWordMatch, desensitizedAlg));
+
logInfo.setUpstreamResponseTime(Long.valueOf(desensitizeForSingleWord(GenericLoggingConstant.UP_STREAM_RESPONSE_TIME,
+ logInfo.getUpstreamResponseTime().toString(), keyWordMatch,
desensitizedAlg)));
+
logInfo.setUserAgent(desensitizeForSingleWord(GenericLoggingConstant.USERAGENT,
logInfo.getUserAgent(), keyWordMatch, desensitizedAlg));
+ logInfo.setHost(desensitizeForSingleWord(GenericLoggingConstant.HOST,
logInfo.getHost(), keyWordMatch, desensitizedAlg));
+
logInfo.setModule(desensitizeForSingleWord(GenericLoggingConstant.MODULE,
logInfo.getModule(), keyWordMatch, desensitizedAlg));
+
logInfo.setTraceId(desensitizeForSingleWord(GenericLoggingConstant.TRACE_ID,
logInfo.getTraceId(), keyWordMatch, desensitizedAlg));
+ logInfo.setPath(desensitizeForSingleWord(GenericLoggingConstant.PATH,
logInfo.getPath(), keyWordMatch, desensitizedAlg));
+
logInfo.setRequestHeader(desensitizeForSingleWord(GenericLoggingConstant.REQUEST_HEADER,
logInfo.getRequestHeader(), keyWordMatch, desensitizedAlg));
+
logInfo.setResponseHeader(desensitizeForSingleWord(GenericLoggingConstant.RESPONSE_HEADER,
logInfo.getResponseHeader(),
+ keyWordMatch, desensitizedAlg));
+
logInfo.setQueryParams(desensitizeForSingleWord(GenericLoggingConstant.QUERY_PARAMS,
logInfo.getQueryParams(), keyWordMatch, desensitizedAlg));
+
logInfo.setRequestBody(desensitizeForSingleWord(GenericLoggingConstant.REQUEST_BODY,
logInfo.getRequestBody(), keyWordMatch, desensitizedAlg));
+
logInfo.setResponseBody(desensitizeForSingleWord(GenericLoggingConstant.RESPONSE_BODY,
logInfo.getResponseBody(), keyWordMatch, desensitizedAlg));
+
logInfo.setRequestHeader(desensitizeForBody(logInfo.getRequestHeader(),
keyWordMatch, desensitizedAlg));
+
logInfo.setResponseHeader(desensitizeForBody(logInfo.getResponseHeader(),
keyWordMatch, desensitizedAlg));
+ logInfo.setQueryParams(desensitizeForBody(logInfo.getQueryParams(),
keyWordMatch, desensitizedAlg));
+ logInfo.setRequestBody(desensitizeForBody(logInfo.getRequestBody(),
keyWordMatch, desensitizedAlg));
+ logInfo.setResponseBody(desensitizeForBody(logInfo.getResponseBody(),
keyWordMatch, desensitizedAlg));
}
/**
@@ -159,13 +159,13 @@ public abstract class AbstractLogCollector<T extends
AbstractLogConsumeClient<?,
protected abstract T getLogConsumeClient();
/**
- * mask log.
+ * desensitize log.
*
* @param log log
* @param keyWordMatch keyWordMathc
- * @param dataMaskAlg data mask algorithm
+ * @param desensitizeAlg data desensitize algorithm
*/
- protected abstract void maskLog(L log, KeyWordMatch keyWordMatch, String
dataMaskAlg);
+ protected abstract void desensitizeLog(L log, KeyWordMatch keyWordMatch,
String desensitizeAlg);
@Override
public void close() throws Exception {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/LogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/LogCollector.java
index 46ff3a5cd..4bd0588b2 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/LogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/collector/LogCollector.java
@@ -18,7 +18,7 @@
package org.apache.shenyu.plugin.logging.common.collector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
/**
* Collect logs and put into buffer queue.
@@ -31,13 +31,13 @@ public interface LogCollector<L extends ShenyuRequestLog>
extends AutoCloseable
void start();
/**
- * mask log.
+ * desensitize log.
*
* @param log log
* @param keyWordMatch keyWordMatch
- * @param dataMaskALg data mask algorithm
+ * @param desensitizeAlg data desensitize algorithm
*/
- void mask(L log, KeyWordMatch keyWordMatch, String dataMaskALg);
+ void desensitize(L log, KeyWordMatch keyWordMatch, String desensitizeAlg);
/**
* collect log.
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/entity/CommonLoggingRuleHandle.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/entity/CommonLoggingRuleHandle.java
index bb80c5305..c434e6ec4 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/entity/CommonLoggingRuleHandle.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-common/src/main/java/org/apache/shenyu/plugin/logging/common/entity/CommonLoggingRuleHandle.java
@@ -25,17 +25,17 @@ import org.apache.shenyu.common.dto.convert.rule.RuleHandle;
public class CommonLoggingRuleHandle implements RuleHandle {
/**
- * mask keyword.
+ * desensitize keyword.
*/
private String keyword;
/**
- * mask type, include md5 and character replacement.
+ * desensitize type, include md5 and character replacement.
*/
private String maskType;
/**
- * mask status, include true and false.
+ * desensitize status, include true and false.
*/
private Boolean maskStatus;
@@ -57,38 +57,38 @@ public class CommonLoggingRuleHandle implements RuleHandle {
}
/**
- * get mask type.
+ * get desensitize type.
*
- * @return mask type
+ * @return desensitize type
*/
public String getMaskType() {
return maskType;
}
/**
- * set mask type.
+ * set desensitize type.
*
- * @param maskType mask type
+ * @param desensitizeType desensitize type
*/
- public void setMaskType(final String maskType) {
+ public void setMaskType(final String desensitizeType) {
this.maskType = maskType;
}
/**
- * get mask status.
+ * get desensitize status.
*
- * @return mask status
+ * @return desensitize status
*/
public Boolean getMaskStatus() {
return maskStatus;
}
/**
- * set mask status.
+ * set desensitize status.
*
- * @param maskStatus mask status
+ * @param desensitizeStatus desensitize status
*/
- public void setMaskStatus(final Boolean maskStatus) {
- this.maskStatus = maskStatus;
+ public void setMaskStatus(final Boolean desensitizeStatus) {
+ this.maskStatus = desensitizeStatus;
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-console/src/main/java/org/apache/shenyu/plugin/logging/console/LoggingConsolePlugin.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-console/src/main/java/org/apache/shenyu/plugin/logging/console/LoggingConsolePlugin.java
index 3844c2aff..871bda8b2 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-console/src/main/java/org/apache/shenyu/plugin/logging/console/LoggingConsolePlugin.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-console/src/main/java/org/apache/shenyu/plugin/logging/console/LoggingConsolePlugin.java
@@ -29,9 +29,9 @@ import org.apache.shenyu.plugin.base.utils.CacheKeyUtils;
import org.apache.shenyu.plugin.logging.common.constant.GenericLoggingConstant;
import org.apache.shenyu.plugin.logging.common.entity.CommonLoggingRuleHandle;
import
org.apache.shenyu.plugin.logging.console.handler.LoggingConsolePluginDataHandler;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
-import org.apache.shenyu.plugin.logging.mask.api.utils.DataMaskUtils;
-import org.apache.shenyu.plugin.logging.mask.api.enums.DataMaskEnums;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
+import
org.apache.shenyu.plugin.logging.desensitize.api.utils.DataDesensitizeUtils;
+import
org.apache.shenyu.plugin.logging.desensitize.api.enums.DataDesensitizeEnum;
import org.reactivestreams.Publisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,9 +69,9 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
private static final Logger LOG =
LoggerFactory.getLogger(LoggingConsolePlugin.class);
- private static String dataMaskAlg =
DataMaskEnums.CHARACTER_REPLACE.getDataMaskAlg();
+ private static String dataDesensitizeAlg =
DataDesensitizeEnum.CHARACTER_REPLACE.getDataDesensitizeAlg();
- private static boolean maskFlag;
+ private static boolean desensitized;
private static KeyWordMatch keyWordMatch;
@@ -82,12 +82,12 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
Set<String> keywordSets = Sets.newHashSet();
if (Objects.nonNull(commonLoggingRuleHandle)) {
String keywords = commonLoggingRuleHandle.getKeyword();
- maskFlag = StringUtils.isNotBlank(keywords) &&
commonLoggingRuleHandle.getMaskStatus();
- if (maskFlag) {
+ desensitized = StringUtils.isNotBlank(keywords) &&
commonLoggingRuleHandle.getMaskStatus();
+ if (desensitized) {
Collections.addAll(keywordSets, keywords.split(";"));
- dataMaskAlg =
Optional.ofNullable(commonLoggingRuleHandle.getMaskType()).orElse(DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
+ dataDesensitizeAlg =
Optional.ofNullable(commonLoggingRuleHandle.getMaskType()).orElse(DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
keyWordMatch = new KeyWordMatch(keywordSets);
- LOG.info("current plugin:{}, keyword:{}, dataMaskAlg:{}",
this.named(), keywords, dataMaskAlg);
+ LOG.info("current plugin:{}, keyword:{},
dataDesensitizedAlg:{}", this.named(), keywords, dataDesensitizeAlg);
}
}
ServerHttpRequest request = exchange.getRequest();
@@ -111,19 +111,19 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
}
private String getRequestMethod(final ServerHttpRequest request) {
- // mask request method
+ // desensitize request method
String requestMethod = "";
if (Objects.nonNull(request.getMethod())) {
- requestMethod = DataMaskUtils.maskSingleKeyword(maskFlag,
GenericLoggingConstant.REQUEST_METHOD,
- request.getMethod().toString(), keyWordMatch, dataMaskAlg);
+ requestMethod =
DataDesensitizeUtils.desensitizeSingleKeyword(desensitized,
GenericLoggingConstant.REQUEST_METHOD,
+ request.getMethod().toString(), keyWordMatch,
dataDesensitizeAlg);
}
return "Request Method: " + requestMethod + System.lineSeparator();
}
private String getRequestUri(final ServerHttpRequest request) {
- // mask request uri
- String requestUri = DataMaskUtils.maskSingleKeyword(maskFlag,
GenericLoggingConstant.REQUEST_URI,
- request.getURI().toString(), keyWordMatch, dataMaskAlg);
+ // desensitize request uri
+ String requestUri =
DataDesensitizeUtils.desensitizeSingleKeyword(desensitized,
GenericLoggingConstant.REQUEST_URI,
+ request.getURI().toString(), keyWordMatch, dataDesensitizeAlg);
return "Request Uri: " + requestUri + System.lineSeparator();
}
@@ -133,9 +133,9 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
if (!params.isEmpty()) {
logInfo.append("[Query Params
Start]").append(System.lineSeparator());
params.forEach((key, value) -> {
- // mask query parameters
+ // desensitized query parameters
value = Lists.newArrayList(value);
- DataMaskUtils.maskList(maskFlag, key, value, keyWordMatch,
dataMaskAlg);
+ DataDesensitizeUtils.desensitizeList(desensitized, key, value,
keyWordMatch, dataDesensitizeAlg);
logInfo.append(key).append(": ")
.append(StringUtils.join(value,
",")).append(System.lineSeparator());
});
@@ -165,9 +165,9 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
entrySet.forEach(entry -> {
String key = entry.getKey();
List<String> value = entry.getValue();
- // mask headers
+ // desensitize headers
value = Lists.newArrayList(value);
- DataMaskUtils.maskList(maskFlag, key, value, keyWordMatch,
dataMaskAlg);
+ DataDesensitizeUtils.desensitizeList(desensitized, key, value,
keyWordMatch, dataDesensitizeAlg);
logInfo.append(key).append(": ").append(StringUtils.join(value,
",")).append(System.lineSeparator());
});
return logInfo.toString();
@@ -189,8 +189,8 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
return super.getBody().doOnNext(dataBuffer ->
writer.write(dataBuffer.asByteBuffer().asReadOnlyBuffer())).doFinally(signal ->
{
if (!writer.isEmpty()) {
logInfo.append("[Request Body
Start]").append(System.lineSeparator());
- // mask data
- String requestBody = DataMaskUtils.maskBody(maskFlag,
writer.output(), keyWordMatch, dataMaskAlg);
+ // desensitize data
+ String requestBody =
DataDesensitizeUtils.desensitizeBody(desensitized, writer.output(),
keyWordMatch, dataDesensitizeAlg);
logInfo.append(requestBody).append(System.lineSeparator());
logInfo.append("[Request Body
End]").append(System.lineSeparator());
} else {
@@ -228,8 +228,8 @@ public class LoggingConsolePlugin extends
AbstractShenyuPlugin {
BodyWriter writer = new BodyWriter();
return Flux.from(body).doOnNext(buffer ->
writer.write(buffer.asByteBuffer().asReadOnlyBuffer())).doFinally(signal -> {
logInfo.append("[Response Body
Start]").append(System.lineSeparator());
- // mask data
- String responseBody = DataMaskUtils.maskBody(maskFlag,
writer.output(), keyWordMatch, dataMaskAlg);
+ // desensitize data
+ String responseBody =
DataDesensitizeUtils.desensitizeBody(desensitized, writer.output(),
keyWordMatch, dataDesensitizeAlg);
logInfo.append(responseBody).append(System.lineSeparator());
logInfo.append("[Response Body
End]").append(System.lineSeparator());
// when response, print all request info.
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/pom.xml
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/pom.xml
similarity index 96%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/pom.xml
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/pom.xml
index a8489f73e..d2be3005b 100644
--- a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/pom.xml
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/pom.xml
@@ -23,7 +23,7 @@
<version>2.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>shenyu-plugin-logging-mask-api</artifactId>
+ <artifactId>shenyu-plugin-logging-desensitize-api</artifactId>
<dependencies>
<dependency>
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/enums/DataMaskEnums.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/enums/DataDesensitizeEnum.java
similarity index 68%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/enums/DataMaskEnums.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/enums/DataDesensitizeEnum.java
index 9514554e7..03ed9c07d 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/enums/DataMaskEnums.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/enums/DataDesensitizeEnum.java
@@ -15,29 +15,29 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.enums;
+package org.apache.shenyu.plugin.logging.desensitize.api.enums;
/**
- * data mask enums.
+ * data desensitize enums.
*/
-public enum DataMaskEnums {
+public enum DataDesensitizeEnum {
CHARACTER_REPLACE("dataMaskByCharReplace"),
MD5_ENCRYPT("dataMaskByMD5");
- private final String dataMaskAlg;
+ private final String dataDesensitizeAlg;
- DataMaskEnums(final String dataMaskAlg) {
- this.dataMaskAlg = dataMaskAlg;
+ DataDesensitizeEnum(final String dataDesensitizeAlg) {
+ this.dataDesensitizeAlg = dataDesensitizeAlg;
}
/**
- * get mask algorithm.
+ * get data desensitize algorithm.
*
- * @return mask algorithm
+ * @return desensitize algorithm
*/
- public String getDataMaskAlg() {
- return dataMaskAlg;
+ public String getDataDesensitizeAlg() {
+ return dataDesensitizeAlg;
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/factory/DataMaskFactory.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/factory/DataDesensitizeFactory.java
similarity index 57%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/factory/DataMaskFactory.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/factory/DataDesensitizeFactory.java
index c98ac27dd..356cb7108 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/factory/DataMaskFactory.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/factory/DataDesensitizeFactory.java
@@ -15,28 +15,28 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.factory;
+package org.apache.shenyu.plugin.logging.desensitize.api.factory;
-import org.apache.shenyu.plugin.logging.mask.api.spi.ShenyuDataMask;
+import
org.apache.shenyu.plugin.logging.desensitize.api.spi.ShenyuDataDesensitize;
import org.apache.shenyu.spi.ExtensionLoader;
/**
- * shenyu logging mask factory.
+ * shenyu logging desensitized factory.
*/
-public final class DataMaskFactory {
+public final class DataDesensitizeFactory {
- public DataMaskFactory() {
+ public DataDesensitizeFactory() {
}
/**
- * shenyu logging mask algorithm selector.
+ * shenyu logging desensitized algorithm selector.
*
* @param source source data
- * @param algorithm mask algorithm
- * @return masked data
+ * @param algorithm desensitized algorithm
+ * @return desensitized data
*/
- public static String selectMask(final String source, final String
algorithm) {
- ShenyuDataMask dataMask =
ExtensionLoader.getExtensionLoader(ShenyuDataMask.class).getJoin(algorithm);
- return dataMask.mask(source);
+ public static String selectDesensitize(final String source, final String
algorithm) {
+ ShenyuDataDesensitize dataDesensitize =
ExtensionLoader.getExtensionLoader(ShenyuDataDesensitize.class).getJoin(algorithm);
+ return dataDesensitize.desensitize(source);
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/matcher/KeyWordMatch.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/matcher/KeyWordMatch.java
similarity index 96%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/matcher/KeyWordMatch.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/matcher/KeyWordMatch.java
index 9be42e970..6cd9e393e 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/matcher/KeyWordMatch.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/matcher/KeyWordMatch.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.matcher;
+package org.apache.shenyu.plugin.logging.desensitize.api.matcher;
import java.util.Set;
import java.util.regex.Pattern;
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/AbstractShenyuDataMask.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/AbstractShenyuDataDesensitize.java
similarity index 71%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/AbstractShenyuDataMask.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/AbstractShenyuDataDesensitize.java
index 299e273b5..9f102fc52 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/AbstractShenyuDataMask.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/AbstractShenyuDataDesensitize.java
@@ -15,28 +15,28 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.spi;
+package org.apache.shenyu.plugin.logging.desensitize.api.spi;
import org.apache.commons.lang3.StringUtils;
/**
- * AbstractShenyuDataMask.
+ * AbstractShenyuDataDesensitize.
*/
-public abstract class AbstractShenyuDataMask implements ShenyuDataMask {
+public abstract class AbstractShenyuDataDesensitize implements
ShenyuDataDesensitize {
@Override
- public String mask(final String source) {
+ public String desensitize(final String source) {
if (StringUtils.isBlank(source)) {
return "";
}
- return doMask(source);
+ return doDesensitize(source);
}
/**
- * do mask data.
+ * do desensitized data.
*
* @param source source
- * @return masked data
+ * @return desensitized data
*/
- protected abstract String doMask(String source);
+ protected abstract String doDesensitize(String source);
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/CharacterReplaceDataMask.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/CharacterReplaceDataDesensitize.java
similarity index 74%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/CharacterReplaceDataMask.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/CharacterReplaceDataDesensitize.java
index bbe833128..0b249583d 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/CharacterReplaceDataMask.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/CharacterReplaceDataDesensitize.java
@@ -15,24 +15,24 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.spi;
+package org.apache.shenyu.plugin.logging.desensitize.api.spi;
import org.apache.shenyu.spi.Join;
/**
- * character replaces data mask.
+ * character replaces data desensitize.
*/
@Join
-public class CharacterReplaceDataMask extends AbstractShenyuDataMask {
+public class CharacterReplaceDataDesensitize extends
AbstractShenyuDataDesensitize {
- private static final Character MASK = '*';
+ private static final Character DESENSITIZI_CHARACTER = '*';
@Override
- protected String doMask(final String source) {
- return maskData(source, source.length() / 2);
+ protected String doDesensitize(final String source) {
+ return desensitizeData(source, source.length() / 2);
}
- private String maskData(final String data, final int maskNum) {
+ private String desensitizeData(final String data, final int maskNum) {
if (data.length() == 1) {
return "*";
}
@@ -44,7 +44,7 @@ public class CharacterReplaceDataMask extends
AbstractShenyuDataMask {
while (currentMaskNum < maskNum) {
final int tempMaskNum = currentMaskNum;
if (r < data.length()) {
- sb.setCharAt(r, MASK);
+ sb.setCharAt(r, DESENSITIZI_CHARACTER);
r++;
currentMaskNum++;
}
@@ -52,7 +52,7 @@ public class CharacterReplaceDataMask extends
AbstractShenyuDataMask {
break;
}
if (l >= 0) {
- sb.setCharAt(l, MASK);
+ sb.setCharAt(l, DESENSITIZI_CHARACTER);
l--;
currentMaskNum++;
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/Md5EncryptDataMask.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/Md5EncryptDataDesensitize.java
similarity index 80%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/Md5EncryptDataMask.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/Md5EncryptDataDesensitize.java
index 8335850f4..d55cef8c4 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/Md5EncryptDataMask.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/Md5EncryptDataDesensitize.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.spi;
+package org.apache.shenyu.plugin.logging.desensitize.api.spi;
import org.apache.shenyu.common.utils.DigestUtils;
import org.apache.shenyu.spi.Join;
/**
- * md5 encrypt data mask.
+ * md5 encrypt data desensitize.
*/
@Join
-public class Md5EncryptDataMask extends AbstractShenyuDataMask {
+public class Md5EncryptDataDesensitize extends AbstractShenyuDataDesensitize {
@Override
- protected String doMask(final String source) {
+ protected String doDesensitize(final String source) {
return DigestUtils.md5Hex(source);
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/ShenyuDataMask.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/ShenyuDataDesensitize.java
similarity index 79%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/ShenyuDataMask.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/ShenyuDataDesensitize.java
index 84c0cec93..028e187f6 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/spi/ShenyuDataMask.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/ShenyuDataDesensitize.java
@@ -15,21 +15,21 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.spi;
+package org.apache.shenyu.plugin.logging.desensitize.api.spi;
import org.apache.shenyu.spi.SPI;
/**
- * shenyu logging data mask.
+ * shenyu logging data desensitize.
*/
@SPI
-public interface ShenyuDataMask {
+public interface ShenyuDataDesensitize {
/**
- * mask data.
+ * desensitize data.
*
* @param source source data
- * @return masked data
+ * @return desensitized data
*/
- String mask(String source);
+ String desensitize(String source);
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/utils/DataDesensitizeUtils.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/utils/DataDesensitizeUtils.java
new file mode 100644
index 000000000..a6687ff06
--- /dev/null
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/java/org/apache/shenyu/plugin/logging/desensitize/api/utils/DataDesensitizeUtils.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shenyu.plugin.logging.desensitize.api.utils;
+
+import org.apache.shenyu.common.utils.JsonUtils;
+import
org.apache.shenyu.plugin.logging.desensitize.api.factory.DataDesensitizeFactory;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * data desensitize utils.
+ */
+public final class DataDesensitizeUtils {
+
+ /**
+ * desensitize for single key word.
+ *
+ * @param keyWord key word
+ * @param source source data
+ * @param keyWordMatch keyWordMatch
+ * @param desensitizeAlg desensitizeAlg
+ * @return desensitized data
+ */
+ public static String desensitizeForSingleWord(final String keyWord, final
String source,
+ final KeyWordMatch keyWordMatch,
final String desensitizeAlg) {
+ return DataDesensitizeUtils.desensitizeSingleKeyword(true, keyWord,
source, keyWordMatch, desensitizeAlg);
+ }
+
+ /**
+ * desensitize for body.
+ *
+ * @param source source data.
+ * @param keyWordMatch keyWordMatch
+ * @param desensitizeAlg desensitizeAlg
+ * @return desensitized data.
+ */
+ public static String desensitizeForBody(final String source, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
+ return DataDesensitizeUtils.desensitizeBody(true, source,
keyWordMatch, desensitizeAlg);
+ }
+
+ /**
+ * desensitize single keyword.
+ *
+ * @param desensitized desensitized flag
+ * @param keyWord keyword
+ * @param source source data
+ * @param keyWordMatch keyWordMatch
+ * @param desensitizedAlg desensitized algorithm
+ * @return desensitized data
+ */
+ public static String desensitizeSingleKeyword(final boolean desensitized,
final String keyWord, final String source,
+ final KeyWordMatch keyWordMatch,
final String desensitizedAlg) {
+ if (StringUtils.hasLength(source) && desensitized &&
keyWordMatch.matches(keyWord)) {
+ return DataDesensitizeFactory.selectDesensitize(source,
desensitizedAlg);
+ } else {
+ return source;
+ }
+ }
+
+ /**
+ * mask for body.
+ *
+ * @param desensitized desensitized flag
+ * @param source source data
+ * @param keyWordMatch keyword match strategy
+ * @param dataDesensitizeAlg desensitize algorithm
+ * @return desensitized data
+ */
+ public static String desensitizeBody(final boolean desensitized, final
String source,
+ final KeyWordMatch keyWordMatch, final
String dataDesensitizeAlg) {
+ if (StringUtils.hasLength(source) && desensitized) {
+ Map<String, String> bodyMap = JsonUtils.jsonToMap(source,
String.class);
+ bodyMap.forEach((key, value) -> {
+ if (keyWordMatch.matches(key)) {
+ bodyMap.put(key,
DataDesensitizeFactory.selectDesensitize(value, dataDesensitizeAlg));
+ }
+ });
+ return JsonUtils.toJson(bodyMap);
+ } else {
+ return source;
+ }
+ }
+
+ /**
+ * desensitize for list data.
+ *
+ * @param desensitized desensitized
+ * @param keyword keyword
+ * @param source source data
+ * @param keyWordMatch keyword match strategy
+ * @param dataDesensitizeAlg desensitize algorithm
+ */
+ public static void desensitizeList(final boolean desensitized, final
String keyword, final List<String> source,
+ final KeyWordMatch keyWordMatch, final
String dataDesensitizeAlg) {
+ if (desensitized && keyWordMatch.matches(keyword)) {
+ for (int i = 0; i < source.size(); i++) {
+ String ret =
DataDesensitizeFactory.selectDesensitize(source.get(i), dataDesensitizeAlg);
+ source.set(i, ret);
+ }
+ }
+ }
+}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/resources/META-INF/shenyu/org.apache.shenyu.plugin.logging.mask.api.spi.ShenyuDataMask
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/resources/META-INF/shenyu/org.apache.shenyu.plugin.logging.desensitize.api.spi.ShenyuDataDesensitize
similarity index 79%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/resources/META-INF/shenyu/org.apache.shenyu.plugin.logging.mask.api.spi.ShenyuDataMask
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/resources/META-INF/shenyu/org.apache.shenyu.plugin.logging.desensitize.api.spi.ShenyuDataDesensitize
index 39c78d873..5ec1f0942 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/resources/META-INF/shenyu/org.apache.shenyu.plugin.logging.mask.api.spi.ShenyuDataMask
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/main/resources/META-INF/shenyu/org.apache.shenyu.plugin.logging.desensitize.api.spi.ShenyuDataDesensitize
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-dataMaskByMD5=org.apache.shenyu.plugin.logging.mask.api.spi.Md5EncryptDataMask
-dataMaskByCharReplace=org.apache.shenyu.plugin.logging.mask.api.spi.CharacterReplaceDataMask
\ No newline at end of file
+dataMaskByMD5=org.apache.shenyu.plugin.logging.desensitize.api.spi.Md5EncryptDataDesensitize
+dataMaskByCharReplace=org.apache.shenyu.plugin.logging.desensitize.api.spi.CharacterReplaceDataDesensitize
\ No newline at end of file
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/factory/DataMaskFactoryTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/factory/DataDesensitizeFactoryTest.java
similarity index 70%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/factory/DataMaskFactoryTest.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/factory/DataDesensitizeFactoryTest.java
index d4bd0f1f7..2318b7fb5 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/factory/DataMaskFactoryTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/factory/DataDesensitizeFactoryTest.java
@@ -15,31 +15,31 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.factory;
+package org.apache.shenyu.plugin.logging.desensitize.api.factory;
import org.apache.shenyu.common.utils.DigestUtils;
-import org.apache.shenyu.plugin.logging.mask.api.enums.DataMaskEnums;
+import
org.apache.shenyu.plugin.logging.desensitize.api.enums.DataDesensitizeEnum;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-public class DataMaskFactoryTest {
+public class DataDesensitizeFactoryTest {
@Test
- public void selectMask() {
+ public void selectDesensitizeTest() {
// EMPTY_STRING
- String emptyStr = DataMaskFactory.selectMask("",
DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
+ String emptyStr = DataDesensitizeFactory.selectDesensitize("",
DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
Assertions.assertEquals("", emptyStr);
// test for md5
String sourceData = "123456789";
- String maskedData = DataMaskFactory.selectMask(sourceData,
DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
- Assertions.assertEquals(DigestUtils.md5Hex(sourceData), maskedData);
+ String desensitizedData =
DataDesensitizeFactory.selectDesensitize(sourceData,
DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
+ Assertions.assertEquals(DigestUtils.md5Hex(sourceData),
desensitizedData);
// test for replacement
- String replaceText = DataMaskFactory.selectMask(sourceData,
DataMaskEnums.CHARACTER_REPLACE.getDataMaskAlg());
+ String replaceText =
DataDesensitizeFactory.selectDesensitize(sourceData,
DataDesensitizeEnum.CHARACTER_REPLACE.getDataDesensitizeAlg());
String maskData = "123456789";
int maskNum = 0;
for (char c : replaceText.toCharArray()) {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/matcher/KeyWordMatchTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/matcher/KeyWordMatchTest.java
similarity index 96%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/matcher/KeyWordMatchTest.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/matcher/KeyWordMatchTest.java
index 6bf83b4c8..37a4fdad1 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/matcher/KeyWordMatchTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/matcher/KeyWordMatchTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.matcher;
+package org.apache.shenyu.plugin.logging.desensitize.api.matcher;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/spi/CharacterReplaceDataMaskTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/CharacterReplaceDataDesensitizeTest.java
similarity index 67%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/spi/CharacterReplaceDataMaskTest.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/CharacterReplaceDataDesensitizeTest.java
index 92c6bc6d9..6a5c893a4 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/spi/CharacterReplaceDataMaskTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/CharacterReplaceDataDesensitizeTest.java
@@ -15,26 +15,26 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.spi;
+package org.apache.shenyu.plugin.logging.desensitize.api.spi;
-import org.apache.shenyu.plugin.logging.mask.api.enums.DataMaskEnums;
-import org.apache.shenyu.plugin.logging.mask.api.factory.DataMaskFactory;
+import
org.apache.shenyu.plugin.logging.desensitize.api.enums.DataDesensitizeEnum;
+import
org.apache.shenyu.plugin.logging.desensitize.api.factory.DataDesensitizeFactory;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-public class CharacterReplaceDataMaskTest {
+public class CharacterReplaceDataDesensitizeTest {
@Test
- void doMask() {
- CharacterReplaceDataMask characterReplaceDataMask = new
CharacterReplaceDataMask();
- String ret = characterReplaceDataMask.doMask("1");
+ void doDesensitizeTest() {
+ CharacterReplaceDataDesensitize characterReplaceDataMask = new
CharacterReplaceDataDesensitize();
+ String ret = characterReplaceDataMask.doDesensitize("1");
Assertions.assertEquals("*", ret);
String sourceData = "123456789";
- String replaceText = DataMaskFactory.selectMask(sourceData,
DataMaskEnums.CHARACTER_REPLACE.getDataMaskAlg());
+ String replaceText =
DataDesensitizeFactory.selectDesensitize(sourceData,
DataDesensitizeEnum.CHARACTER_REPLACE.getDataDesensitizeAlg());
int maskNum = 0;
for (char c : replaceText.toCharArray()) {
if (c == '*') {
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/spi/Md5EncryptDataMaskTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/Md5EncryptDataDesensitizeTest.java
similarity index 80%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/spi/Md5EncryptDataMaskTest.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/Md5EncryptDataDesensitizeTest.java
index a080719af..6c1021bd7 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/spi/Md5EncryptDataMaskTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/spi/Md5EncryptDataDesensitizeTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.spi;
+package org.apache.shenyu.plugin.logging.desensitize.api.spi;
import org.apache.shenyu.common.utils.DigestUtils;
import org.junit.jupiter.api.Assertions;
@@ -24,11 +24,11 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-public class Md5EncryptDataMaskTest {
+public class Md5EncryptDataDesensitizeTest {
@Test
- public void doMask() {
- Md5EncryptDataMask md5EncryptDataMask = new Md5EncryptDataMask();
- Assertions.assertEquals(DigestUtils.md5Hex("test"),
md5EncryptDataMask.doMask("test"));
+ public void doDesensitizeTest() {
+ Md5EncryptDataDesensitize md5EncryptDataMask = new
Md5EncryptDataDesensitize();
+ Assertions.assertEquals(DigestUtils.md5Hex("test"),
md5EncryptDataMask.doDesensitize("test"));
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/utils/DataMaskUtilsTest.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/utils/DataDesensitizeUtilsTest.java
similarity index 57%
rename from
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/utils/DataMaskUtilsTest.java
rename to
shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/utils/DataDesensitizeUtilsTest.java
index cda1c3f6d..06bcdd6a1 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/test/java/org/apache/shenyu/plugin/logging/mask/api/utils/DataMaskUtilsTest.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-desensitize-api/src/test/java/org/apache/shenyu/plugin/logging/desensitize/api/utils/DataDesensitizeUtilsTest.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shenyu.plugin.logging.mask.api.utils;
+package org.apache.shenyu.plugin.logging.desensitize.api.utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.shenyu.common.utils.DigestUtils;
import org.apache.shenyu.common.utils.JsonUtils;
-import org.apache.shenyu.plugin.logging.mask.api.enums.DataMaskEnums;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import
org.apache.shenyu.plugin.logging.desensitize.api.enums.DataDesensitizeEnum;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -35,7 +35,7 @@ import java.util.Map;
import java.util.Set;
@ExtendWith(MockitoExtension.class)
-public class DataMaskUtilsTest {
+public class DataDesensitizeUtilsTest {
private static final String JSON_TEXT =
"{\"id\":\"123\",\"name\":\"jack\"}";
@@ -49,35 +49,35 @@ public class DataMaskUtilsTest {
}
@Test
- public void maskSingleKeyword() {
- String noMaskedData = DataMaskUtils.maskSingleKeyword(false, "name",
JSON_TEXT, keyWordMatch,
- DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
- Assertions.assertEquals(JSON_TEXT, noMaskedData);
+ public void desensitizeSingleKeywordTest() {
+ String noDesensitizedData =
DataDesensitizeUtils.desensitizeSingleKeyword(false, "name", JSON_TEXT,
keyWordMatch,
+ DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
+ Assertions.assertEquals(JSON_TEXT, noDesensitizedData);
- String maskedData = DataMaskUtils.maskSingleKeyword(true, "name",
JSON_TEXT, keyWordMatch,
- DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
- Assertions.assertEquals(DigestUtils.md5Hex(JSON_TEXT), maskedData);
+ String desensitizedData =
DataDesensitizeUtils.desensitizeSingleKeyword(true, "name", JSON_TEXT,
keyWordMatch,
+ DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
+ Assertions.assertEquals(DigestUtils.md5Hex(JSON_TEXT),
desensitizedData);
}
@Test
- public void maskBody() {
- String noMaskedData = DataMaskUtils.maskBody(false, JSON_TEXT,
keyWordMatch, DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
- Assertions.assertEquals(JSON_TEXT, noMaskedData);
+ public void desensitizeBodyTest() {
+ String noDesensitizedData =
DataDesensitizeUtils.desensitizeBody(false, JSON_TEXT, keyWordMatch,
DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
+ Assertions.assertEquals(JSON_TEXT, noDesensitizedData);
- String maskedData = DataMaskUtils.maskBody(true, JSON_TEXT,
keyWordMatch, DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
+ String desensitizedData = DataDesensitizeUtils.desensitizeBody(true,
JSON_TEXT, keyWordMatch,
DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
Map<String, String> jsonMap = JsonUtils.jsonToMap(JSON_TEXT,
String.class);
jsonMap.put("name", DigestUtils.md5Hex(jsonMap.get("name")));
String jsonRet = JsonUtils.toJson(jsonMap);
- Assertions.assertEquals(jsonRet, maskedData);
+ Assertions.assertEquals(jsonRet, desensitizedData);
}
@Test
- public void maskList() {
+ public void desensitizeListTest() {
List<String> list = Arrays.asList("name", "test");
- DataMaskUtils.maskList(false, "name", list, keyWordMatch,
DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
+ DataDesensitizeUtils.desensitizeList(false, "name", list,
keyWordMatch, DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
Assertions.assertTrue(CollectionUtils.isEqualCollection(list, list));
- DataMaskUtils.maskList(true, "name", list, keyWordMatch,
DataMaskEnums.MD5_ENCRYPT.getDataMaskAlg());
+ DataDesensitizeUtils.desensitizeList(true, "name", list, keyWordMatch,
DataDesensitizeEnum.MD5_ENCRYPT.getDataDesensitizeAlg());
List<String> md5List = Arrays.asList(DigestUtils.md5Hex("name"),
DigestUtils.md5Hex("test"));
Assertions.assertTrue(CollectionUtils.isEqualCollection(md5List,
list));
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
index 18c1b7d64..3044ce0b7 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-elasticsearch/src/main/java/org/apache/shenyu/plugin/logging/elasticsearch/collector/ElasticSearchLogCollector.java
@@ -22,7 +22,7 @@ import
org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import
org.apache.shenyu.plugin.logging.elasticsearch.client.ElasticSearchLogCollectClient;
import
org.apache.shenyu.plugin.logging.elasticsearch.handler.LoggingElasticSearchPluginDataHandler;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
/**
* elastic search log collector，depend a LogConsumeClient for consume logs.
@@ -46,6 +46,6 @@ public class ElasticSearchLogCollector extends
AbstractLogCollector<ElasticSearc
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
index 6ce3ca29a..3fc123bdf 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-kafka/src/main/java/org/apache/shenyu/plugin/logging/kafka/collector/KafkaLogCollector.java
@@ -22,7 +22,7 @@ import
org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
import org.apache.shenyu.plugin.logging.kafka.client.KafkaLogCollectClient;
import
org.apache.shenyu.plugin.logging.kafka.handler.LoggingKafkaPluginDataHandler;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
/**
* kafka log collector，depend a LogConsumeClient for consume logs.
@@ -46,6 +46,6 @@ public class KafkaLogCollector extends
AbstractLogCollector<KafkaLogCollectClien
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/utils/DataMaskUtils.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/utils/DataMaskUtils.java
deleted file mode 100644
index c75e11fe4..000000000
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-mask-api/src/main/java/org/apache/shenyu/plugin/logging/mask/api/utils/DataMaskUtils.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shenyu.plugin.logging.mask.api.utils;
-
-import org.apache.shenyu.common.utils.JsonUtils;
-import org.apache.shenyu.plugin.logging.mask.api.factory.DataMaskFactory;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * data mask utils.
- */
-public final class DataMaskUtils {
-
- /**
- * mask for single key word.
- *
- * @param keyWord key word
- * @param source source data
- * @param keyWordMatch keyWordMatch
- * @param dataMaskAlg dataMaskAlg
- * @return masked data
- */
- public static String maskForSingleWord(final String keyWord, final String
source,
- final KeyWordMatch keyWordMatch,
final String dataMaskAlg) {
- return DataMaskUtils.maskSingleKeyword(true, keyWord, source,
keyWordMatch, dataMaskAlg);
- }
-
- /**
- * mask for body.
- *
- * @param source source data.
- * @param keyWordMatch keyWordMatch
- * @param dataMaskAlg dataMaskAlg
- * @return masked data.
- */
- public static String maskForBody(final String source, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
- return DataMaskUtils.maskBody(true, source, keyWordMatch, dataMaskAlg);
- }
-
- /**
- * mask single keyword.
- *
- * @param masked mask flag
- * @param keyWord keyword
- * @param source source data
- * @param keyWordMatch keyWordMatch
- * @param dataMaskAlg mask algorithm
- * @return masked data
- */
- public static String maskSingleKeyword(final boolean masked, final String
keyWord, final String source,
- final KeyWordMatch keyWordMatch,
final String dataMaskAlg) {
- if (StringUtils.hasLength(source) && masked &&
keyWordMatch.matches(keyWord)) {
- return DataMaskFactory.selectMask(source, dataMaskAlg);
- } else {
- return source;
- }
- }
-
- /**
- * mask for body.
- *
- * @param masked mask flag
- * @param source source data
- * @param keyWordMatch keyword match strategy
- * @param dataMaskAlg mask algorithm
- * @return masked data
- */
- public static String maskBody(final boolean masked, final String source,
- final KeyWordMatch keyWordMatch, final
String dataMaskAlg) {
- if (StringUtils.hasLength(source) && masked) {
- Map<String, String> bodyMap = JsonUtils.jsonToMap(source,
String.class);
- bodyMap.forEach((key, value) -> {
- if (keyWordMatch.matches(key)) {
- bodyMap.put(key, DataMaskFactory.selectMask(value,
dataMaskAlg));
- }
- });
- return JsonUtils.toJson(bodyMap);
- } else {
- return source;
- }
- }
-
- /**
- * mask for list data.
- *
- * @param masked masked
- * @param keyword keyword
- * @param source source data
- * @param keyWordMatch keyword match strategy
- * @param dataMaskAlg mask algorithm
- */
- public static void maskList(final boolean masked, final String keyword,
final List<String> source,
- final KeyWordMatch keyWordMatch, final
String dataMaskAlg) {
- if (masked && keyWordMatch.matches(keyword)) {
- for (int i = 0; i < source.size(); i++) {
- String ret = DataMaskFactory.selectMask(source.get(i),
dataMaskAlg);
- source.set(i, ret);
- }
- }
- }
-}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
index 39a179bb9..c0c526100 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-pulsar/src/main/java/org/apache/shenyu/plugin/logging/pulsar/collector/PulsarLogCollector.java
@@ -20,7 +20,7 @@ package org.apache.shenyu.plugin.logging.pulsar.collector;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
import org.apache.shenyu.plugin.logging.pulsar.client.PulsarLogCollectClient;
import
org.apache.shenyu.plugin.logging.pulsar.handler.LoggingPulsarPluginDataHandler;
@@ -43,6 +43,6 @@ public class PulsarLogCollector extends
AbstractLogCollector<PulsarLogCollectCli
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
index 15dd00adf..0fbb41b6a 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-rocketmq/src/main/java/org/apache/shenyu/plugin/logging/rocketmq/collector/RocketMQLogCollector.java
@@ -20,7 +20,7 @@ package org.apache.shenyu.plugin.logging.rocketmq.collector;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
import
org.apache.shenyu.plugin.logging.rocketmq.client.RocketMQLogCollectClient;
import
org.apache.shenyu.plugin.logging.rocketmq.handler.LoggingRocketMQPluginDataHandler;
@@ -46,6 +46,6 @@ public class RocketMQLogCollector extends
AbstractLogCollector<RocketMQLogCollec
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
diff --git
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
index 86bbb6bcd..e95a7ea51 100644
---
a/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
+++
b/shenyu-plugin/shenyu-plugin-logging/shenyu-plugin-logging-tencent-cls/src/main/java/org/apache/shenyu/plugin/tencent/cls/collector/TencentClsSlsLogCollector.java
@@ -20,7 +20,7 @@ package org.apache.shenyu.plugin.tencent.cls.collector;
import org.apache.shenyu.plugin.logging.common.collector.AbstractLogCollector;
import org.apache.shenyu.plugin.logging.common.collector.LogCollector;
import org.apache.shenyu.plugin.logging.common.entity.ShenyuRequestLog;
-import org.apache.shenyu.plugin.logging.mask.api.matcher.KeyWordMatch;
+import org.apache.shenyu.plugin.logging.desensitize.api.matcher.KeyWordMatch;
import org.apache.shenyu.plugin.tencent.cls.client.TencentClsLogCollectClient;
import
org.apache.shenyu.plugin.tencent.cls.handler.LoggingTencentClsPluginDataHandler;
@@ -46,6 +46,6 @@ public class TencentClsSlsLogCollector extends
AbstractLogCollector<TencentClsLo
}
@Override
- protected void maskLog(final ShenyuRequestLog log, final KeyWordMatch
keyWordMatch, final String dataMaskAlg) {
+ protected void desensitizeLog(final ShenyuRequestLog log, final
KeyWordMatch keyWordMatch, final String desensitizeAlg) {
}
}
