Merge pull request #20 from preichel-cg/master

javabeanz · web-flow · commit 7fe7982b13bb · 2017-06-18T16:59:31.000+02:00
Issue #19: update of MaskingConverter (logback)
diff --git a/owasp-security-logging-logback/src/main/java/org/owasp/security/logging/mask/MaskingConverter.java b/owasp-security-logging-logback/src/main/java/org/owasp/security/logging/mask/MaskingConverter.java
@@ -30,7 +30,7 @@ public String convert(ILoggingEvent event) {
 
 		Object[] args = event.getArgumentArray();
 		if (eventMarker != null
-				&& eventMarker.equals(SecurityMarkers.CONFIDENTIAL)) {
+				&& eventMarker.contains(SecurityMarkers.CONFIDENTIAL)) {
 			for (int i = 0; i < args.length; i++) {
 				args[i] = MASKED_PASSWORD;
 			}

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public String convert(ILoggingEvent event) {`
`30`	`30`
`31`	`31`	`Object[] args = event.getArgumentArray();`
`32`	`32`	`if (eventMarker != null`
`33`		`- && eventMarker.equals(SecurityMarkers.CONFIDENTIAL)) {`
	`33`	`+ && eventMarker.contains(SecurityMarkers.CONFIDENTIAL)) {`
`34`	`34`	`for (int i = 0; i < args.length; i++) {`
`35`	`35`	`args[i] = MASKED_PASSWORD;`
`36`	`36`	`}`