move wiseService to toplevel

SCS-Labs · Jan 9, 2019 · f104d49 · f104d49
1 parent 8c7feaf
commit f104d49
Show file tree

Hide file tree

Showing 35 changed files with 29 additions and 13 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . capture db viewer parliament release tests
+SUBDIRS = . capture db viewer parliament wiseService release tests
 install-exec-local:
 	npm ci
 	cp -pr notifiers @prefix@

diff --git a/Makefile.in b/Makefile.in
@@ -45,6 +45,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(top_srcdir)/capture/plugins/snf/Makefile.in \
 	$(top_srcdir)/configure $(top_srcdir)/db/Makefile.in \
 	$(top_srcdir)/parliament/Makefile.in \
+	$(top_srcdir)/wiseService/Makefile.in \
 	$(top_srcdir)/release/Makefile.in \
 	$(top_srcdir)/tests/plugins/Makefile.in \
 	$(top_srcdir)/viewer/Makefile.in \
@@ -63,7 +64,7 @@ CONFIG_CLEAN_FILES = capture/Makefile capture/plugins/Makefile \
 	capture/plugins/snf/Makefile capture/plugins/lua/Makefile \
 	capture/parsers/Makefile db/Makefile tests/plugins/Makefile \
 	viewer/Makefile viewer/version.js parliament/Makefile \
-	release/Makefile
+	wiseService/Makefile release/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
@@ -234,7 +235,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = . capture db viewer parliament release tests
+SUBDIRS = . capture db viewer parliament wiseService release tests
 all: all-recursive
 
 .SUFFIXES:
@@ -313,6 +314,8 @@ viewer/version.js: $(top_builddir)/config.status $(top_srcdir)/viewer/version.js
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 parliament/Makefile: $(top_builddir)/config.status $(top_srcdir)/parliament/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
+wiseService/Makefile: $(top_builddir)/config.status $(top_srcdir)/wiseService/Makefile.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 release/Makefile: $(top_builddir)/config.status $(top_srcdir)/release/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 

diff --git a/capture/plugins/Makefile.in b/capture/plugins/Makefile.in
@@ -7,7 +7,6 @@ install_sh = @install_sh@
 mkdir_p = @mkdir_p@
 INSTALL = @INSTALL@
 PLUGINDIR = @prefix@/plugins
-WISEDIR = @prefix@/wiseService
 BINDIR = @prefix@/bin
 
 SRCS=$(wildcard *.c)
@@ -19,15 +18,11 @@ SOS=$(SRCS:.c=.so)
 all:$(SOS)
 
 check:
-	(cd wiseService ; npm install --production)
 
 install:
 	$(INSTALL) taggerUpload.pl $(BINDIR)
 	@mkdir -p "$(PLUGINDIR)"
 	$(INSTALL) *.so *.jade *.js $(PLUGINDIR)
