From de1e46bd63d3320294c826ef6a0bcee8ad476869 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Fri, 17 Oct 2025 12:59:29 +0100
Subject: [PATCH] [Test] Fix key generation to create .env.keys file

Generate .env.keys instead of configs/fuzzy-keys.conf
Use environment variable format (KEY=VALUE) for docker-compose
---
 .github/workflows/integration-test.yml | 39 +++++++++++++++-----------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 163f44305f..24d5201666 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -84,12 +84,8 @@ jobs:
 
           # Generate keypair for fuzzy worker
           KEYPAIR=$(rspamadm keypair -u)
-          PRIVKEY=$(echo "$KEYPAIR" | grep privkey | cut -d'"' -f2)
-          PUBKEY=$(echo "$KEYPAIR" | grep pubkey | cut -d'"' -f2)
-
-          # Generate encryption key (use public key from another keypair)
-          ENCRYPTION_KEYPAIR=$(rspamadm keypair -u)
-          ENCRYPTION_KEY=$(echo "$ENCRYPTION_KEYPAIR" | grep pubkey | cut -d'"' -f2)
+          FUZZY_PRIVKEY=$(echo "$KEYPAIR" | grep privkey | cut -d'"' -f2)
+          FUZZY_PUBKEY=$(echo "$KEYPAIR" | grep pubkey | cut -d'"' -f2)
 
           # Generate worker and proxy keypairs
           WORKER_KEYPAIR=$(rspamadm keypair -u)
@@ -100,20 +96,29 @@ jobs:
           PROXY_PRIVKEY=$(echo "$PROXY_KEYPAIR" | grep privkey | cut -d'"' -f2)
           PROXY_PUBKEY=$(echo "$PROXY_KEYPAIR" | grep pubkey | cut -d'"' -f2)
 
-          # Create config
-          cat > configs/fuzzy-keys.conf <<EOF
-          # Auto-generated Rspamd encryption keys
-          fuzzy_worker_privkey = "$PRIVKEY";
-          fuzzy_worker_pubkey = "$PUBKEY";
-          fuzzy_encryption_key = "$ENCRYPTION_KEY";
-          rspamd_worker_privkey = "$WORKER_PRIVKEY";
-          rspamd_worker_pubkey = "$WORKER_PUBKEY";
-          rspamd_proxy_privkey = "$PROXY_PRIVKEY";
-          rspamd_proxy_pubkey = "$PROXY_PUBKEY";
+          # Create .env.keys file for docker-compose
+          cat > .env.keys <<EOF
+          # Rspamd integration test keys
+          # Generated at $(date)
+
+          # Fuzzy worker keypair
+          RSPAMD_FUZZY_WORKER_PRIVKEY=$FUZZY_PRIVKEY
+          RSPAMD_FUZZY_WORKER_PUBKEY=$FUZZY_PUBKEY
+
+          # Fuzzy check encryption key (same as fuzzy worker pubkey)
+          RSPAMD_FUZZY_ENCRYPTION_KEY=$FUZZY_PUBKEY
+
+          # Normal worker keypair (for encrypted inter-worker communication)
+          RSPAMD_WORKER_PRIVKEY=$WORKER_PRIVKEY
+          RSPAMD_WORKER_PUBKEY=$WORKER_PUBKEY
+
+          # Proxy worker keypair
+          RSPAMD_PROXY_PRIVKEY=$PROXY_PRIVKEY
+          RSPAMD_PROXY_PUBKEY=$PROXY_PUBKEY
           EOF
 
           echo "Keys generated successfully"
-          cat configs/fuzzy-keys.conf
+          cat .env.keys
 
       - name: Update Docker Compose to use local build
         working-directory: test/integration
-- 
2.47.3