From 7a0644fbf511a92c3bda1d6c290cdf29870ad964 Mon Sep 17 00:00:00 2001 From: bergware Date: Thu, 6 Feb 2025 22:14:39 +0100 Subject: [PATCH 1/3] Wireless: use MAC address in key generation --- etc/rc.d/rc.wireless | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/rc.wireless b/etc/rc.d/rc.wireless index ea62d0336c..1b9a35040a 100755 --- a/etc/rc.d/rc.wireless +++ b/etc/rc.d/rc.wireless @@ -44,10 +44,10 @@ unzero6(){ # function to initialize openSSL variables ssl_init(){ KEY="$(dmidecode -qt1 | grep -Pom1 'Manufacturer: \K.+' | sed 's/ /_/g')ABCDEFGH" - IV="$(dmidecode -qt1 | grep -Pom1 'Product Name: \K.+' | sed 's/ /_/g')1234567890123456" + IV="12$(cat $SYSTEM/$PORT/address | sed 's/://g')34" echo "cipher=aes-256-cbc" >$SSLINPUT echo "key=${KEY:0:63}" >>$SSLINPUT - echo "iv=${IV:0:16}" >>$SSLINPUT + echo "iv=$IV" >>$SSLINPUT } # function to convert text to hex From 913d18bccb5343623d6717f23a430d185db65e5b Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 7 Feb 2025 04:07:49 +0100 Subject: [PATCH 2/3] Docker: fix regression error --- .../dynamix.docker.manager/include/DockerClient.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php index 708e504566..5375e1ff5e 100644 --- a/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php @@ -35,6 +35,9 @@ 'webui-info' => "$docroot/state/plugins/dynamix.docker.manager/docker.json" ]; +// get network drivers +$driver = DockerUtil::driver(); + // Docker configuration file - guaranteed to exist $docker_cfgfile = '/boot/config/docker.cfg'; if (file_exists($docker_cfgfile)) { @@ -292,10 +295,9 @@ private function getTailscaleJson($name) { } public function getAllInfo($reload=false,$com=true,$communityApplications=false) { - global $dockerManPaths; + global $driver, $dockerManPaths; $DockerClient = new DockerClient(); $DockerUpdate = new DockerUpdate(); - $driver = DockerUtil::driver(); $host = DockerUtil::host(); //$DockerUpdate->verbose = $this->verbose; $info = DockerUtil::loadJSON($dockerManPaths['webui-info']); @@ -948,7 +950,7 @@ public function removeImage($id) { } public function getDockerContainers() { - $driver = DockerUtil::driver(); + global $driver; $host = DockerUtil::host(); // Return cached values if (is_array($this::$containersCache)) return $this::$containersCache; From e2b793b428e902c89365b9ccf25fa3f0df61e044 Mon Sep 17 00:00:00 2001 From: bergware Date: Fri, 7 Feb 2025 04:11:11 +0100 Subject: [PATCH 3/3] Fix PHP error --- emhttp/plugins/dynamix/nchan/wlan0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/emhttp/plugins/dynamix/nchan/wlan0 b/emhttp/plugins/dynamix/nchan/wlan0 index ce5950c1f4..5430867268 100755 --- a/emhttp/plugins/dynamix/nchan/wlan0 +++ b/emhttp/plugins/dynamix/nchan/wlan0 @@ -22,6 +22,9 @@ $_SERVER['REQUEST_URI'] = ''; $login_locale = _var($display,'locale'); require_once "$docroot/webGui/include/Translations.php"; +// remember current language +$locale_init = $locale; + function update_translation($locale) { global $docroot,$language; $language = [];