trinitor/DetectionLab
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added Malcolm

Browse Source
This commit is contained in:
Trinitor
2021-08-06 10:35:01 +02:00
parent f043730066
commit 70f1922e80
751 changed files with 195277 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Vagrant/resources/malcolm/moloch/patch_debug/js_debug_build.patch.debug Normal file
View File

@@ -0,0 +1,61 @@
diff --git a/Makefile.am b/Makefile.am
index bc2b9fe0..978409cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = . capture db viewer parliament release
install-exec-local:
npm install
@INSTALL@ -D package.json @prefix@/package.json
- (cd @prefix@ ; npm install --production)
+ (cd @prefix@ ; npm install)
config:
@prefix@/bin/Configure
diff --git a/Makefile.in b/Makefile.in
index 45354dc9..bde5e4ec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -282,7 +282,7 @@ capture/molochconfig.h: capture/stamp-h1
capture/stamp-h1: $(top_srcdir)/capture/molochconfig.h.in $(top_builddir)/config.status
@rm -f capture/stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status capture/molochconfig.h
-$(top_srcdir)/capture/molochconfig.h.in: $(am__configure_deps)
+$(top_srcdir)/capture/molochconfig.h.in: $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f capture/stamp-h1
touch $@
@@ -747,7 +747,7 @@ uninstall-am:
install-exec-local:
npm install
@INSTALL@ -D package.json @prefix@/package.json
- (cd @prefix@ ; npm install --production)
+ (cd @prefix@ ; npm install)
config:
@prefix@/bin/Configure
diff --git a/parliament/Makefile.in b/parliament/Makefile.in
index e5224bed..aa2c3ec9 100644
--- a/parliament/Makefile.in
+++ b/parliament/Makefile.in
@@ -13,7 +13,7 @@ install:
npm install
npm run build
$(CP) -pr public dist notifiers $(PARLIAMENTDIR)
- (cd $(PARLIAMENTDIR) ; npm install --production)
+ (cd $(PARLIAMENTDIR) ; npm install)
distclean realclean clean:
rm -rf node_modules
diff --git a/viewer/Makefile.in b/viewer/Makefile.in
index 1e7f65fb..6de24568 100644
--- a/viewer/Makefile.in
+++ b/viewer/Makefile.in
@@ -16,7 +16,7 @@ install:
npm run bundle:min
$(CP) -pr views public $(VIEWERDIR)
$(CP) -pr vueapp/dist "$(VIEWERDIR)/vueapp"
- (cd $(VIEWERDIR) ; npm install --production)
+ (cd $(VIEWERDIR) ; npm install)
distclean realclean clean:
rm -rf node_modules

23
Vagrant/resources/malcolm/moloch/patch_debug/moloch_extra_auth_debug.patch Normal file
View File

@@ -0,0 +1,23 @@
diff -Naur a/viewer/viewer.js b/viewer/viewer.js
--- a/viewer/viewer.js 2018-10-03 13:08:06.228039893 -0600
+++ b/viewer/viewer.js 2018-10-03 13:10:44.327829524 -0600
@@ -221,8 +221,11 @@
}
// Header auth
+ console.log("DEBUG 1 - checking userNameHeader of", internals.userNameHeader, "in", req.headers, "for", req.url);
if (internals.userNameHeader !== undefined) {
+ console.log("DEBUG 2 - checking userNameHeader of", internals.userNameHeader, "in", req.headers, "for", req.url);
if (req.headers[internals.userNameHeader] !== undefined) {
+ console.log("DEBUG 3 - checking userNameHeader of", internals.userNameHeader, "in", req.headers, "for", req.url);
var userName = req.headers[internals.userNameHeader];
Db.getUserCache(userName, function(err, suser) {
if (err) {return res.send("ERROR - getUser - user: " + userName + " err:" + err);}
@@ -239,6 +242,7 @@
console.log("DEBUG - Couldn't find userNameHeader of", internals.userNameHeader, "in", req.headers, "for", req.url);
}
}
+ console.log("DEBUG 4 - after userNameHeader of", internals.userNameHeader, "in", req.headers, "for", req.url);
// Browser auth
req.url = req.url.replace("/", Config.basePath());