aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services
diff options
context:
space:
mode:
authorKyle Copperfield <kmcopper@danwin1210.me>2019-11-19 18:50:00 +0000
committerJohn Crispin <john@phrozen.org>2020-01-15 20:04:06 +0100
commit0da193ee6943fc7afd100d2378cd1989d1f1cc03 (patch)
tree8d5a59fd1639848047cb0fc801a140984a5fef49 /package/network/services
parentf704f97e4c57e3f2db1bd2f5c87e1e44aebba42b (diff)
downloadupstream-0da193ee6943fc7afd100d2378cd1989d1f1cc03.tar.gz
upstream-0da193ee6943fc7afd100d2378cd1989d1f1cc03.tar.bz2
upstream-0da193ee6943fc7afd100d2378cd1989d1f1cc03.zip
dropbear: move failsafe code out of base-files
The sender domain has a DMARC Reject/Quarantine policy which disallows sending mailing list messages using the original "From" header. To mitigate this problem, the original message has been wrapped automatically by the mailing list software. Failsafe code of dropbear should be in the dropbear package not the base-files package. Signed-off-by: Kyle Copperfield <kmcopper@danwin1210.me>
Diffstat (limited to 'package/network/services')
-rw-r--r--package/network/services/dropbear/Makefile3
-rwxr-xr-xpackage/network/services/dropbear/files/dropbear.failsafe8
2 files changed, 10 insertions, 1 deletions
diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
index d92b94915b..8b5bc17c9d 100644
--- a/package/network/services/dropbear/Makefile
+++ b/package/network/services/dropbear/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dropbear
PKG_VERSION:=2019.78
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:= \
@@ -158,6 +158,7 @@ define Package/dropbear/install
$(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear
$(INSTALL_DIR) $(1)/usr/lib/opkg/info
$(INSTALL_DIR) $(1)/etc/dropbear
+ $(INSTALL_DIR) ./files/dropbear.failsafe $(1)/lib/preinit/99_10_failsafe_dropbear
$(if $(CONFIG_DROPBEAR_ECC),touch $(1)/etc/dropbear/dropbear_ecdsa_host_key)
touch $(1)/etc/dropbear/dropbear_rsa_host_key
endef
diff --git a/package/network/services/dropbear/files/dropbear.failsafe b/package/network/services/dropbear/files/dropbear.failsafe
new file mode 100755
index 0000000000..a98ede459a
--- /dev/null
+++ b/package/network/services/dropbear/files/dropbear.failsafe
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+failsafe_dropbear () {
+ dropbearkey -t rsa -s 1024 -f /tmp/dropbear_failsafe_host_key
+ dropbear -r /tmp/dropbear_failsafe_host_key <> /dev/null 2>&1
+}
+
+boot_hook_add failsafe failsafe_dropbear