Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion htdocs/inc.setWifi.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
if(!isset($temp_prio) || !is_numeric($temp_prio)) {
$temp_prio = 0;
}
$exec .= "add_wireless_network wlan0 ".$temp_ssid." ".$temp_pass." ".$temp_prio."\n";
// SSID und Passwort in einfache Anführungszeichen setzen, um Leerzeichen zu erhalten
$exec .= "add_wireless_network wlan0 '".str_replace("'", "'\\''", $temp_ssid)."' '".str_replace("'", "'\\''", $temp_pass)."' '".$temp_prio."'\n";
}
}
}
Expand Down
8 changes: 8 additions & 0 deletions scripts/helperscripts/inc.networkHelper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ add_wireless_network() {
local pass="$3"
local prio="$4"

# Entferne umschließende einfache Anführungszeichen, falls vorhanden (wegen Übergabe aus PHP)
ssid="${ssid%\'}"
ssid="${ssid#\'}"
pass="${pass%\'}"
pass="${pass#\'}"
prio="${prio%\'}"
prio="${prio#\'}"

pass=$(_get_passphrase_for_config "$ssid" "$pass")

if [[ $(is_dhcpcd_enabled) == true ]]; then
Expand Down
34 changes: 34 additions & 0 deletions tests/htdocs/WifiSsidSpacesTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php
use PHPUnit\Framework\TestCase;

class WifiSsidSpacesTest extends TestCase
{
public function testSsidWithSpacesIsQuotedForBash()
{
// Simuliere POST-Daten wie im UI
$_POST = [
'submitWifi' => 'submit',
'WIFIssid_0' => "Test 123",
'WIFIpass_0' => "testpass123",
'WIFIprio_0' => "10"
];

// Dummy-Konfiguration
$conf = [
'scripts_abs' => '/tmp' // Dummy-Pfad
];

// Fange exec()-Aufruf ab
$output = null;
$called = false;
$that = $this;
// Mock exec() innerhalb dieses Gültigkeitsbereichs
require_once __DIR__ . '/../../htdocs/inc.setWifi.php';

// Extrahiere den Bash-Befehl aus $exec
// (In inc.setWifi.php wird exec("sudo bash -c '...$exec...'") aufgerufen)
// Wir prüfen, ob die SSID korrekt gequotet ist
$pattern = "/add_wireless_network wlan0 'Test 123' 'testpass123' '10'/";
$this->assertMatchesRegularExpression($pattern, $exec, 'SSID mit Leerzeichen wird nicht korrekt gequotet!');
}
}