From ad723a11f54805aa04a6199272a7370caa048c10 Mon Sep 17 00:00:00 2001
From: Sandfly Security <82414700+sfmwilson@users.noreply.github.com>
Date: Tue, 13 Aug 2024 14:59:58 -0700
Subject: [PATCH] Sandfly 5.1.1 release

---
 VERSION                                 |  2 +-
 sandfly.agent.sha512.txt                | 26 ++++++++++++-------------
 setup/install.sh                        |  6 ++++++
 setup/setup_scripts/setup_ssl_signed.sh |  4 +++-
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/VERSION b/VERSION
index acf69b4..3bff059 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.1.0
\ No newline at end of file
+5.1.1
\ No newline at end of file
diff --git a/sandfly.agent.sha512.txt b/sandfly.agent.sha512.txt
index f01c500..f09c377 100644
--- a/sandfly.agent.sha512.txt
+++ b/sandfly.agent.sha512.txt
@@ -1,13 +1,13 @@
-2d8585c5546d7f68aa203519ba64a7f5b0be185fecef14d4051b1ad3c29e6da93ab974ebde58707afb5f074894c426981be7a6e28dc8412464dff4b9834a4f09 *sandfly.386
-459eac7b28ee4ef82909819f2f495851c26e423466e57fdd7e6234250ed3421a8d80ea4c165f36a5b7c678a19b7e2b154e7cc9b15913ba9e41d6e738e4e63074 *sandfly.amd64
-5e928b4bfc35edce29e7b16210fe8f6b82ce320cad068c0685c0ddc30076ddd021a2f6d1850db021f5284d17b6d7f679a2dbc48b196c3192316ea7fc75283391 *sandfly.arm
-1d76baa02272221d44be36608e8d42d284872a8a9769d38ef8a9a2276cab7b875047a1c7209ae2581563e90823d9b3e3cc629dffe292acac635ffa82b684fd55 *sandfly.arm5
-9be1658a2049bc04836f8890a3ac7d370a9b932392997b7d677f7d302ece41ca9d358e447634ce841240a1e7aea71097c4115e2fcaa59150d7fa0bfee9a47fbe *sandfly.arm6
-fb11dca0868ac7166812c02140acaafd587e27fed190f20c8ab91592c9ac49f8d709fe912efd9146bdfd325c28d3c108f19ec800949fbde5dac78380e2c66abd *sandfly.arm64
-db339052164de85d66d7e9066d28eb7cb86de803fc2b0a55e7b8eee57ca6f8c226fe5059e85bba77208c5bdf9715f59f6d362c889ad3b1c79122a576c0b6d3fd *sandfly.arm7
-5fb9ab2d86fc6a19299b07715aaf694ee9acca82a54f760b5eeb14569b885d0b7176ce73cb4801f07b8b90adab38bc4d327ff9f8113086189c28d15869e720ab *sandfly.mips
-79d396fe095859ab43b0388c12a01fbdb98cfe28aee1d1ce8c6fd5a33c8de25684ca753598b748d9515f4369b8a006dc0d28187842eb8fe6ca96693065895f17 *sandfly.mips64
-b8f35e11f73da43abe0f08d1be6d75c6c9e54df875092bbc4e7f29b9244f2273b7ec25f2127fd2d454aa5a1b67af58251204e6c5f6e3b5e6282e1b36c5eeab6e *sandfly.mips64le
-153165b0e3187c9ab73d5822cb85458d785f128caaf83bf017002e8fb8820d831e54644bbfc00c0d0564f509eaed76d38033eeb7b5f3cb0d6ae639210384327e *sandfly.mipsle
-61726921f988e987027ee3ebfc08f78deb91b0c8d9c9802772b737b59fb4f633a72c1b6b45ea50a9148c529aa2809ef7575fde711e5331a67cc32834386ff53e *sandfly.ppc64le
-2273fa2f41ee0212c610125751ce9e313ffbd73942c3e54533e11d23387b54ac0d43782996b3b72f2e54db0894cfe1c82c9eadbf4cd4b1402662d72f721be1ee *sandfly.s390x
+69a58538b99ab89a9f13ae1a5d89ae2eb2970878c899e03c76954284e650239183c2f9feeefa42fa5bcaaf1510a617ba9e06ceae3c6f1da00f27ba75d3178375 *sandfly.386
+9babfd742f384873f9da37f91f5a708f52982ff066ea92bd607ae182ce420a8ce0ca39eb381639c5fb6a786513e6eb7ac4db44d09acf8e54ddad18e651cb8acb *sandfly.amd64
+763a90e4d7b7d5d217bc06b2ca42f6de02557796d9ab22040a59e9dc4e44db34bc1c9c4de408c48c24163419727e31fa7c4e64b00ba47606b062ebd0d4d2e92d *sandfly.arm
+eff96f49b6e8cedd1c03ffcfd5407f0f46e95c2c4cd7fb609cc6bb4cd7107b346b4e7ab96f3f63ba620e8a3f37f7f2bd973b842a644be13d87cd915aad2e34d6 *sandfly.arm5
+944bb197483967b12ddfed9fa951f3a3577fcb752ed19da2ba5281d44c5deeb65b70c669017e02199d68cfde225dd1040aa70f87d2f8a59eff5d05767f6961cb *sandfly.arm6
+cbe38e675ca43a0a775d89aebbdef856944c0d5933a25dec3c029fa64912740fd688c7cc53b27fa1a5f22fa985a0ba21fb4156de96542980e2421d2d9c572513 *sandfly.arm64
+2049944854a5effa77e7bbbfbc6823bf604c31bb0853addc4b9836af7c66c1c5192892be2e864b31df2890174ed0b5ba38cd606dd678579f05c728c15c764ec3 *sandfly.arm7
+af022e5423e409b597b63649a24755b9b2d607fc73b8fdfc5fb657a0a23e4eee5b89b824a9bcd335218281dd1ebdfc24fb583c8a2a2cc0520fd4e59a3059aa8c *sandfly.mips
+55bfb49044bc36e738e86e267edf994d2a6ed51e4d93a5e48d74cc1c61fddd83bb145348f817f82ea212186f68ddb0552ee1d02d581fe9e717c5a2bd46c93928 *sandfly.mips64
+81122bdaf3401dfc80da154716ab19d2aea0a75ae36420eeb7c4ba633b003d3ed1c157aa1fb14e5efd95901d1778cf4935ed07db120e1d0b9a9a11febf3fb543 *sandfly.mips64le
+72d582d3da3bbbdcbffa7ed49fc6bf1d5e03fedae05e1d82e5e0c5535c684dc92152d4a2e48af6c35980eca263a5eb6b4be02a6c32a91e61bbcb77b08892f355 *sandfly.mipsle
+60d40155b019a34a284b9a112201883c0003e524c46b5d660943b87e0f33280ebf12a9ddf9869d0548c5512841c1dd8b1abb4213219a4f4f3597d8ace6156fce *sandfly.ppc64le
+fe55a8d00ab8e14c696e370e4fa7866e6ac6d976ecaf2c7440c06ec87068cedb2f7f80ab3d83cd7932e728dbb37e9d004813410c60b7e0a6782ec2e4b1d2370e *sandfly.s390x
diff --git a/setup/install.sh b/setup/install.sh
index 0163f2a..bd56f16 100755
--- a/setup/install.sh
+++ b/setup/install.sh
@@ -186,6 +186,12 @@ EOF
       echo "Starting key signing script"
       ./setup_scripts/setup_ssl_signed.sh
   fi
