fix(encryption): add escape mechanism for password prompt loop

- check gum exit code for Ctrl+C (exit 130)
- allow empty password to abort installation
- show user instruction: Ctrl+C or empty to cancel
- remove unreachable empty password check after loop

commit: 62374aa835c8a909e12bfd815917c54fe7282e38
author: bnema · 12mo ago · 2025-10-26 11:29 UTC
parent: 10025b2
signature: unsigned

1 file · +20 -6

M install/partitioning/format.sh +20 -6


@@ -31,28 +31,42 @@ if [ "$ARCHUP_ENCRYPTION" = "enabled" ]; then
31	31		echo
32	32		gum style --foreground 6 --padding "0 0 0 $PADDING_LEFT" "Disk Encryption Password"
33	33		gum style --padding "0 0 0 $PADDING_LEFT" "Enter a password to encrypt your disk (different from your account password)"
	34	+	gum style --foreground 8 --padding "0 0 0 $PADDING_LEFT" "Press Ctrl+C to cancel or leave empty to abort"
34	35
35	36		while true; do
36	37		LUKS_PASSWORD=$(gum input --password --placeholder "Enter encryption password" \
37	38		--prompt "Password: " \
38	39		--padding "0 0 0 $PADDING_LEFT")
39	40
	41	+	# Check if gum was cancelled (Ctrl+C returns exit code 130)
	42	+	if [ $? -ne 0 ]; then
	43	+	echo "Installation cancelled by user" >> "$ARCHUP_INSTALL_LOG_FILE"
	44	+	exit 130
	45	+	fi
	46	+
	47	+	# Allow empty password to abort
	48	+	if [ -z "$LUKS_PASSWORD" ]; then
	49	+	gum style --foreground 3 --padding "1 0 1 $PADDING_LEFT" "Installation aborted by user"
	50	+	echo "Installation aborted: empty encryption password" >> "$ARCHUP_INSTALL_LOG_FILE"
	51	+	exit 1
	52	+	fi
	53	+
40	54		LUKS_PASSWORD_CONFIRM=$(gum input --password --placeholder "Confirm encryption password" \
41	55		--prompt "Confirm: " \
42	56		--padding "0 0 0 $PADDING_LEFT")
43	57
	58	+	# Check if confirmation was cancelled
	59	+	if [ $? -ne 0 ]; then
	60	+	echo "Installation cancelled by user" >> "$ARCHUP_INSTALL_LOG_FILE"
	61	+	exit 130
	62	+	fi
	63	+
44	64		if [ "$LUKS_PASSWORD" = "$LUKS_PASSWORD_CONFIRM" ]; then
45	65		break
46	66		else
47	67		gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "Passwords do not match. Try again."
48	68		fi
49	69		done
50		-
51		-	if [ -z "$LUKS_PASSWORD" ]; then
52		-	gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "ERROR: Encryption password not set!"
53		-	echo "ERROR: Encryption password is empty during LUKS setup" >> "$ARCHUP_INSTALL_LOG_FILE"
54		-	exit 1
55		-	fi
56	70		fi
57	71
58	72		# Wipe any existing signatures on root partition to avoid conflicts

     echo
     gum style --foreground 6 --padding "0 0 0 $PADDING_LEFT" "Disk Encryption Password"
     gum style --padding "0 0 0 $PADDING_LEFT" "Enter a password to encrypt your disk (different from your account password)"
+    gum style --foreground 8 --padding "0 0 0 $PADDING_LEFT" "Press Ctrl+C to cancel or leave empty to abort"
     while true; do
       LUKS_PASSWORD=$(gum input --password --placeholder "Enter encryption password" \
         --prompt "Password: " \
         --padding "0 0 0 $PADDING_LEFT")
+      # Check if gum was cancelled (Ctrl+C returns exit code 130)
+      if [ $? -ne 0 ]; then
+        echo "Installation cancelled by user" >> "$ARCHUP_INSTALL_LOG_FILE"
+        exit 130
+      fi
+      # Allow empty password to abort
+      if [ -z "$LUKS_PASSWORD" ]; then
+        gum style --foreground 3 --padding "1 0 1 $PADDING_LEFT" "Installation aborted by user"
+        echo "Installation aborted: empty encryption password" >> "$ARCHUP_INSTALL_LOG_FILE"
+        exit 1
+      fi
       LUKS_PASSWORD_CONFIRM=$(gum input --password --placeholder "Confirm encryption password" \
         --prompt "Confirm: " \
         --padding "0 0 0 $PADDING_LEFT")
+      # Check if confirmation was cancelled
+      if [ $? -ne 0 ]; then
+        echo "Installation cancelled by user" >> "$ARCHUP_INSTALL_LOG_FILE"
+        exit 130
+      fi
       if [ "$LUKS_PASSWORD" = "$LUKS_PASSWORD_CONFIRM" ]; then
         break
       else
         gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "Passwords do not match. Try again."
       fi
     done
-    if [ -z "$LUKS_PASSWORD" ]; then
-      gum style --foreground 1 --padding "1 0 1 $PADDING_LEFT" "ERROR: Encryption password not set!"
-      echo "ERROR: Encryption password is empty during LUKS setup" >> "$ARCHUP_INSTALL_LOG_FILE"
-      exit 1
-    fi
   fi
   # Wipe any existing signatures on root partition to avoid conflicts