Release v2.4.3

Author: kueblc

install_prereq.sh

@@ -5,6 +5,6 @@ set -e
 sudo apt-get update
 sudo apt-get install -y git iw dnsmasq hostapd screen curl build-essential python3-pip python3-setuptools python3-wheel python3-dev mosquitto haveged net-tools libssl-dev
 
-sudo -H python3 -m pip install --upgrade paho-mqtt tornado git+https://github.com/drbild/sslpsk.git@use-byte-string-for-identity-hints pycryptodomex
+sudo -H python3 -m pip install --upgrade paho-mqtt tornado git+https://github.com/drbild/sslpsk.git pycryptodomex
 
 echo "Ready to start upgrade"

scripts/setup_checks.sh

@@ -102,6 +102,17 @@ check_port () {
 	fi
 }
 
+check_firewall () {
+	if sudo systemctl stop firewalld.service &>/dev/null; then
+		echo "Attempting to stop firewalld.service"
+		echo "When done, enable with: ${bold}sudo systemctl start firewalld.service${normal}"
+	fi
+	if sudo ufw status | grep -qw active; then
+		sudo ufw disable
+		echo "When done, enable with: ${bold}sudo ufw enable${normal}"
+	fi
+}
+
 check_blacklist () {
 	if [ -e /etc/modprobe.d/blacklist-rtl8192cu.conf ]; then
 		echo "Detected /etc/modprobe.d/blacklist-rtl8192cu.conf"
@@ -125,5 +136,6 @@ check_port udp 6666 "detect unencrypted Tuya firmware"
 check_port udp 6667 "detect encrypted Tuya firmware"
 check_port tcp 1883 "run MQTT"
 check_port tcp 8886 "run MQTTS"
+check_firewall
 check_blacklist
 

start_flash.sh

@@ -94,7 +94,14 @@ while true; do
 	backupfolder="../backups/$timestamp"
 	mkdir -p "$backupfolder"
 	pushd "$backupfolder" >/dev/null || exit
-	curl -JO http://10.42.42.42/backup
+
+	if ! curl -JOm 90 http://10.42.42.42/backup; then
+		echo "Could not fetch a complete backup"
+		read -p "Do you want to continue anyway? [y/N] " -n 1 -r
+		echo
+		[[ "$REPLY" =~ ^[Yy]$ ]] || break
+		sleep 2
+	fi
 
 	echo "======================================================"
 	echo "Getting Info from IoT-device"