From be7225326a68df10476b5093ea12b0d6b717c419 Mon Sep 17 00:00:00 2001
From: David Turner <david.turner@raspberrypi.com>
Date: Tue, 7 Nov 2023 11:12:35 +0000
Subject: [PATCH] Allow no PSK to be entered for open wifi

It is possible to connect to open wifi networks using raspi-config or
the wf-panel-pi GUI.  It was also possible in rpi-imager but only with a
workaround - if you entered a dummy PSK it would be ignored if the SSID
was that of an open network.  (This also meant a Pi could be tricked
into connecting to an open network on first boot even if a PSK was
configured).

The change in https://github.com/RPi-Distro/raspberrypi-sys-mods/pull/83
has a side effect which means that Pis will no longer connect to an open
network if a PSK is configured.

This commit lets the user enter no PSK to indicate that an open network
should be configured.

Resolves #424
---
 src/OptionsPopup.qml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/OptionsPopup.qml b/src/OptionsPopup.qml
index 4693cf2..91d7283 100644
--- a/src/OptionsPopup.qml
+++ b/src/OptionsPopup.qml
@@ -404,7 +404,12 @@ Window {
 
                     if (chkWifi.checked)
                     {
-                        if (fieldWifiPassword.text.length < 8 || fieldWifiPassword.text.length > 64)
+                        // Valid Wi-Fi PSKs are:
+                        // - 0 characters (indicating an open network)
+                        // - 8-63 characters (passphrase)
+                        // - 64 characters (hashed passphrase, as hex)
+                        if (fieldWifiPassword.text.length > 0 &&
+                            (fieldWifiPassword.text.length < 8 || fieldWifiPassword.text.length > 64))
                         {
                             fieldWifiPassword.indicateError = true
                             fieldWifiPassword.forceActiveFocus()
@@ -712,7 +717,11 @@ Window {
                 wpaconfig += "\tscan_ssid=1\n"
             }
             wpaconfig += "\tssid=\""+fieldWifiSSID.text+"\"\n"
-            var cryptedPsk = fieldWifiPassword.text.length == 64 ? fieldWifiPassword.text : imageWriter.pbkdf2(fieldWifiPassword.text, fieldWifiSSID.text)
+
+            const isPassphrase = fieldWifiPassword.text.length >= 8 &&
+                fieldWifiPassword.text.length < 64
+            var cryptedPsk = isPassphrase ? imageWriter.pbkdf2(fieldWifiPassword.text, fieldWifiSSID.text)
+                                          : fieldWifiPassword.text
             wpaconfig += "\tpsk="+cryptedPsk+"\n"
             wpaconfig += "}\n"
 
@@ -813,8 +822,13 @@ Window {
             if (chkWifiSSIDHidden.checked) {
                 settings.wifiSSIDHidden = true
             }
-            settings.wifiPassword = fieldWifiPassword.text.length == 64 ? fieldWifiPassword.text : imageWriter.pbkdf2(fieldWifiPassword.text, fieldWifiSSID.text)
             settings.wifiCountry = fieldWifiCountry.editText
+
+            const isPassphrase = fieldWifiPassword.text.length >= 8 &&
+                fieldWifiPassword.text.length < 64
+            var cryptedPsk = isPassphrase ? imageWriter.pbkdf2(fieldWifiPassword.text, fieldWifiSSID.text)
+                                          : fieldWifiPassword.text
+            settings.wifiPassword = cryptedPsk
         }
         if (chkLocale.checked) {
             settings.timezone = fieldTimezone.editText