mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-29 06:19:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Code fixing

Browse Source
This commit is contained in:
bergware
2025-02-01 16:27:44 +01:00
parent 373485256e
commit 4059d6f7ef
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/include/Wireless.php
+6 -5
View File
@@ -15,9 +15,10 @@ $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
$var = '/var/local/emhttp/var.ini';
$cfg = '/boot/config/wireless.cfg';
$ssl = '/etc/rc.d/rc.ssl.input';
$tmp = '/var/tmp/attr';
$wifi = (array)@parse_ini_file($cfg,true);
$attr = (array)@parse_ini_file($tmp,true);
$wifi = is_readable($cfg) ? (array)parse_ini_file($cfg,true) : [];
$attr = is_readable($tmp) ? (array)parse_ini_file($tmp,true) : [];
$md5 = md5(json_encode($attr),true);
$cmd = $_POST['cmd'];
$masks = [
@@ -114,13 +115,13 @@ case 'list':
echo json_encode($echo);
break;
case 'join':
extract((array)@parse_ini_file("/etc/rc.d/rc.ssl.input"));
if (is_readable($ssl)) extract(parse_ini_file($ssl));
$token = parse_ini_file($var)['csrf_token'];
$ssid = rawurldecode($_POST['ssid']);
$drop = $_POST['task']==1;
$manual = $_POST['task']==3;
$user = _var($wifi[$ssid],'USERNAME') && isset($cipher) ? openssl_decrypt($wifi[$ssid]['USERNAME'],$cipher,$key,0,$iv) : '';
$passwd = _var($wifi[$ssid],'PASSWORD') && isset($cipher) ? openssl_decrypt($wifi[$ssid]['PASSWORD'],$cipher,$key,0,$iv) : '';
$user = _var($wifi[$ssid],'USERNAME') && isset($cipher,$key,$iv) ? openssl_decrypt($wifi[$ssid]['USERNAME'],$cipher,$key,0,$iv) : _var($wifi[$ssid],'USERNAME');
$passwd = _var($wifi[$ssid],'PASSWORD') && isset($cipher,$key,$iv) ? openssl_decrypt($wifi[$ssid]['PASSWORD'],$cipher,$key,0,$iv) : _var($wifi[$ssid],'PASSWORD');
$join = _var($wifi[$ssid],'AUTOJOIN','no');
$dhcp4 = _var($wifi[$ssid],'DHCP4','yes');
$dns4 = _var($wifi[$ssid],'DNS4','no');
emhttp/plugins/dynamix/include/update.wireless.php
+4 -3
View File
@@ -11,11 +11,12 @@
*/
?>
<?
extract(parse_ini_file("/etc/rc.d/rc.ssl.input"));
$ssl = '/etc/rc.d/rc.ssl.input';
if (is_readable($ssl)) extract(parse_ini_file($ssl));
// encrypt username and password before saving (if existing)
if (!empty($_POST['USERNAME'])) $_POST['USERNAME'] = openssl_encrypt($_POST['USERNAME'],$cipher,$key,0,$iv);
if (!empty($_POST['PASSWORD'])) $_POST['PASSWORD'] = openssl_encrypt($_POST['PASSWORD'],$cipher,$key,0,$iv);
if (!empty($_POST['USERNAME']) && isset($cipher,$key,$iv)) $_POST['USERNAME'] = openssl_encrypt($_POST['USERNAME'],$cipher,$key,0,$iv);
if (!empty($_POST['PASSWORD']) && isset($cipher,$key,$iv)) $_POST['PASSWORD'] = openssl_encrypt($_POST['PASSWORD'],$cipher,$key,0,$iv);
// update active wifi selection
foreach ($keys as $key => $val) if (isset($val['GROUP'])) $keys[$key]['GROUP'] = 'saved';