-	@mkdir -p "$(WISEDIR)"
-	$(INSTALL) wiseService/*.js wiseService/wiseService.ini.sample wiseService/package.json $(WISEDIR)
-	(cd $(WISEDIR) ; npm install --production)
 	@mkdir -p "$(PLUGINDIR)/writer-s3"
 	$(INSTALL) writer-s3/*.js writer-s3/package.json $(PLUGINDIR)/writer-s3
 	(cd $(PLUGINDIR)/writer-s3 ; npm install --production)

diff --git a/configure b/configure
@@ -4889,7 +4889,7 @@ fi
 
 done
 
-ac_config_files="$ac_config_files Makefile capture/Makefile capture/plugins/Makefile capture/plugins/daq/Makefile capture/plugins/pfring/Makefile capture/plugins/snf/Makefile capture/plugins/lua/Makefile capture/parsers/Makefile db/Makefile tests/plugins/Makefile viewer/Makefile viewer/version.js parliament/Makefile release/Makefile"
+ac_config_files="$ac_config_files Makefile capture/Makefile capture/plugins/Makefile capture/plugins/daq/Makefile capture/plugins/pfring/Makefile capture/plugins/snf/Makefile capture/plugins/lua/Makefile capture/parsers/Makefile db/Makefile tests/plugins/Makefile viewer/Makefile viewer/version.js parliament/Makefile release/Makefile wiseService/Makefile"
 
 
 

diff --git a/configure.ac b/configure.ac
@@ -21,6 +21,7 @@ AC_CONFIG_FILES([
   viewer/version.js
   parliament/Makefile
   release/Makefile
+  wiseService/Makefile
 ])
 
 AC_CHECK_LIB(pcre, main,,AC_MSG_ERROR(please install PCRE library))

diff --git a/tests/tests.pl b/tests/tests.pl
@@ -225,14 +225,14 @@ sub doViewer {
         $main::userAgent->post("http://localhost:8123/flushCache");
         print ("Starting viewer\n");
         if ($main::debug) {
-            system("cd ../capture/plugins/wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /tmp/moloch.wise &");
+            system("cd ../wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /tmp/moloch.wise &");
             system("cd ../viewer ; node --trace-warnings multies.js -c ../tests/config.test.ini -n all --debug > /tmp/multies.all &");
             system("cd ../viewer ; node --trace-warnings viewer.js -c ../tests/config.test.ini -n test --debug > /tmp/moloch.test &");
             system("cd ../viewer ; node --trace-warnings viewer.js -c ../tests/config.test.ini -n test2 --debug > /tmp/moloch.test2 &");
             system("cd ../viewer ; node --trace-warnings viewer.js -c ../tests/config.test.ini -n all --debug > /tmp/moloch.all &");
             system("cd ../parliament ; node --trace-warnings parliament.js --regressionTests -c /dev/null --debug > /tmp/moloch.parliament 2>&1 &");
         } else {
-            system("cd ../capture/plugins/wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /dev/null &");
+            system("cd ../wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /dev/null &");
             system("cd ../viewer ; node multies.js -c ../tests/config.test.ini -n all > /dev/null &");
             system("cd ../viewer ; node viewer.js -c ../tests/config.test.ini -n test > /dev/null &");
             system("cd ../viewer ; node viewer.js -c ../tests/config.test.ini -n test2 > /dev/null &");
@@ -263,9 +263,9 @@ sub doViewer {
 
         # Start Wise
         if ($main::debug) {
-            system("cd ../capture/plugins/wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /tmp/moloch.wise &");
+            system("cd ../wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /tmp/moloch.wise &");
         } else {
-            system("cd ../capture/plugins/wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /dev/null &");
+            system("cd ../wiseService ; node wiseService.js -c ../../../tests/config.test.ini > /dev/null &");
         }
 
         waitFor($MolochTest::host, 8081);

diff --git a/capture/plugins/wiseService/.jshintrc → wiseService/.jshintrc b/capture/plugins/wiseService/.jshintrc → wiseService/.jshintrc
diff --git a/wiseService/Makefile.in b/wiseService/Makefile.in
@@ -0,0 +1,17 @@
+install_sh = @install_sh@
+mkdir_p = @mkdir_p@
+INSTALL = @INSTALL@
+PLUGINDIR = @prefix@/plugins
+WISEDIR = @prefix@/wiseService
+BINDIR = @prefix@/bin
+
+check:
+	npm install --production
+
+install:
+	@mkdir -p "$(WISEDIR)"
+	$(INSTALL) *.js wiseService.ini.sample package.json $(WISEDIR)
+	(cd $(WISEDIR) ; npm install --production)
+
+distclean realclean clean:
+	rm -f *.o *.so
diff --git a/capture/plugins/wiseService/hodi.groovy → wiseService/hodi.groovy b/capture/plugins/wiseService/hodi.groovy → wiseService/hodi.groovy
diff --git a/capture/plugins/wiseService/molochwise.bro → wiseService/molochwise.bro b/capture/plugins/wiseService/molochwise.bro → wiseService/molochwise.bro
diff --git a/capture/plugins/wiseService/package.json → wiseService/package.json b/capture/plugins/wiseService/package.json → wiseService/package.json
diff --git a/...lugins/wiseService/right_click.ini.sample → wiseService/right_click.ini.sample b/...lugins/wiseService/right_click.ini.sample → wiseService/right_click.ini.sample
diff --git a/capture/plugins/wiseService/simpleSource.js → wiseService/simpleSource.js b/capture/plugins/wiseService/simpleSource.js → wiseService/simpleSource.js
diff --git a/.../plugins/wiseService/source.alienvault.js → wiseService/source.alienvault.js b/.../plugins/wiseService/source.alienvault.js → wiseService/source.alienvault.js
diff --git a/...gins/wiseService/source.elasticesearch.js → wiseService/source.elasticesearch.js b/...gins/wiseService/source.elasticesearch.js → wiseService/source.elasticesearch.js
diff --git a/...ins/wiseService/source.emergingthreats.js → wiseService/source.emergingthreats.js b/...ins/wiseService/source.emergingthreats.js → wiseService/source.emergingthreats.js
diff --git a/capture/plugins/wiseService/source.file.js → wiseService/source.file.js b/capture/plugins/wiseService/source.file.js → wiseService/source.file.js
diff --git a/capture/plugins/wiseService/source.hodi.js → wiseService/source.hodi.js b/capture/plugins/wiseService/source.hodi.js → wiseService/source.hodi.js
diff --git a/...e/plugins/wiseService/source.hodiredis.js → wiseService/source.hodiredis.js b/...e/plugins/wiseService/source.hodiredis.js → wiseService/source.hodiredis.js
diff --git a/...ure/plugins/wiseService/source.opendns.js → wiseService/source.opendns.js b/...ure/plugins/wiseService/source.opendns.js → wiseService/source.opendns.js
diff --git a/...lugins/wiseService/source.passivetotal.js → wiseService/source.passivetotal.js b/...lugins/wiseService/source.passivetotal.js → wiseService/source.passivetotal.js
diff --git a/capture/plugins/wiseService/source.redis.js → wiseService/source.redis.js b/capture/plugins/wiseService/source.redis.js → wiseService/source.redis.js
diff --git a/.../plugins/wiseService/source.reversedns.js → wiseService/source.reversedns.js b/.../plugins/wiseService/source.reversedns.js → wiseService/source.reversedns.js
diff --git a/.../plugins/wiseService/source.rightclick.js → wiseService/source.rightclick.js b/.../plugins/wiseService/source.rightclick.js → wiseService/source.rightclick.js
diff --git a/capture/plugins/wiseService/source.splunk.js → wiseService/source.splunk.js b/capture/plugins/wiseService/source.splunk.js → wiseService/source.splunk.js
diff --git a/...ure/plugins/wiseService/source.threatq.js → wiseService/source.threatq.js b/...ure/plugins/wiseService/source.threatq.js → wiseService/source.threatq.js
diff --git a/...lugins/wiseService/source.threatstream.js → wiseService/source.threatstream.js b/...lugins/wiseService/source.threatstream.js → wiseService/source.threatstream.js
diff --git a/capture/plugins/wiseService/source.url.js → wiseService/source.url.js b/capture/plugins/wiseService/source.url.js → wiseService/source.url.js
diff --git a/.../plugins/wiseService/source.virustotal.js → wiseService/source.virustotal.js b/.../plugins/wiseService/source.virustotal.js → wiseService/source.virustotal.js
diff --git a/...e/plugins/wiseService/source.wiseproxy.js → wiseService/source.wiseproxy.js b/...e/plugins/wiseService/source.wiseproxy.js → wiseService/source.wiseproxy.js
diff --git a/capture/plugins/wiseService/sprintf.js → wiseService/sprintf.js b/capture/plugins/wiseService/sprintf.js → wiseService/sprintf.js
diff --git a/capture/plugins/wiseService/wiseCache.js → wiseService/wiseCache.js b/capture/plugins/wiseService/wiseCache.js → wiseService/wiseCache.js
diff --git a/...lugins/wiseService/wiseService.ini.sample → wiseService/wiseService.ini.sample b/...lugins/wiseService/wiseService.ini.sample → wiseService/wiseService.ini.sample
diff --git a/capture/plugins/wiseService/wiseService.js → wiseService/wiseService.js b/capture/plugins/wiseService/wiseService.js → wiseService/wiseService.js
diff --git a/capture/plugins/wiseService/wiseSource.js → wiseService/wiseSource.js b/capture/plugins/wiseService/wiseSource.js → wiseService/wiseSource.js
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4889,7 +4889,7 @@ fi

		done

		ac_config_files="$ac_config_files Makefile capture/Makefile capture/plugins/Makefile capture/plugins/daq/Makefile capture/plugins/pfring/Makefile capture/plugins/snf/Makefile capture/plugins/lua/Makefile capture/parsers/Makefile db/Makefile tests/plugins/Makefile viewer/Makefile viewer/version.js parliament/Makefile release/Makefile"
		ac_config_files="$ac_config_files Makefile capture/Makefile capture/plugins/Makefile capture/plugins/daq/Makefile capture/plugins/pfring/Makefile capture/plugins/snf/Makefile capture/plugins/lua/Makefile capture/parsers/Makefile db/Makefile tests/plugins/Makefile viewer/Makefile viewer/version.js parliament/Makefile release/Makefile wiseService/Makefile"



Expand Down