From 7c2cfce147b5fdeaa439d7e48f8da2f273bbf417 Mon Sep 17 00:00:00 2001 From: pandaapo <35672972+pandaapo@users.noreply.github.com> Date: Thu, 4 Aug 2022 18:05:22 +0800 Subject: [PATCH] Upgrade owasp esapi's configuration --- .../circuitbreaker/example/ServiceAController.java | 3 --- .../src/main/resources/ESAPI.properties | 10 ++++++++-- .../src/main/resources/ESAPI.properties | 10 ++++++++-- .../src/main/resources/ESAPI.properties | 10 ++++++++-- .../src/main/resources/ESAPI.properties | 10 ++++++++-- .../src/main/resources/ESAPI.properties | 10 ++++++++-- 6 files changed, 40 insertions(+), 13 deletions(-) diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java index 68d8acf9e..04570498c 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java @@ -61,9 +61,6 @@ public class ServiceAController { */ @GetMapping("/testRest") public String testRest() { - ResponseEntity entity = restTemplate - .getForEntity("http://polaris-circuitbreaker-example-b/example/service/b/info", String.class); - return entity.getBody(); ResponseEntity entity = restTemplate.getForEntity( "http://polaris-circuitbreaker-example-b/example/service/b/info", String.class); diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties index d83195ab8..32df629d9 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/ESAPI.properties @@ -1,8 +1,14 @@ ESAPI.printProperties=true - ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory -# ESAPI Encoder Encoder.AllowMultipleEncoding=false Encoder.AllowMixedEncoding=false Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec + +Logger.LogEncodingRequired=false +Logger.UserInfo=false +Logger.ClientInfo=false +Logger.ApplicationName=ExampleApplication +Logger.LogApplicationName=false +Logger.LogServerIP=false diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties index d83195ab8..32df629d9 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/ESAPI.properties @@ -1,8 +1,14 @@ ESAPI.printProperties=true - ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory -# ESAPI Encoder Encoder.AllowMultipleEncoding=false Encoder.AllowMixedEncoding=false Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec + +Logger.LogEncodingRequired=false +Logger.UserInfo=false +Logger.ClientInfo=false +Logger.ApplicationName=ExampleApplication +Logger.LogApplicationName=false +Logger.LogServerIP=false diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties index d83195ab8..32df629d9 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/ESAPI.properties @@ -1,8 +1,14 @@ ESAPI.printProperties=true - ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory -# ESAPI Encoder Encoder.AllowMultipleEncoding=false Encoder.AllowMixedEncoding=false Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec + +Logger.LogEncodingRequired=false +Logger.UserInfo=false +Logger.ClientInfo=false +Logger.ApplicationName=ExampleApplication +Logger.LogApplicationName=false +Logger.LogServerIP=false diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties index d83195ab8..32df629d9 100644 --- a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties +++ b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/ESAPI.properties @@ -1,8 +1,14 @@ ESAPI.printProperties=true - ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory -# ESAPI Encoder Encoder.AllowMultipleEncoding=false Encoder.AllowMixedEncoding=false Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec + +Logger.LogEncodingRequired=false +Logger.UserInfo=false +Logger.ClientInfo=false +Logger.ApplicationName=ExampleApplication +Logger.LogApplicationName=false +Logger.LogServerIP=false diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties index d83195ab8..32df629d9 100644 --- a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties +++ b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/ESAPI.properties @@ -1,8 +1,14 @@ ESAPI.printProperties=true - ESAPI.Encoder=org.owasp.esapi.reference.DefaultEncoder +ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory -# ESAPI Encoder Encoder.AllowMultipleEncoding=false Encoder.AllowMixedEncoding=false Encoder.DefaultCodecList=HTMLEntityCodec,PercentCodec,JavaScriptCodec + +Logger.LogEncodingRequired=false +Logger.UserInfo=false +Logger.ClientInfo=false +Logger.ApplicationName=ExampleApplication +Logger.LogApplicationName=false +Logger.LogServerIP=false