Pull request #3589: JavaScript Normalizer: remove open tag alert in literals

Merge in SNORT/snort3 from ~ANOROKH/snort3:js_fix_otag_alert to master

Squashed commit of the following:

commit 1644b13faeabf1f758dd71cc80a9edf24ab84275
Author: AnnaNorokh <annanorokh15@gmail.comm>
Date:   Wed Sep 14 11:01:32 2022 +0300

     utils: remove alert for an opening tag in string literals

diff --git a/src/utils/js_tokenizer.l b/src/utils/js_tokenizer.l
index a1b7dcb255b2d1d72c12dff232f040be93125f3e..d35e4ca920aa110ece6d066791ddf56581276be1 100644 (file)
--- a/src/utils/js_tokenizer.l
+++ b/src/utils/js_tokenizer.l
@@ -1105,7 +1105,7 @@ ALL_UNICODE    [\0-\x7F]|[\xC2-\xDF][\x80-\xBF]|(\xE0[\xA0-\xBF]|[\xE1-\xEF][\x8
 
     {LITERAL_DQ_STRING_START}                 { EXEC(literal_dq_string_start()) }
 <dqstr,unesc_dqstr>{LITERAL_DQ_STRING_END}    { dealias_append(); ECHO; BEGIN(divop); }
-<dqstr,unesc_dqstr>{HTML_TAG_SCRIPT_OPEN}     { if (!ext_script) { opening_tag_seen = true; } ECHO; }
+<dqstr,unesc_dqstr>{HTML_TAG_SCRIPT_OPEN}     { ECHO; }
 <dqstr,unesc_dqstr>{HTML_TAG_SCRIPT_CLOSE}    { if (!ext_script) { BEGIN(regst); RETURN(CLOSING_TAG) } else { ECHO; } }
 <dqstr,unesc_dqstr>\\{CR}{LF}                 { /* skip */ }
 <dqstr,unesc_dqstr>\\{LF}                     { /* skip */ }
@@ -1127,7 +1127,7 @@ ALL_UNICODE    [\0-\x7F]|[\xC2-\xDF][\x80-\xBF]|(\xE0[\xA0-\xBF]|[\xE1-\xEF][\x8
 
     {LITERAL_SQ_STRING_START}                 { EXEC(literal_sq_string_start()) }
 <sqstr,unesc_sqstr>{LITERAL_SQ_STRING_END}    { dealias_append(); ECHO; BEGIN(divop); }
-<sqstr,unesc_sqstr>{HTML_TAG_SCRIPT_OPEN}     { if (!ext_script) { opening_tag_seen = true; } ECHO; }
+<sqstr,unesc_sqstr>{HTML_TAG_SCRIPT_OPEN}     { ECHO; }
 <sqstr,unesc_sqstr>{HTML_TAG_SCRIPT_CLOSE}    { if (!ext_script) { BEGIN(regst); RETURN(CLOSING_TAG) } else { ECHO; } }
 <sqstr,unesc_sqstr>\\{CR}{LF}                 { /* skip */ }
 <sqstr,unesc_sqstr>\\{LF}                     { /* skip */ }

diff --git a/src/utils/test/js_normalizer_test.cc b/src/utils/test/js_normalizer_test.cc
index 5b947c56c08dc48c0e84c2be3a2c2a8adb37b18f..fb23459789cd1f91533f3255e05882fc49f68011 100644 (file)
--- a/src/utils/test/js_normalizer_test.cc
+++ b/src/utils/test/js_normalizer_test.cc
@@ -1634,19 +1634,19 @@ TEST_CASE("nested script tags", "[JSNormalizer]")
     {
         test_normalization_noident(
             unexpected_tag_buf2, unexpected_tag_expected2,
-            {check_open_tag(true)});
+            {check_open_tag(false)});
     }
     SECTION("open tag within literal - mid")
     {
         test_normalization_noident(
             unexpected_tag_buf3, unexpected_tag_expected3,
-            {check_open_tag(true)});
+            {check_open_tag(false)});
     }
     SECTION("open tag within literal - end")
     {
         test_normalization_noident(
             unexpected_tag_buf4, unexpected_tag_expected4,
-            {check_open_tag(true)});
+            {check_open_tag(false)});
     }
     SECTION("close tag within literal - start")
         test_normalization_noident(
@@ -1677,7 +1677,7 @@ TEST_CASE("nested script tags", "[JSNormalizer]")
     {
         test_normalization_noident(
             unexpected_tag_buf8, unexpected_tag_expected8,
-            {check_open_tag(true)});
+            {check_open_tag(false)});
     }
     SECTION("close tag within literal - escaped")
     {
@@ -1781,13 +1781,13 @@ TEST_CASE("nested script tags", "[JSNormalizer]")
     {
         test_normalization_noident(
             unexpected_tag_buf23, unexpected_tag_expected23,
-            {check_open_tag(true)});
+            {check_open_tag(false)});
     }
     SECTION("mixed lower and upper case")
     {
         test_normalization_noident(
             unexpected_tag_buf24, unexpected_tag_expected24,
-            {check_open_tag(true)});
+            {check_open_tag(false)});
     }
     SECTION("opening tag within template literal")
     {