+elif [ ! -z "$SSL_FQDN" ]; then
+  # Attempt an automated Let's Encrypt setup. The existing SSL_FQDN (and
+  # SSL_EMAIL) environment variables will flow through, causing the script
+  # to run in non-interactive mode.
+  echo "Starting automated key signing script"
+  ./setup_scripts/setup_ssl_signed.sh
 fi # if auto
 
 ./setup_scripts/setup_config_json.sh
diff --git a/setup/setup_scripts/setup_ssl_signed.sh b/setup/setup_scripts/setup_ssl_signed.sh
index e32c93a..3140787 100755
--- a/setup/setup_scripts/setup_ssl_signed.sh
+++ b/setup/setup_scripts/setup_ssl_signed.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Sandfly Security LTD www.sandflysecurity.com
-# Copyright (c) 2016-2022 Sandfly Security LTD, All Rights Reserved.
+# Copyright (c) 2016-2024 Sandfly Security LTD, All Rights Reserved.
 
 # Make sure we run from the correct directory so relative paths work
 cd "$( dirname "${BASH_SOURCE[0]}" )"
@@ -42,6 +42,8 @@ mkdir -p setup_data/letsencrypt
 docker run -v /dev/urandom:/dev/random:ro \
 -v $PWD/setup_data:/opt/sandfly/install/setup_data \
 -v $PWD/setup_data/letsencrypt:/etc/letsencrypt \
+-e SSL_FQDN \
+-e SSL_EMAIL \
 --name sandfly-server-mgmt \
 --network sandfly-net \
 --publish 80:8000 \