feat: add support for SHA algorithms to improve switch and hardware compatibility (#5)

* docs: update README docs

* feat: add webhook testing prg

* fix: correct API key authentication config

* feat: add GitHub commit message convention

* refactor: script reengineering

* feat: add support for SHA algorithms to improve switch and hardware compatibility

Author: tkspuk

.dockerignore

@@ -24,7 +24,7 @@ redis/tls
 redis/data
 
 k8s/
-docker/
+docker/*.dockerfile
 docker-compose*.yml
 
 *.md

docker-compose.yaml

@@ -4,10 +4,8 @@ services:
     build:
       context: .
       dockerfile: ./docker/controller.dockerfile
-    environment:
-      - TZ=${TZ:-Asia/Shanghai}
-      - NETPULSE_REDIS__PASSWORD=${NETPULSE_REDIS__PASSWORD}
-      - NETPULSE_SERVER__API_KEY=${NETPULSE_SERVER__API_KEY}
+    env_file:
+      - .env
     volumes:
       - ./config:/app/config
       - ./redis/tls:/app/redis/tls:ro
@@ -25,9 +23,8 @@ services:
     build:
       context: .
       dockerfile: ./docker/node_worker.dockerfile
-    environment:
-      - TZ=${TZ:-Asia/Shanghai}
-      - NETPULSE_REDIS__PASSWORD=${NETPULSE_REDIS__PASSWORD}
+    env_file:
+      - .env
     volumes:
       - ./config:/app/config
       - ./redis/tls:/app/redis/tls:ro
@@ -45,9 +42,8 @@ services:
     build:
       context: .
       dockerfile: docker/fifo_worker.dockerfile
-    environment:
-      - TZ=${TZ:-Asia/Shanghai}
-      - NETPULSE_REDIS__PASSWORD=${NETPULSE_REDIS__PASSWORD}
+    env_file:
+      - .env
     volumes:
       - ./config:/app/config
       - ./redis/tls:/app/redis/tls:ro
@@ -60,8 +56,8 @@ services:
 
   redis:
     image: redis:7-bookworm
-    environment:
-      - TZ=${TZ:-Asia/Shanghai}
+    env_file:
+      - .env
     volumes:
       - ./redis/redis.conf:/etc/redis/redis.conf:ro
       - ./redis/tls:/etc/redis/tls:ro

docker/fifo_worker.dockerfile

@@ -1,10 +1,23 @@
 FROM python:3.12-slim
 
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    openssh-client \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create SSH config directory
+RUN mkdir -p /root/.ssh
+
 WORKDIR /app
 
 RUN pip3 install --no-cache-dir --upgrade pip
 
 COPY . .
+
+# Copy SSH configuration file
+COPY docker/ssh_config /root/.ssh/config
+RUN chmod 600 /root/.ssh/config
+
 RUN pip3 install --no-cache-dir -e "."
 
 CMD ["python3", "worker.py", "fifo"]

docker/node_worker.dockerfile

@@ -1,10 +1,23 @@
 FROM python:3.12-slim
 
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    openssh-client \
+    && rm -rf /var/lib/apt/lists/*
+
+# Create SSH config directory
+RUN mkdir -p /root/.ssh
+
 WORKDIR /app
 
 RUN pip3 install --no-cache-dir --upgrade pip
 
 COPY . .
+
+# Copy SSH configuration file
+COPY docker/ssh_config /root/.ssh/config
+RUN chmod 600 /root/.ssh/config
+
 RUN pip3 install --no-cache-dir -e "."
 
 CMD ["python3", "worker.py", "node"]

docker/ssh_config

@@ -0,0 +1,5 @@
+# SSH configuration - Enable ssh-rsa algorithm globally for legacy device compatibility
+Host *
+    PubkeyAcceptedKeyTypes +ssh-rsa
+    HostKeyAlgorithms +ssh-rsa
+    PubkeyAcceptedAlgorithms +ssh-rsa 

netpulse/utils/config.py

@@ -108,9 +108,10 @@ def settings_customise_sources(
         dotenv_settings,
         file_secret_settings,
     ):
-        """Read settings: env -> yaml -> default"""
+        """Read settings: env -> dotenv -> yaml -> default"""
         return (
             env_settings,
+            dotenv_settings,
             YamlConfigSettingsSource(settings_cls),
             init_settings,
         )