From bb8eed79647f191d8562436381316eb69498ae92 Mon Sep 17 00:00:00 2001 From: Sebastian Waldbauer Date: Thu, 12 Nov 2020 12:47:15 +0100 Subject: [PATCH] Position.conf fix Fixes #2 Signed-off-by: Sebastian Waldbauer --- Dockerfile | 5 -- entrypoint.sh | 2 +- example_config/intelmq/etc/defaults.conf | 2 +- .../intelmq/etc/manager/positions.conf | 66 +++++++++++++++++++ example_config/intelmq/etc/pipeline.conf | 42 ++++++------ example_config/intelmq/etc/runtime.conf | 10 ++- 6 files changed, 96 insertions(+), 31 deletions(-) create mode 100644 example_config/intelmq/etc/manager/positions.conf diff --git a/Dockerfile b/Dockerfile index 43809ac..e1f35d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,11 +49,6 @@ RUN cd /opt/intelmq-manager \ && pip3 install hug mako \ && pip3 install --no-cache-dir -e . -RUN mkdir /opt/intelmq/etc/manager/ \ - && touch /opt/intelmq/etc/manager/positions.conf \ - && chgrp www-data /opt/intelmq/etc/*.conf /opt/intelmq/etc/manager/positions.conf \ - && chmod g+w /opt/intelmq/etc/*.conf /opt/intelmq/etc/manager/positions.conf - ADD entrypoint.sh /opt/entrypoint.sh RUN chmod +x /opt/entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh index 6d3a202..138dd4b 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ #!/bin/bash -if [ $1 == 'selftest' ] +if [[ $1 == "selftest" ]] then cd /opt/intelmq && nosetests3 else diff --git a/example_config/intelmq/etc/defaults.conf b/example_config/intelmq/etc/defaults.conf index 4cb5dc0..aa8add7 100644 --- a/example_config/intelmq/etc/defaults.conf +++ b/example_config/intelmq/etc/defaults.conf @@ -36,4 +36,4 @@ "statistics_host": "127.0.0.1", "statistics_password": null, "statistics_port": 6379 -} +} \ No newline at end of file diff --git a/example_config/intelmq/etc/manager/positions.conf b/example_config/intelmq/etc/manager/positions.conf new file mode 100644 index 0000000..942a4c7 --- /dev/null +++ b/example_config/intelmq/etc/manager/positions.conf @@ -0,0 +1,66 @@ +{ + "cymru-whois-expert": { + "x": -280, + "y": 414 + }, + "deduplicator-expert": { + "x": 148, + "y": -107 + }, + "feodo-tracker-browse-collector": { + "x": 136, + "y": -384 + }, + "feodo-tracker-browse-parser": { + "x": 97, + "y": -287 + }, + "file-output": { + "x": -413, + "y": 428 + }, + "gethostbyname-1-expert": { + "x": -125, + "y": 374 + }, + "gethostbyname-2-expert": { + "x": -252, + "y": 243 + }, + "malc0de-parser": { + "x": 297, + "y": 24 + }, + "malc0de-windows-format-collector": { + "x": 433, + "y": 121 + }, + "malware-domain-list-collector": { + "x": 465, + "y": -198 + }, + "malware-domain-list-parser": { + "x": 283, + "y": -125 + }, + "spamhaus-drop-collector": { + "x": -137, + "y": -281 + }, + "spamhaus-drop-parser": { + "x": 1, + "y": -193 + }, + "taxonomy-expert": { + "x": -3, + "y": 30 + }, + "url2fqdn-expert": { + "x": -75, + "y": 179 + }, + "settings": { + "physics": false, + "live": true + } +} \ No newline at end of file diff --git a/example_config/intelmq/etc/pipeline.conf b/example_config/intelmq/etc/pipeline.conf index 1571db7..17982d6 100644 --- a/example_config/intelmq/etc/pipeline.conf +++ b/example_config/intelmq/etc/pipeline.conf @@ -1,15 +1,15 @@ { "cymru-whois-expert": { + "source-queue": "cymru-whois-expert-queue", "destination-queues": [ "file-output-queue" - ], - "source-queue": "cymru-whois-expert-queue" + ] }, "deduplicator-expert": { + "source-queue": "deduplicator-expert-queue", "destination-queues": [ "taxonomy-expert-queue" - ], - "source-queue": "deduplicator-expert-queue" + ] }, "feodo-tracker-browse-collector": { "destination-queues": [ @@ -17,31 +17,31 @@ ] }, "feodo-tracker-browse-parser": { + "source-queue": "feodo-tracker-browse-parser-queue", "destination-queues": [ "deduplicator-expert-queue" - ], - "source-queue": "feodo-tracker-browse-parser-queue" + ] }, "file-output": { "source-queue": "file-output-queue" }, "gethostbyname-1-expert": { + "source-queue": "gethostbyname-1-expert-queue", "destination-queues": [ "cymru-whois-expert-queue" - ], - "source-queue": "gethostbyname-1-expert-queue" + ] }, "gethostbyname-2-expert": { + "source-queue": "gethostbyname-2-expert-queue", "destination-queues": [ "cymru-whois-expert-queue" - ], - "source-queue": "gethostbyname-2-expert-queue" + ] }, "malc0de-parser": { + "source-queue": "malc0de-parser-queue", "destination-queues": [ "deduplicator-expert-queue" - ], - "source-queue": "malc0de-parser-queue" + ] }, "malc0de-windows-format-collector": { "destination-queues": [ @@ -54,10 +54,10 @@ ] }, "malware-domain-list-parser": { + "source-queue": "malware-domain-list-parser-queue", "destination-queues": [ "deduplicator-expert-queue" - ], - "source-queue": "malware-domain-list-parser-queue" + ] }, "spamhaus-drop-collector": { "destination-queues": [ @@ -65,22 +65,22 @@ ] }, "spamhaus-drop-parser": { + "source-queue": "spamhaus-drop-parser-queue", "destination-queues": [ "deduplicator-expert-queue" - ], - "source-queue": "spamhaus-drop-parser-queue" + ] }, "taxonomy-expert": { + "source-queue": "taxonomy-expert-queue", "destination-queues": [ "url2fqdn-expert-queue" - ], - "source-queue": "taxonomy-expert-queue" + ] }, "url2fqdn-expert": { + "source-queue": "url2fqdn-expert-queue", "destination-queues": [ "gethostbyname-1-expert-queue", "gethostbyname-2-expert-queue" - ], - "source-queue": "url2fqdn-expert-queue" + ] } -} +} \ No newline at end of file diff --git a/example_config/intelmq/etc/runtime.conf b/example_config/intelmq/etc/runtime.conf index 69a3955..1c0ba94 100644 --- a/example_config/intelmq/etc/runtime.conf +++ b/example_config/intelmq/etc/runtime.conf @@ -50,7 +50,9 @@ "rate_limit": 86400, "ssl_client_certificate": null }, - "run_mode": "continuous" + "run_mode": "continuous", + "groupname": "collectors", + "bot_id": "feodo-tracker-browse-collector" }, "feodo-tracker-browse-parser": { "description": "HTML Table Parser is a bot configurable to parse different html table data.", @@ -72,7 +74,9 @@ "time_format": null, "type": "c2server" }, - "run_mode": "continuous" + "run_mode": "continuous", + "groupname": "parsers", + "bot_id": "feodo-tracker-browse-parser" }, "file-output": { "bot_id": "file-output", @@ -223,4 +227,4 @@ }, "run_mode": "continuous" } -} +} \ No newline at end of file