Merge pull request #450 from anarkiwi/pyt2

remove gunicorn and eventlet and use bjoern #2

Author: cglewis

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
         export DEBIAN_FRONTEND=noninteractive && \
         echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections && \
         sudo apt-get update && \
-        sudo apt-get install -yq --no-install-recommends python3.7 python3-dev python3-setuptools dialog apt-utils tshark libpcap0.8 libpcap-dev p0f tcpdump && \
+        sudo apt-get install -yq --no-install-recommends libev-dev python3.7 python3-dev python3-setuptools dialog apt-utils tshark libpcap0.8 libpcap-dev p0f tcpdump && \
         pip3 install -U pip && \
         pip3 install codecov pytype pytest-cov && \
         find . -name requirements.txt -type f -exec pip3 install -r {} \; && \

Makefile

@@ -1,5 +1,5 @@
 test:
-	RESULT_PATH=/dev/null PYTHONPATH=network_tools_lib python3 -m pytest -l -s -v --cov=. --cov-report term-missing
+	RESULT_PATH=/dev/null PYTHONPATH=network_tap/ncontrol:network_tools_lib python3 -m pytest -l -s -v --cov=. --cov-report term-missing
 	# TODO: complete pytype coverage for pcap_stats
-	PYTHONPATH=network_tools_lib pytype -k --exclude=pcap_stats .
+	PYTHONPATH=network_tap/ncontrol:network_tools_lib pytype -k --exclude=pcap_stats .
 	./network_tap/ncapture/test_ncapture.sh

network_tap/Dockerfile

@@ -2,6 +2,7 @@ FROM alpine:3.14
 LABEL maintainer="Charlie Lewis <[email protected]>"
 
 ENV PYTHONPATH=/network-tap/network_tools_lib
+ENV PYTHONUNBUFFERED 1
 
 COPY network_tap/ncontrol/requirements.txt requirements.txt
 COPY network_tap/healthcheck /healthcheck
@@ -11,6 +12,7 @@ RUN apk add --update \
     gcc \
     g++ \
     git \
+    libev-dev \
     linux-headers \
     musl-dev \
     python3 \
@@ -38,4 +40,4 @@ WORKDIR /network-tap
 
 EXPOSE 8080
 
-CMD (flask run > /dev/null 2>&1) & (/network-tap/startup.sh)
+CMD (flask run > /dev/null 2>&1) & (python3 ncontrol/ncontrol.py)

network_tap/ncapture/send_message.py

@@ -50,13 +50,8 @@ def parse_args(parser):
 if __name__ == '__main__':  # pragma: no cover
     parsed_args = parse_args(argparse.ArgumentParser())
     path = get_path(parsed_args.paths)
-    uid = ''
-    if 'id' in os.environ:
-        uid = os.environ['id']
-    if 'external_host' in os.environ:
-        external_host = os.environ['external_host']
-    else:
-        external_host = 'messenger'
+    uid = os.environ.get('id', '')
+    external_host = os.environ.get('external_host', 'messenger')
     if os.environ.get('rabbit', False) == 'true':
         try:
             channel = connect_rabbit(host=external_host)

network_tap/ncontrol/__init__.py

@@ -1,12 +1,18 @@
+#!/usr/bin/env python3
+import bjoern
 import falcon
 from falcon_cors import CORS
 
-from .routes import routes
+import routes
 
+def make_api():
+    cors = CORS(allow_all_origins=True)
+    api = falcon.App(middleware=[cors.middleware])
+    r = routes.routes()
+    for route in r:
+        api.add_route(route, r[route])
+    return api
 
-cors = CORS(allow_all_origins=True)
-api = application = falcon.App(middleware=[cors.middleware])
 
-r = routes()
-for route in r:
-    api.add_route(route, r[route])
+if __name__ == "__main__":
+    bjoern.run(make_api(), "0.0.0.0", 8080)  # nosec

network_tap/ncontrol/ncontrol.py

@@ -1,5 +1,4 @@
+bjoern==3.1.0
 docker==5.0.0
-eventlet==0.30.2
 falcon==3.0.1
 falcon-cors==1.1.7
-gunicorn==20.1.0

network_tap/ncontrol/requirements.txt

@@ -1,12 +1,12 @@
 def routes():
-    from .paths import CreateR, DeleteR, InfoR, ListR, StartR, StopR
-    p = paths()
-    create_r = CreateR()
-    delete_r = DeleteR()
-    info_r = InfoR()
-    list_r = ListR()
-    start_r = StartR()
-    stop_r = StopR()
+    import paths
+    p = endpoints()
+    create_r = paths.CreateR()
+    delete_r = paths.DeleteR()
+    info_r = paths.InfoR()
+    list_r = paths.ListR()
+    start_r = paths.StartR()
+    stop_r = paths.StopR()
     funcs = [create_r,
              delete_r,
              info_r,
@@ -16,7 +16,7 @@ def routes():
     return dict(list(zip(p, funcs)))
 
 
-def paths():
+def endpoints():
     return ['/create',
             '/delete',
             '/info',

network_tap/ncontrol/routes.py

@@ -4,12 +4,12 @@
 import pytest
 from falcon import testing
 
-from .ncontrol import api
+from ncontrol import make_api
 
 
 @pytest.fixture
 def client():
-    return testing.TestClient(api)
+    return testing.TestClient(make_api())
 
 
 def test_create_r(client):