Merge branch 'SK-CERT:main' into scheduler

.gitignore

@@ -22,11 +22,15 @@ build/
 .env.local
 .env.*.local
 src/.env
-*.pem
+src/publishers/crypto
+!src/publishers/crypto/README.md
 *.key
 *.log
 *.crt
 *.asc
+*.pub
+*.pem
+*.p12
 local/
 
 # settings of editors

CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [v23.09.1] - 2023-09-27
+### Breaking change! (Only for docker users with customized or new report templates)
+
+**Background:**
+Presenter docker maps `/app/templates` directory to `presenters_templates` container.
+This override original `/app/templates` files with user modifications.
+When new or updated templates arrive with new version, they stay hidden due this mapping.
+
+**Solution:**
+Remap user changes to `/app/templates/user_templates` directory.
+There is need then just update old template path in `Configuration / Product Types`:
+e.g.  `/app/templates/file.html` -> `/app/templates/user_templates/file.html`
+
 ### Added
 * New reports (OSINT, Disinfo, Offensive, Weekly)
 * Keycloak authentication support
@@ -31,6 +43,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Fixed bots crash, better Regex
 * Added missing TOR binary to the collectors
 * Improved templates
+* Fixed bug when new templates stay hiden due wrong docker mapping
 * A lot of various fixes
 
 Thanks for the contributions: @sebix, @multiflexi

docker/Dockerfile.bots

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.14 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.7-alpine3.14 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 

docker/Dockerfile.collectors

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.14 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.7-alpine3.14 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 

docker/Dockerfile.presenters

@@ -1,4 +1,4 @@
-FROM python:3.7-alpine3.14 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.7-alpine3.14 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 
@@ -20,59 +20,15 @@ RUN \
     apk add --no-cache \
     libpng \
     libjpeg \
-    wkhtmltopdf
+    py3-gobject3 \
+    pango
 
 # install fonts
 RUN \
     apk add --no-cache \
     msttcorefonts-installer \
     fontconfig \
-    font-noto \
-    font-noto-adlam \
-    font-noto-adlamunjoined \
-    font-noto-arabic \
-    font-noto-armenian \
-    font-noto-avestan \
-    font-noto-bamum \
-    font-noto-bengali \
-    font-noto-buhid \
-    font-noto-carian \
-    font-noto-chakma \
-    font-noto-cherokee \
-    font-noto-cypriot \
-    font-noto-deseret \
-    font-noto-devanagari \
-    font-noto-ethiopic \
-    font-noto-extra \
-    font-noto-georgian \
-    font-noto-glagolitic \
-    font-noto-gothic \
-    font-noto-gujarati \
-    font-noto-gurmukhi \
-    font-noto-hebrew \
-    font-noto-kannada \
-    font-noto-kayahli \
-    font-noto-khmer \
-    font-noto-lao \
-    font-noto-lisu \
-    font-noto-malayalam \
-    font-noto-mandaic \
-    font-noto-myanmar \
-    font-noto-nko \
-    font-noto-olchiki \
-    font-noto-oldturkic \
-    font-noto-oriya \
-    font-noto-osage \
-    font-noto-osmanya \
-    font-noto-shavian \
-    font-noto-sinhala \
-    font-noto-tamil \
-    font-noto-telugu \
-    font-noto-thaana \
-    font-noto-thai \
-    font-noto-tibetan \
-    font-noto-tifinagh \
-    font-noto-vai \
+    font-noto-all \
     terminus-font \
     ttf-opensans \
     font-bakoma \

docker/Dockerfile.publishers

@@ -1,4 +1,4 @@
-FROM python:3.9-alpine3.17 AS build_shared
+FROM python:3.12-alpine3.18 AS build_shared
 
 WORKDIR /build_shared/
 
@@ -8,7 +8,7 @@ RUN python -m build
 
 
 
-FROM python:3.9-alpine3.17 AS production
+FROM python:3.12-alpine3.18 AS production
 
 WORKDIR /app/
 
@@ -25,9 +25,9 @@ RUN pip install --no-cache-dir ./custom_packages/taranis_ng_shared-*.whl && rm -
 
 COPY ./src/publishers/requirements.txt /app/requirements.txt
 RUN apk add --no-cache \
-    swig\
+    swig \
     libmagic \
-    gnupg 
+    gnupg
 
 RUN \
     apk add --no-cache --virtual .build-deps build-base \

docker/README.md

@@ -37,13 +37,17 @@ entrypoint, and the [gunicorn](https://gunicorn.org/) configuration file.
 ## Prerequisites
 
 - [Docker](https://docs.docker.com/engine/install/)
-- [docker-compose](https://docs.docker.com/compose/install/) >= 1.27.0
+- [docker-compose](https://docs.docker.com/compose/install/) >= 1.27.0 (In July 2023, Compose V1 has been deprecated)
+
+or
+
+- [Compose V2](https://docs.docker.com/compose/migrate/), which is part of standard Docker Engine installation
 - (Optional) [Vim](https://www.vim.org/) or other text editor - for configuration and development
 
 Please note it is important to use the abovementioned version of
 `docker-compose` or newer, otherwise the build and deploy will fail.
 
-## Quickly build and run Taranis NG using `docker-compose`
+## Quickly build and run Taranis NG using `docker-compose` or `docker compose`
 
 _First_, you need to clone the source code repository:
 
@@ -66,12 +70,21 @@ _Finally_, either deploy the ready-made images from Docker hub with:
 docker-compose -f docker/docker-compose.yml pull
 docker-compose -f docker/docker-compose.yml up --no-build
 ```
+or
+```bash
+docker compose -f docker/docker-compose.yml pull
+docker compose -f docker/docker-compose.yml up --no-build
+```
 
 or, alternatively, build and run the containers with:
 
 ```bash
 TARANIS_NG_TAG=build docker-compose -f docker/docker-compose.yml up --build --pull
 ```
+or
+```bash
+TARANIS_NG_TAG=build docker compose -f docker/docker-compose.yml up --build --pull
+```
 (`--pull` updates the base images)
 
 **Voila, Taranis NG is up and running. Visit your instance by navigating to