From bc4e0e09e29167d79744609be4760c9d84a6a9f8 Mon Sep 17 00:00:00 2001
From: sanathkumarbs <b.s.sanathkumar@gmail.com>
Date: Thu, 10 Nov 2022 12:21:48 -0800
Subject: [PATCH] fix: use lower case for all severity values

---
 src/extensions/nginx-app-protect/monitoring/processor/nap.go  | 2 +-
 .../testData/events-out/expanded_nap_waf.log.txt.out          | 4 ++--
 .../testData/events-out/xml_header_data.log.txt.out           | 4 ++--
 .../testData/events-out/xml_parameter_data.log.txt.out        | 4 ++--
 .../events-out/xml_parameter_data_as_param_data.log.txt.out   | 4 ++--
 .../events-out/xml_parameter_data_empty_context.log.txt.out   | 4 ++--
 .../testData/events-out/xml_signature_data.log.txt.out        | 4 ++--
 .../testData/events-out/xml_violation_name.log.txt.out        | 4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/extensions/nginx-app-protect/monitoring/processor/nap.go b/src/extensions/nginx-app-protect/monitoring/processor/nap.go
index 6d824f1ba..ea34ce712 100644
--- a/src/extensions/nginx-app-protect/monitoring/processor/nap.go
+++ b/src/extensions/nginx-app-protect/monitoring/processor/nap.go
@@ -460,7 +460,7 @@ func setValue(napConfig *NAPConfig, key, value string, logger *logrus.Entry) err
 	case requestStatus:
 		napConfig.RequestStatus = value
 	case severity:
-		napConfig.Severity = value
+		napConfig.Severity = strings.ToLower(value)
 	case sigSetNames:
 		napConfig.SigSetNames = replaceEncodedList(value, listSeperator)
 	case threatCampaignNames:
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/expanded_nap_waf.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/expanded_nap_waf.log.txt.out
index 40b6b6137..793d833b7 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/expanded_nap_waf.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/expanded_nap_waf.log.txt.out
@@ -1,8 +1,8 @@
 
 j
-Agent$c9f9fc06-6071-11ed-8415-5671f551701b4355056874564592513"ת������
*ERROR2Nginx:
+Agent$638d54bc-6135-11ed-8afe-5671f551701b4355056874564592513"��������*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592513REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/RHTTP/1.1bblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl�	parameter�u
+app_protect_default_policy4355056874564592513REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/RHTTP/1.1bblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl�	parameter�u
 VIOL_ATTACK_SIGNATURE	parameter
 
a<script>" 
 	200001475
3
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_header_data.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_header_data.log.txt.out
index 14da6f5fa..90b615cdc 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_header_data.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_header_data.log.txt.out
@@ -1,7 +1,7 @@
 
 j
-Agent$cff2dc2c-6071-11ed-8415-5671f551701b4355056874564592514"᪰��̈�
*ERROR2Nginx:
+Agent$6986d064-6135-11ed-8afe-5671f551701b4355056874564592514"��������*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592514REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl�header�6
+app_protect_default_policy4355056874564592514REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl�header�6
 VIOL_ATTACK_SIGNATUREheader
 Fooecho<!-- #echo
\ No newline at end of file
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data.log.txt.out
index 1b37e8b82..7bed45d0c 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data.log.txt.out
@@ -1,7 +1,7 @@
 
 j
-Agent$cc5dd738-6071-11ed-8415-5671f551701b4355056874564592515"۪������
*ERROR2Nginx:
+Agent$65f12080-6135-11ed-8afe-5671f551701b4355056874564592515"��������*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592515REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl�	parameter�`
+app_protect_default_policy4355056874564592515REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl�	parameter�`
 VIOL_ATTACK_SIGNATURE	parameterf5paramautotest>"(
 	300000110
7=f5paramautotest>"
1*15
\ No newline at end of file
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_as_param_data.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_as_param_data.log.txt.out
index 087d0084e..265d42efd 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_as_param_data.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_as_param_data.log.txt.out
@@ -1,7 +1,7 @@
 
 j
-Agent$cec1156c-6071-11ed-8415-5671f551701b4355056874564592516"ߪ������
*ERROR2Nginx:
+Agent$6854ee9c-6135-11ed-8afe-5671f551701b4355056874564592516"��������*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592516REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl�	parameter�6
+app_protect_default_policy4355056874564592516REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl�	parameter�6
 VIOL_JSON_MALFORMED	parameter
 json{ "a": "��"}
\ No newline at end of file
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_empty_context.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_empty_context.log.txt.out
index 1b9ac8dfb..3bbfe732a 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_empty_context.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_parameter_data_empty_context.log.txt.out
@@ -1,8 +1,8 @@
 
 j
-Agent$cd8f6360-6071-11ed-8415-5671f551701b4355056874564592517"ݪ������
*ERROR2Nginx:
+Agent$672307c0-6135-11ed-8afe-5671f551701b4355056874564592517"�����Ք�*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592517REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl�
+app_protect_default_policy4355056874564592517REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl�
 VIOL_PARAMETER
 
x
1�
 VIOL_PARAMETER
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_signature_data.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_signature_data.log.txt.out
index 98b2ab754..32fb5254a 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_signature_data.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_signature_data.log.txt.out
@@ -1,8 +1,8 @@
 
 j
-Agent$d124a6ac-6071-11ed-8415-5671f551701b4355056874564592518"㪰�����
*ERROR2Nginx:
+Agent$6ab883d8-6135-11ed-8afe-5671f551701b4355056874564592518"��������*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592518REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl��
+app_protect_default_policy4355056874564592518REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl��
 VIOL_ATTACK_SIGNATURE"�

 	200021094
4�
Connection: keep-alive
 Host: a.com
diff --git a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_violation_name.log.txt.out b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_violation_name.log.txt.out
index a16cf19b8..e70abc8e3 100755
--- a/test/component/nginx-app-protect/monitoring/testData/events-out/xml_violation_name.log.txt.out
+++ b/test/component/nginx-app-protect/monitoring/testData/events-out/xml_violation_name.log.txt.out
@@ -1,8 +1,8 @@
 
 j
-Agent$cb2bd36a-6071-11ed-8415-5671f551701b4355056874564592519"٪������
*ERROR2Nginx:
+Agent$64bf3aa8-6135-11ed-8afe-5671f551701b4355056874564592519"��������*ERROR2Nginx:
 AppProtect�
-app_protect_default_policy4355056874564592519REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
Critical�
N/A�
N/A�
HTTP Library�
N/A�curl�
+app_protect_default_policy4355056874564592519REJECTED"SECURITY_WAF_VIOLATION*N/A2GET:HTTPBN/AJ
/R^GET /?a=<script> HTTP/1.1\r\nHost: 127.0.0.1\r\nUser-Agent: curl/7.64.1\r\nAccept: */*\r\n\r\nbblockedjBlockedz1-localhost:1-/�
	127.0.0.1�
61478�
80�
�
HTTP protocol compliance failed,Illegal meta character in value,Attack signature detected,Violation Rating Threat detected,Bot Client Detected�
?HTTP protocol compliance failed:Host header contains IP address�

5�
u{Cross Site Scripting Signatures;High Accuracy Signatures},{Cross Site Scripting Signatures;High Accuracy Signatures}�

,�

Untrusted Bot�
N/A�
N/A�
critical�
N/A�
N/A�
HTTP Library�
N/A�curl�
 VIOL_ASM_COOKIE_MODIFIED�
 VIOL_ASM_COOKIE_MODIFIED�
 VIOL_ASM_COOKIE_MODIFIED