[cxf] branch 3.4.x-fixes updated: [CXF-8568] Added overloaded map method, added null check for sensitiveProtocolHeaders in DefaultLogEventMapper

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
     new ae4d1de  [CXF-8568] Added overloaded map method, added null check for 
sensitiveProtocolHeaders in DefaultLogEventMapper
ae4d1de is described below

commit ae4d1dec77f3432c85a4a6ddcacaf4540d1a528c
Author: nrickles3 <rickles.noah2...@gmail.com>
AuthorDate: Fri Jul 23 13:37:29 2021 -0400

    [CXF-8568] Added overloaded map method, added null check for 
sensitiveProtocolHeaders in DefaultLogEventMapper
    
    (cherry picked from commit ed1f43ed348698c9efd94f2e544f06bebf15787a)
---
 .../ext/logging/event/DefaultLogEventMapper.java   |  8 ++++++-
 .../cxf/ext/logging/DefaultLogEventMapperTest.java | 28 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 923f419..dc5b736 100644
--- 
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++ 
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -72,6 +72,10 @@ public class DefaultLogEventMapper {
         }
     }
 
+    public LogEvent map(final Message message) {
+        return this.map(message, Collections.emptySet());
+    }
+
     public LogEvent map(final Message message, final Set<String> 
sensitiveProtocolHeaders) {
         final LogEvent event = new LogEvent();
         event.setMessageId(getMessageId(message));
@@ -90,7 +94,9 @@ public class DefaultLogEventMapper {
         event.setContentType(safeGet(message, Message.CONTENT_TYPE));
 
         Map<String, String> headerMap = getHeaders(message);
-        maskSensitiveHelper.maskHeaders(headerMap, sensitiveProtocolHeaders);
+        if (sensitiveProtocolHeaders != null && 
!sensitiveProtocolHeaders.isEmpty()) {
+            maskSensitiveHelper.maskHeaders(headerMap, 
sensitiveProtocolHeaders);
+        }
         event.setHeaders(headerMap);
 
         event.setAddress(getAddress(message, event));
diff --git 
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
 
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index 08358cf..9df839e 100644
--- 
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++ 
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -119,4 +119,32 @@ public class DefaultLogEventMapperTest {
         assertEquals(MASKED_HEADER_VALUE, 
event.getHeaders().get(TEST_HEADER_NAME));
     }
 
+    @Test
+    public void testMapNullSensitiveProtocolHeaders() {
+        DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+        Message message = new MessageImpl();
+        message.put(Message.HTTP_REQUEST_METHOD, "POST");
+        message.put(Message.REQUEST_URI, "nullTest");
+        Exchange exchange = new ExchangeImpl();
+        message.setExchange(exchange);
+
+        LogEvent event = mapper.map(message, null);
+
+        assertEquals("POST[nullTest]", event.getOperationName());
+    }
+
+    @Test
+    public void testMap() {
+        DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+        Message message = new MessageImpl();
+        message.put(Message.HTTP_REQUEST_METHOD, "PUT");
+        message.put(Message.REQUEST_URI, "test");
+        Exchange exchange = new ExchangeImpl();
+        message.setExchange(exchange);
+
+        LogEvent event = mapper.map(message);
+
+        assertEquals("PUT[test]", event.getOperationName());
+    }
+
 }