cmclark00/retro-imager
1
0
Fork 0
mirror of https://github.com/cmclark00/retro-imager.git synced 2025-05-17 23:45:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow no PSK to be entered for open wifi

Browse source 
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
This commit is contained in:
David Turner 2023-11-07 11:12:35 +00:00 • committed by Tom Dewey
parent 0c3fc3243b
commit be7225326a
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/OptionsPopup.qml
View file

@ -404,7 +404,12 @@ Window {
if (chkWifi.checked) 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.indicateError = true
fieldWifiPassword.forceActiveFocus() fieldWifiPassword.forceActiveFocus()
@ -712,7 +717,11 @@ Window {
wpaconfig += "\tscan_ssid=1\n" wpaconfig += "\tscan_ssid=1\n"
} }
wpaconfig += "\tssid=\""+fieldWifiSSID.text+"\"\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 += "\tpsk="+cryptedPsk+"\n"
wpaconfig += "}\n" wpaconfig += "}\n"
@ -813,8 +822,13 @@ Window {
if (chkWifiSSIDHidden.checked) { if (chkWifiSSIDHidden.checked) {
settings.wifiSSIDHidden = true settings.wifiSSIDHidden = true
} }
settings.wifiPassword = fieldWifiPassword.text.length == 64 ? fieldWifiPassword.text : imageWriter.pbkdf2(fieldWifiPassword.text, fieldWifiSSID.text)
settings.wifiCountry = fieldWifiCountry.editText 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) { if (chkLocale.checked) {
settings.timezone = fieldTimezone.editText settings.timezone = fieldTimezone.editText