initial http2 PRI * support (arkime#1475)

initial http2 PRI support and ALPN http2 protocol set
SCS-Labs · Jul 6, 2020 · f89c655 · f89c655
1 parent 1c25c6f
commit f89c655
Show file tree

Hide file tree

Showing 16 changed files with 1,356 additions and 134 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,7 @@ ES Versions:
   * Moloch >= 0.18.1 supports ES 2.4.x, >= 5.3.1 not 6.x or later
 
 Node Versions:
+  * Moloch >= 2.4.0 requires NodeJS 12.x
   * Moloch >= 2.0.0 requires NodeJS 10.x
   * Moloch >= 1.6.0 requires NodeJS 8.x, 8.12 or later
   * Moloch >= 1.0.0 requires NodeJS 8.x
@@ -18,7 +19,9 @@ Node Versions:
 NOTICE: Restart wiseService before capture when upgrading
 
 2.4.0 2020/07/xx
-  - NOTE - RHEL/Centos 6 is no longer supported
+  - NOTE - RHEL/Centos 6 is no longer supported, Node 12 required
+  - release - node 12.18.2, glib 2.64.3
+  - viewer - aes256Encryption now defaults to true
 
 2.3.2 2020/06/29
   - NOTE - 2.3.x will be the last version to support RHEL/Centos 6

diff --git a/capture/Makefile.in b/capture/Makefile.in
@@ -20,6 +20,7 @@ LIB_OTHER     = @GLIB2_LIBS@ \
 	        @YARA_LIBS@ \
 	        @MAXMINDDB_LIBS@ \
 	        @CURL_LIBS@ \
+	        @NGHTTP2_LIBS@ \
                 @LIBS@ \
 	        thirdparty/http_parser.o \
 	        thirdparty/js0n.o \

diff --git a/capture/parsers.c b/capture/parsers.c
@@ -735,6 +735,7 @@ void moloch_parsers_init()
 
             if (!parser) {
                 LOG("ERROR - Couldn't load parser %s from '%s'\n%s", filenames[i], path, g_module_error());
+                g_free(filenames[i]);
                 g_free (path);
                 continue;
             }
@@ -744,6 +745,7 @@ void moloch_parsers_init()
             if (!g_module_symbol(parser, "moloch_parser_init", (gpointer *)(char*)&parser_init) || parser_init == NULL) {
                 LOG("ERROR - Module %s doesn't have a moloch_parser_init", filenames[i]);
                 g_free(filenames[i]);
+                g_free (path);
                 continue;
             }
 

diff --git a/capture/parsers/Makefile.in b/capture/parsers/Makefile.in
@@ -1,6 +1,7 @@
 INCLUDE_PCAP  = @PCAP_CFLAGS@
 
 INCLUDE_OTHER = -I.. -I../thirdparty \
+	        @NGHTTP2_CFLAGS@ \
                 @GLIB2_CFLAGS@
 
 install_sh = @install_sh@
@@ -16,6 +17,9 @@ SOS=$(SRCS:.c=.so)
 
 all:$(SOS)
 
+sanitize:
+	$(MAKE) SANITIZE_FLAGS="-DMOLOCH_USE_MALLOC -fno-common -fsanitize=address -fsanitize=integer -fsanitize=nullability"
+
 install:
 	@mkdir -p "$(PARSERSDIR)"
 	$(INSTALL) *.so *.jade $(PARSERSDIR)