IntelMQ Docker adaptions

IntelMQCTL docker ready

Read enviroment variables

Tests read env. vars. to run in docker containers

Fixed typo in test.py

Signed-off-by: Sebastian Waldbauer <[email protected]>

Author: waldbauer-certat

intelmq/bin/intelmqctl.py

@@ -1016,6 +1016,14 @@ def load_defaults_configuration(self, silent=False):
         for option, value in config.items():
             setattr(self.parameters, option, value)
 
+        # TODO: Rewrite variables with env. variables ( CURRENT IMPLEMENTATION NOT FINAL )
+        # "destination_pipeline_host": "127.0.0.1",
+        # "source_pipeline_host": "127.0.0.1",
+        if os.getenv('INTELMQ_IS_DOCKER', None):
+            pipeline_host = os.getenv('INTELMQ_PIPELINE_HOST')
+            setattr(self.parameters, 'destination_pipeline_host', pipeline_host)
+            setattr(self.parameters, 'source_pipeline_host', pipeline_host)
+
     def run(self):
         results = None
         args = self.parser.parse_args()

intelmq/lib/bot.py

@@ -697,6 +697,18 @@ def __load_defaults_configuration(self):
 
         self.parameters.log_processed_messages_seconds = timedelta(seconds=self.parameters.log_processed_messages_seconds)
 
+        # TODO: Rewrite variables with env. variables ( CURRENT IMPLEMENTATION NOT FINAL )
+        if os.getenv('INTELMQ_IS_DOCKER', None):
+            pipeline_driver = os.getenv('INTELMQ_PIPELINE_DRIVER', None)
+            if pipeline_driver:
+                setattr(self.parameters, 'destination_pipeline_broker', pipeline_driver)
+                setattr(self.parameters, 'source_pipeline_broker', pipeline_driver)
+
+            pipeline_host = os.getenv('INTELMQ_PIPELINE_HOST', None)
+            if pipeline_host:
+                setattr(self.parameters, 'destination_pipeline_host', pipeline_host)
+                setattr(self.parameters, 'source_pipeline_host', pipeline_host)
+
     def __load_runtime_configuration(self):
         self.logger.debug("Loading runtime configuration from %r.", RUNTIME_CONF_FILE)
         config = utils.load_configuration(RUNTIME_CONF_FILE)
@@ -719,6 +731,12 @@ def __load_runtime_configuration(self):
             self.logger.handlers = []  # remove all existing handlers
             self.__init_logger()
 
+        # TODO: Rework
+        if os.getenv('INTELMQ_IS_DOCKER', None):
+            redis_cache_host = os.getenv('INTELMQ_REDIS_CACHE_HOST', None)
+            if redis_cache_host:
+                setattr(self.parameters, 'redis_cache_host', redis_cache_host)
+
     def __init_logger(self):
         """
         Initialize the logger.

intelmq/lib/test.py

@@ -32,7 +32,7 @@
                    "retry_delay": 0,
                    "error_retry_delay": 0,
                    "error_max_retries": 0,
-                   "redis_cache_host": "localhost",
+                   "redis_cache_host": os.getenv('INTELMQ_PIPELINE_HOST', 'localhost'),
                    "redis_cache_port": 6379,
                    "redis_cache_db": 4,
                    "redis_cache_ttl": 10,

intelmq/tests/bots/outputs/redis/test_output.py

@@ -41,7 +41,7 @@ class TestRedisOutputBot(test.BotTestCase, unittest.TestCase):
     def set_bot(cls):
         cls.bot_reference = RedisOutputBot
         cls.default_input_message = EXAMPLE_EVENT
-        cls.sysconfig = {"redis_server_ip": "127.0.0.1",
+        cls.sysconfig = {"redis_server_ip": os.getenv('INTELMQ_PIPELINE_HOST', 'localhost'),
                          "redis_server_port": 6379,
                          "redis_db": 4,
                          "redis_queue": "test-redis-output-queue",

intelmq/tests/bots/outputs/redis/test_output_as_hierarchical_json.py

@@ -80,7 +80,7 @@ class TestRedisOutputBot(test.BotTestCase, unittest.TestCase):
     def set_bot(cls):
         cls.bot_reference = RedisOutputBot
         cls.default_input_message = EXAMPLE_EVENT
-        cls.sysconfig = {"redis_server_ip": "127.0.0.1",
+        cls.sysconfig = {"redis_server_ip": os.getenv('INTELMQ_PIPELINE_HOST', 'localhost'),
                          "redis_server_port": 6379,
                          "redis_db": 4,
                          "redis_queue": "test-redis-output-queue",

intelmq/tests/lib/test_pipeline.py

@@ -143,8 +143,10 @@ class TestRedis(unittest.TestCase):
     def setUp(self):
         params = Parameters()
         params.broker = 'Redis'
+        setattr(params, 'source_pipeline_host', os.getenv('INTELMQ_PIPELINE_HOST', 'localhost'))
         setattr(params, 'source_pipeline_password', os.getenv('INTELMQ_TEST_REDIS_PASSWORD'))
         setattr(params, 'source_pipeline_db', 4)
+        setattr(params, 'destination_pipeline_host', os.getenv('INTELMQ_PIPELINE_HOST', 'localhost'))
         setattr(params, 'destination_pipeline_password', os.getenv('INTELMQ_TEST_REDIS_PASSWORD'))
         setattr(params, 'destination_pipeline_db', 4)
         logger = logging.getLogger('foo')