ADM-819 mask sensitive data in log message (#1086)

* ADM-819: [backend]feat: modify log4j2 config to mask sensitive token in log message * ADM-819: [backend]feat: add off heap storage to jiraCard cache
au-heartbeat · Feb 28, 2024 · 4576627 · 4576627
1 parent af7a7ea
commit 4576627
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/backend/src/main/java/heartbeat/config/CacheConfig.java b/backend/src/main/java/heartbeat/config/CacheConfig.java
@@ -59,7 +59,13 @@ public CacheManager ehCacheManager() {
 
 	@SuppressWarnings("unchecked")
 	private <K, V> javax.cache.configuration.Configuration<K, V> getCacheConfiguration(Class<V> valueType) {
-		ResourcePoolsBuilder offHeap = ResourcePoolsBuilder.newResourcePoolsBuilder().offheap(2, MemoryUnit.MB);
+		ResourcePoolsBuilder offHeap;
+		if (valueType == String.class) {
+			offHeap = ResourcePoolsBuilder.newResourcePoolsBuilder().offheap(4, MemoryUnit.MB);
+		}
+		else {
+			offHeap = ResourcePoolsBuilder.newResourcePoolsBuilder().offheap(2, MemoryUnit.MB);
+		}
 		Duration timeToLive;
 		if (valueType == HolidaysResponseDTO.class) {
 			timeToLive = Duration.ofSeconds(300);

diff --git a/backend/src/main/resources/log4j2.xml b/backend/src/main/resources/log4j2.xml
@@ -2,7 +2,7 @@
 <Configuration status="INFO" name="Heartbeat">
     <Properties>
         <Property name="LOG_PATTERN">
-            %d{yyyy-MM-dd HH:mm:ss.SSS} [%highlight{%-5level}{FATAL=bg_red, ERROR=red, WARN=yellow, INFO=green}] [%t] %M(%c{1}:%L): %m%n%ex
+            %d{yyyy-MM-dd HH:mm:ss.SSS} [%highlight{%-5level}{FATAL=bg_red, ERROR=red, WARN=yellow, INFO=green}] [%t] %M(%c{1}:%L): %replace{%msg}{(((ghp_)|(bkua_))[a-zA-Z0-9]+)|((Basic )([A-Za-z0-9+/]{4})*([A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{2}==))}{xxxxx}%n%ex
         </Property>
     </Properties>
     <Appenders>