Merge pull request #336 from cglewis/master

several fixes

Author: cglewis

mercury/app.py

@@ -56,6 +56,8 @@ def ispcap(pathfile):
 def main():
     pcap_paths = []
     path = sys.argv[1]
+    if path == "":
+        sys.exit(1)
     if os.path.isdir(path):
         for root, _, files in os.walk(path):
             for pathfile in files:

network_tap/ncapture/run.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 URI="$1"
 INTERVAL="$2"

pcap_stats/pcap_stats.py

@@ -5,7 +5,7 @@
 @author: Charlie Lewis
 """
 
-import datetime
+from datetime import datetime
 import json
 import os
 import shlex
@@ -89,7 +89,7 @@ def send_rabbit_msg(msg, channel, exchange='', routing_key='task_queue'):
                           properties=pika.BasicProperties(
                           delivery_mode=2,
                          ))
-    print(" [X] %s UTC %r %r" % (str(datetime.datetime.utcnow()),
+    print(" [X] %s UTC %r %r" % (str(datetime.utcnow()),
                                  str(msg['id']), str(msg['file_path'])))
     return
 

snort/Dockerfile

@@ -2,7 +2,7 @@ FROM debian:buster-slim
 LABEL maintainer="Charlie Lewis <[email protected]>"
 
 ENV DAQ_VERSION 2.0.7
-ENV SNORT_VERSION 2.9.16
+ENV SNORT_VERSION 2.9.16.1
 
 WORKDIR /opt
 
@@ -28,16 +28,18 @@ RUN apt-get update && \
         libnetfilter-queue1 \
         tcpdump \
         unzip && \
-        wget https://www.snort.org/downloads/snort/daq-${DAQ_VERSION}.tar.gz \
+        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN wget https://www.snort.org/downloads/snort/daq-${DAQ_VERSION}.tar.gz \
         && tar xvfz daq-${DAQ_VERSION}.tar.gz \
         && cd daq-${DAQ_VERSION} \
         && autoreconf -f -i \
-        && ./configure; make; make install && \
-        wget https://www.snort.org/downloads/snort/snort-${SNORT_VERSION}.tar.gz \
+        && ./configure; make; make install \
+        && rm -rf /opt/daq-${DAQ_VERSION}.tar.gz
+RUN wget https://www.snort.org/downloads/snort/snort-${SNORT_VERSION}.tar.gz \
         && tar xvfz snort-${SNORT_VERSION}.tar.gz \
         && cd snort-${SNORT_VERSION} \
-        && ./configure --disable-open-appid; make; make install && \
-        apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /opt/snort-${SNORT_VERSION}.tar.gz /opt/daq-${DAQ_VERSION}.tar.gz
+        && ./configure --disable-open-appid; make; make install \
+        && rm -rf /opt/snort-${SNORT_VERSION}.tar.gz
 
 RUN ldconfig
 RUN touch /var/log/snort/alert