Merge pull request #3025 in SNORT/snort3 from ~VHORBATO/snort3:other_methods to master

Squashed commit of the following:

commit 4be7d2ba74641413c7f390345377942f09ed9c29
Author: Vitalii <vhorbato@cisco.com>
Date:   Mon Aug 16 13:32:00 2021 +0300

    wizard: support more HTTP and SIP methods

diff --git a/lua/snort_defaults.lua b/lua/snort_defaults.lua
index 36381eb1b48636792ed949c4f3c985917cdde252..39f50389480af3a2a532352ce6f69b63ef89a1d0 100644 (file)
--- a/lua/snort_defaults.lua
+++ b/lua/snort_defaults.lua
@@ -340,15 +340,13 @@ http_methods =  -- build from default_http_methods
     'UPDATEREDIRECTREF', 'PROPFIND', 'PROPPATCH', 'MKCOL', 'COPY',
     'MOVE', 'LOCK', 'UNLOCK', 'SEARCH', 'BCOPY', 'BDELETE', 'BMOVE',
     'BPROPFIND', 'BPROPPATCH', 'POLL', 'UNSUBSCRIBE', 'X_MS_ENUMATTS',
-    'OPTIONS * HTTP/',
-    --'NOTIFY', 'SUBSCRIBE', 'UPDATE'
+    'NOTIFY * HTTP/', 'SUBSCRIBE * HTTP/', 'UPDATE * HTTP/', 'OPTIONS * HTTP/'
 }
 
 sip_requests =
 {
-    'INVITE * SIP/', 'CANCEL * SIP/', 'ACK * SIP/', 'BYE * SIP/', 'REGISTER * SIP/',
-    'REFER * SIP/', 'SUBSCRIBE * SIP/', 'UPDATE * SIP/', 'INFO * SIP/', 'MESSAGE * SIP/',
-    'NOTIFY * SIP/', 'PRACK * SIP/', 'OPTIONS * SIP/'
+    'INVITE', 'CANCEL', 'BYE', 'REGISTER', 'PRACK', 'PUBLISH', 'REFER', 'INFO', 'MESSAGE',
+    'ACK * SIP/', 'SUBSCRIBE * SIP/', 'UPDATE * SIP/', 'NOTIFY * SIP/', 'OPTIONS * SIP/'
 }
 
 telnet_commands =