Merge branch 'develop' into add_bot_time_filter

Author: mariuskarotkis

.github/workflows/ansible-tests.yml

@@ -29,8 +29,8 @@ jobs:
     - name: Checkout ansible scripts
       uses: actions/checkout@v2
       with:
-        repository: schacht-certat/intelmq-vagrant
+        repository: certtools/intelmq-vagrant
         path: ./src/intelmq-vagrant
 
     - name: Run ansible tests
-      run: buildah run -v ${GITHUB_WORKSPACE}/src:/src $(buildah from docker.io/debian:buster-slim) /src/intelmq/.github/workflows/scripts/ansible.sh
+      run: podman run -e CI=${CI} -v ${GITHUB_WORKSPACE}/src:/src docker.io/debian:buster-slim /src/intelmq/.github/workflows/scripts/ansible.sh

.github/workflows/build-docs.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
     - name: Checkout repository

.github/workflows/codespell.excludelines

@@ -10,8 +10,8 @@ The correct name for the parameter "delimeter" is "delimiter". Please fix your c
    WHERE "event_description.text" = 'The infected iot device logged in to a honeypot and issued malicous commands.' AND "classification.taxonomy" = 'intrusions' AND "classification.type" = 'unauthorized-command' AND "classification.identifier" = 'iot' AND "feed.name" = 'Spamhaus CERT';
 
 # from intelmq/tests/lib/test_upgrades.py
-        "delimeter": ","
-        "delimeter": ",",
+            "delimeter": ","
+            "delimeter": ",",
 
 # from intelmq/lib/upgrades.py
             if "delimeter" in bot["parameters"] and "delimiter" in bot["parameters"]:

.github/workflows/docker.yml

@@ -1,5 +1,5 @@
 # Github Workflow to build container image
-# 
+#
 # SPDX-FileCopyrightText: 2021 Sebastian Waldbauer
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
@@ -17,6 +17,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Check if environment is ACT
+        run: sudo chown runner:docker /var/run/docker.sock
+        if: ${{ env.ACT }}
+
       - name: Checkout IntelMQ-Docker
         uses: actions/checkout@v2
         with:
@@ -57,7 +61,7 @@ jobs:
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
-        if: github.repository == 'certtools/intelmq'
+        if: github.repository == 'certtools/intelmq' && !${{ env.ACT }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -77,7 +81,7 @@ jobs:
           ./test.sh
 
       - name: Publish develop version to dockerhub
-        if: github.repository == 'certtools/intelmq'
+        if: github.repository == 'certtools/intelmq' && !${{ env.ACT }}
         run: |
           docker tag intelmq-full:latest certat/intelmq-full:develop
           docker push certat/intelmq-full:develop

.github/workflows/scripts/ansible-playbook.yml

@@ -44,10 +44,25 @@
         owner: intelmq
         group: intelmq
 
+    - name: Delete shipped runtime.yaml
+      file:
+        path: '/opt/intelmq/etc/runtime.yaml'
+        state: absent
+
     - name: Copy runtime.conf
       copy:
-        src: '/src/intelmq/.github/workflows/scripts/ansible-runtime.yaml'
-        dest: '/opt/intelmq/etc/runtime.yaml'
+        src: 'assets/runtime.conf'
+        dest: '/opt/intelmq/etc/runtime.conf'
+        owner: intelmq
+        group: intelmq
+        mode: '0664'
+    - name: Copy pipeline.conf
+      copy:
+        src: 'assets/pipeline.conf'
+        dest: '/opt/intelmq/etc/pipeline.conf'
+        owner: intelmq
+        group: intelmq
+        mode: '0664'
     - name: Make sure redis is running
       service:
         state: started
@@ -57,20 +72,5 @@
         state: started
         name: "{{webserver}}"
 
-    # Store the intelmq version in a variable
-    - name: Get intelmq version
-      command: intelmqctl --version
-      register: intelmqversion
-    - name: Set intelmq_version fact
-      set_fact:
-        intelmq_version={{ intelmqversion.stdout }}
-    - name: Set intelmq_major_version fact
-      set_fact:
-        intelmq_major_version={{ intelmqversion.stdout[:1] }}
-    - name: Print version
-      debug:
-        msg: IntelMQ Version {{ intelmq_version }} and IntelMQ Major Version {{ intelmq_major_version }}
-
-    - name: Run CLI tests
-      include: "{{ item }}"
-      loop: "{{ query('fileglob', '/src/intelmq-vagrant/ansible/tasks/cli/*.yml') | sort }}"
+    - name: Run tasks
+      include: "tasks.yml"

.github/workflows/scripts/ansible-runtime.yaml

@@ -4,4 +4,5 @@
 #
 apt-get update -qq
 apt-get install ansible python python3-apt -y
-ansible-playbook --connection=local -i /src/intelmq-vagrant/ansible/inventory.yml /src/intelmq/.github/workflows/scripts/ansible-playbook.yml
+cp /src/intelmq/.github/workflows/scripts/ansible-playbook.yml /src/intelmq-vagrant/ansible/playbook.yml
+ansible-playbook --connection=local -i /src/intelmq-vagrant/ansible/inventory.yml /src/intelmq-vagrant/ansible/playbook.yml