From c16d7ee3564d0e8accab5a46139ef558eab815e2 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 7 Jan 2020 00:39:27 +0100
Subject: [PATCH 1/8] Added docker host access to custom network option

---
 .../DockerSettings.page                       | 16 +++++++++++-
 plugins/dynamix.docker.manager/default.cfg    |  1 +
 .../include/CreateDocker.php                  |  7 +++---
 .../include/DockerClient.php                  | 25 ++++++++++++++++---
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index 6575e4a0b..48f51c7ca 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -227,7 +227,6 @@ Docker LOG number of files:
 > Specifies the number of LOG files when LOG rotation is done.
 
 </div>
-
 Template Authoring Mode:
 : <select id="DOCKER_AUTHORING_MODE" name="DOCKER_AUTHORING_MODE">
   <?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'no', 'No')?>
@@ -236,6 +235,15 @@ Template Authoring Mode:
 
 > If set to **Yes**, when creating/editing containers the interface will be present with some extra fields related to template authoring.
 
+Host access to custom networks:
+: <select name="DOCKER_ALLOW_ACCESS">
+  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', 'Disabled')?>
+  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', 'Enabled')?>
+  </select>
+
+> Allows direct communication between the host and containers using a custom (macvlan) network.<br>
+> By default this is prohibited.
+
 Preserve user defined networks:
 : <select name="DOCKER_USER_NETWORKS">
   <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', 'No')?>
@@ -432,6 +440,12 @@ Docker LOG rotation:
 
 > By default a single unlimited LOG file is created. Otherwise LOG file size and number of files are limited when LOG rotation is enabled.
 
+Host access to custom networks:
+: <?=$dockercfg['DOCKER_ALLOW_ACCESS']==''?'Disabled':'Enabled'?>
+
+> Allows direct communication between the host and containers using a custom (macvlan) network.<br>
+> By default this is prohibited.
+
 Preserve user defined networks:
 : <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve'?'Yes':'No'?>
 
diff --git a/plugins/dynamix.docker.manager/default.cfg b/plugins/dynamix.docker.manager/default.cfg
index 366233525..400b3a496 100644
--- a/plugins/dynamix.docker.manager/default.cfg
+++ b/plugins/dynamix.docker.manager/default.cfg
@@ -5,3 +5,4 @@ DOCKER_LOG_SIZE="50m"
 DOCKER_LOG_FILES="1"
 DOCKER_AUTHORING_MODE="no"
 DOCKER_USER_NETWORKS="remove"
+DOCKER_ALLOW_ACCESS=""
\ No newline at end of file
diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 67a26e9e2..fdf531d49 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2015-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2019, Lime Technology
+ * Copyright 2015-2019, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2019, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -20,7 +20,6 @@ require_once "$docroot/webGui/include/Helpers.php";
 libxml_use_internal_errors(false); # Enable xml errors
 
 $var = parse_ini_file('state/var.ini');
-$cfg = parse_ini_file('boot/config/docker.cfg');
 ignore_user_abort(true);
 
 $DockerClient = new DockerClient();
diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php
index c7d961720..3691b43f1 100644
--- a/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2014-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2019, Lime Technology
+ * Copyright 2014-2019, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2019, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -33,6 +33,7 @@ $dockerManPaths = [
 // load network variables if needed.
 if (!isset($eth0)) extract(parse_ini_file("$docroot/state/network.ini",true));
 $host = $eth0['IPADDR:0'] ?? '0.0.0.0';
+$system = '/sys/class/net';
 
 // get network drivers
 $driver = DockerUtil::driver();
@@ -712,6 +713,10 @@ class DockerClient {
 	}
 
 	public function startContainer($id) {
+		global $dockercfg, $system;
+		if ($dockercfg['DOCKER_ALLOW_ACCESS']=='yes') {
+			foreach (DockerUtil::shim($id) as $shim => $ip) if (file_exists("$system/$shim") && $ip) exec("ip route add $ip dev $shim 2>/dev/null");
+		}
 		$this->getDockerJSON("/containers/$id/start", 'POST', $code);
 		$this->flushCache($this::$containersCache);
 		return $code;
@@ -724,6 +729,10 @@ class DockerClient {
 	}
 
 	public function stopContainer($id, $t=10) {
+		global $dockercfg, $system;
+		if ($dockercfg['DOCKER_ALLOW_ACCESS']=='yes') {
+			foreach (DockerUtil::shim($id) as $shim => $ip) if (file_exists("$system/$shim") && $ip) exec("ip route del $ip dev $shim 2>/dev/null");
+		}
 		$this->getDockerJSON("/containers/$id/stop?t=$t", 'POST', $code);
 		$this->flushCache($this::$containersCache);
 		return $code;
@@ -942,9 +951,17 @@ class DockerUtil {
 		return $a ? $array : $data;
 	}
 
+	public static function shim($id) {
+		$shim = []; $i = 0;
+		$nets = static::docker("inspect --format='{{json .NetworkSettings.Networks}}' $id|jq|grep -Po '^  \"\\K[^\"]+'|grep -Pv 'host|bridge|none'",true);
+		$ips = explode(' ',static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.IPAMConfig.IPv4Address}} {{end}}' $id 2>/dev/null"));
+		foreach ($nets as $net) $shim["$net-shim"] = $ips[$i++];
+		return $shim;
+	}
+
 	public static function myIP($name, $version=4) {
 		$ipaddr = $version==4 ? 'IPAddress' : 'GlobalIPv6Address';
-		return static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.$ipaddr}}{{end}}' $name");
+		return rtrim(static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.$ipaddr}} {{end}}' $name"));
 	}
 	public static function driver() {
 		$list = [];

From ce082b1bab3f4aa8dcad725aed51785464c4e4a1 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 7 Jan 2020 00:40:19 +0100
Subject: [PATCH 2/8] Added animated logo when updating settings

---
 plugins/dynamix/UserAdd.page                  | 4 ++--
 plugins/dynamix/include/DefaultPageLayout.php | 1 +
 update.htm                                    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/UserAdd.page b/plugins/dynamix/UserAdd.page
index f8aa912a1..5540ff0b9 100644
--- a/plugins/dynamix/UserAdd.page
+++ b/plugins/dynamix/UserAdd.page
@@ -3,8 +3,8 @@ Title="Add User"
 Tag="user"
 ---
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2019, Lime Technology
+ * Copyright 2012-2019, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 19c55870b..7932532f5 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -504,6 +504,7 @@ foreach ($pages as $page) {
 unset($pages,$page,$pgs,$pg,$icon);
 ?>
 </div></div>
+<div class="spinner fixed"></div>
 <iframe id="progressFrame" name="progressFrame" frameborder="0"></iframe>
 <?
 // Build footer
diff --git a/update.htm b/update.htm
index 2a0acc045..d3d5522c3 100644
--- a/update.htm
+++ b/update.htm
@@ -53,6 +53,7 @@ function addLog(logLine) {
 }
 
 function disablePage() {
+  for (var i=0,div; div=top.document.getElementsByClassName('spinner')[i]; i++) div.style.display = 'block';
   for (var i=0,element; element=top.document.querySelectorAll('input,button,select')[i]; i++) element.disabled = true;
   for (var i=0,link; link=top.document.getElementsByTagName('a')[i]; i++) link.style.color = "gray"; //fake disable
 }

From 2e75dacde9ee35907f614db9e38a0638d1cb35d0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 7 Jan 2020 08:04:59 +0100
Subject: [PATCH 3/8] Revert "Added docker host access to custom network
 option"

This reverts commit c16d7ee3564d0e8accab5a46139ef558eab815e2.
---
 .../DockerSettings.page                       | 16 +-----------
 plugins/dynamix.docker.manager/default.cfg    |  1 -
 .../include/CreateDocker.php                  |  7 +++---
 .../include/DockerClient.php                  | 25 +++----------------
 4 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index 48f51c7ca..6575e4a0b 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -227,6 +227,7 @@ Docker LOG number of files:
 > Specifies the number of LOG files when LOG rotation is done.
 
 </div>
+
 Template Authoring Mode:
 : <select id="DOCKER_AUTHORING_MODE" name="DOCKER_AUTHORING_MODE">
   <?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'no', 'No')?>
@@ -235,15 +236,6 @@ Template Authoring Mode:
 
 > If set to **Yes**, when creating/editing containers the interface will be present with some extra fields related to template authoring.
 
-Host access to custom networks:
-: <select name="DOCKER_ALLOW_ACCESS">
-  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', 'Disabled')?>
-  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', 'Enabled')?>
-  </select>
-
-> Allows direct communication between the host and containers using a custom (macvlan) network.<br>
-> By default this is prohibited.
-
 Preserve user defined networks:
 : <select name="DOCKER_USER_NETWORKS">
   <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', 'No')?>
@@ -440,12 +432,6 @@ Docker LOG rotation:
 
 > By default a single unlimited LOG file is created. Otherwise LOG file size and number of files are limited when LOG rotation is enabled.
 
-Host access to custom networks:
-: <?=$dockercfg['DOCKER_ALLOW_ACCESS']==''?'Disabled':'Enabled'?>
-
-> Allows direct communication between the host and containers using a custom (macvlan) network.<br>
-> By default this is prohibited.
-
 Preserve user defined networks:
 : <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve'?'Yes':'No'?>
 
diff --git a/plugins/dynamix.docker.manager/default.cfg b/plugins/dynamix.docker.manager/default.cfg
index 400b3a496..366233525 100644
--- a/plugins/dynamix.docker.manager/default.cfg
+++ b/plugins/dynamix.docker.manager/default.cfg
@@ -5,4 +5,3 @@ DOCKER_LOG_SIZE="50m"
 DOCKER_LOG_FILES="1"
 DOCKER_AUTHORING_MODE="no"
 DOCKER_USER_NETWORKS="remove"
-DOCKER_ALLOW_ACCESS=""
\ No newline at end of file
diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index fdf531d49..67a26e9e2 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2019, Lime Technology
- * Copyright 2015-2019, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2019, Bergware International.
+/* Copyright 2005-2018, Lime Technology
+ * Copyright 2015-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2018, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -20,6 +20,7 @@ require_once "$docroot/webGui/include/Helpers.php";
 libxml_use_internal_errors(false); # Enable xml errors
 
 $var = parse_ini_file('state/var.ini');
+$cfg = parse_ini_file('boot/config/docker.cfg');
 ignore_user_abort(true);
 
 $DockerClient = new DockerClient();
diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php
index 3691b43f1..c7d961720 100644
--- a/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2019, Lime Technology
- * Copyright 2014-2019, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2019, Bergware International.
+/* Copyright 2005-2018, Lime Technology
+ * Copyright 2014-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2018, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -33,7 +33,6 @@ $dockerManPaths = [
 // load network variables if needed.
 if (!isset($eth0)) extract(parse_ini_file("$docroot/state/network.ini",true));
 $host = $eth0['IPADDR:0'] ?? '0.0.0.0';
-$system = '/sys/class/net';
 
 // get network drivers
 $driver = DockerUtil::driver();
@@ -713,10 +712,6 @@ class DockerClient {
 	}
 
 	public function startContainer($id) {
-		global $dockercfg, $system;
-		if ($dockercfg['DOCKER_ALLOW_ACCESS']=='yes') {
-			foreach (DockerUtil::shim($id) as $shim => $ip) if (file_exists("$system/$shim") && $ip) exec("ip route add $ip dev $shim 2>/dev/null");
-		}
 		$this->getDockerJSON("/containers/$id/start", 'POST', $code);
 		$this->flushCache($this::$containersCache);
 		return $code;
@@ -729,10 +724,6 @@ class DockerClient {
 	}
 
 	public function stopContainer($id, $t=10) {
-		global $dockercfg, $system;
-		if ($dockercfg['DOCKER_ALLOW_ACCESS']=='yes') {
-			foreach (DockerUtil::shim($id) as $shim => $ip) if (file_exists("$system/$shim") && $ip) exec("ip route del $ip dev $shim 2>/dev/null");
-		}
 		$this->getDockerJSON("/containers/$id/stop?t=$t", 'POST', $code);
 		$this->flushCache($this::$containersCache);
 		return $code;
@@ -951,17 +942,9 @@ class DockerUtil {
 		return $a ? $array : $data;
 	}
 
-	public static function shim($id) {
-		$shim = []; $i = 0;
-		$nets = static::docker("inspect --format='{{json .NetworkSettings.Networks}}' $id|jq|grep -Po '^  \"\\K[^\"]+'|grep -Pv 'host|bridge|none'",true);
-		$ips = explode(' ',static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.IPAMConfig.IPv4Address}} {{end}}' $id 2>/dev/null"));
-		foreach ($nets as $net) $shim["$net-shim"] = $ips[$i++];
-		return $shim;
-	}
-
 	public static function myIP($name, $version=4) {
 		$ipaddr = $version==4 ? 'IPAddress' : 'GlobalIPv6Address';
-		return rtrim(static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.$ipaddr}} {{end}}' $name"));
+		return static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.$ipaddr}}{{end}}' $name");
 	}
 	public static function driver() {
 		$list = [];

From 61908b40cadc68ef884c1a5cb3c2940d9d3d6acb Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 8 Jan 2020 08:32:37 +0100
Subject: [PATCH 4/8] Terminal button: give unsupported warning when Edge/MSIE
 is used

---
 plugins/dynamix/TerminalButton.page | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/plugins/dynamix/TerminalButton.page b/plugins/dynamix/TerminalButton.page
index e4e60e49f..3178f54d7 100644
--- a/plugins/dynamix/TerminalButton.page
+++ b/plugins/dynamix/TerminalButton.page
@@ -18,6 +18,10 @@ Code="e93f"
 ?>
 <script>
 function TerminalButton() {
+  if (/MSIE|Edge/.test(navigator.userAgent)) {
+    swal({title:'Unsupported Feature',text:'Sorry, this feature is not supported by MSIE/Edge.<br>Please try a different browser',html:true,type:'error'});
+    return;
+  }
   var d = new Date();
   var height = 600;
   var width = 900;

From 9f2f6fb308aa97a8715ce9835392d75f54445873 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 8 Jan 2020 08:56:07 +0100
Subject: [PATCH 5/8] Patched vulnerability in auth_request

---
 auth_request.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/auth_request.php b/auth_request.php
index 783457d0a..ef56f4376 100644
--- a/auth_request.php
+++ b/auth_request.php
@@ -39,14 +39,12 @@ $arrWhitelist = [
   '/webGui/images/case-model.png',
   '/webGui/images/green-on.png'
 ];
-foreach ($arrWhitelist as $strWhitelist) {
-  if (strpos($_SERVER['REQUEST_URI'], $strWhitelist) === 0) {
-    http_response_code(200);
-    exit;
-  }
+if (in_array($_SERVER['REQUEST_URI'],$arrWhitelist)) {
+  // authorized
+  http_response_code(200);
+} else {
+  // non-authorized
+  //error_log(print_r($_SERVER, true));
+  http_response_code(401);
 }
-
-// non-authorized
-//error_log(print_r($_SERVER, true));
-http_response_code(401);
 exit;

From 9e7af29b4d9b45b95ab6236839dca7a081da60ec Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 8 Jan 2020 16:47:28 +0100
Subject: [PATCH 6/8] Docker: added new setting "Host access to custom
 networks"

---
 .../dynamix.docker.manager/DockerSettings.page   | 16 +++++++++++++++-
 .../include/CreateDocker.php                     |  7 +++----
 .../include/DockerClient.php                     | 15 +++++++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/plugins/dynamix.docker.manager/DockerSettings.page b/plugins/dynamix.docker.manager/DockerSettings.page
index 6575e4a0b..48f51c7ca 100644
--- a/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/plugins/dynamix.docker.manager/DockerSettings.page
@@ -227,7 +227,6 @@ Docker LOG number of files:
 > Specifies the number of LOG files when LOG rotation is done.
 
 </div>
-
 Template Authoring Mode:
 : <select id="DOCKER_AUTHORING_MODE" name="DOCKER_AUTHORING_MODE">
   <?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'no', 'No')?>
@@ -236,6 +235,15 @@ Template Authoring Mode:
 
 > If set to **Yes**, when creating/editing containers the interface will be present with some extra fields related to template authoring.
 
+Host access to custom networks:
+: <select name="DOCKER_ALLOW_ACCESS">
+  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', 'Disabled')?>
+  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', 'Enabled')?>
+  </select>
+
+> Allows direct communication between the host and containers using a custom (macvlan) network.<br>
+> By default this is prohibited.
+
 Preserve user defined networks:
 : <select name="DOCKER_USER_NETWORKS">
   <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', 'No')?>
@@ -432,6 +440,12 @@ Docker LOG rotation:
 
 > By default a single unlimited LOG file is created. Otherwise LOG file size and number of files are limited when LOG rotation is enabled.
 
+Host access to custom networks:
+: <?=$dockercfg['DOCKER_ALLOW_ACCESS']==''?'Disabled':'Enabled'?>
+
+> Allows direct communication between the host and containers using a custom (macvlan) network.<br>
+> By default this is prohibited.
+
 Preserve user defined networks:
 : <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve'?'Yes':'No'?>
 
diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php
index 67a26e9e2..fdf531d49 100644
--- a/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2015-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2019, Lime Technology
+ * Copyright 2015-2019, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2019, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -20,7 +20,6 @@ require_once "$docroot/webGui/include/Helpers.php";
 libxml_use_internal_errors(false); # Enable xml errors
 
 $var = parse_ini_file('state/var.ini');
-$cfg = parse_ini_file('boot/config/docker.cfg');
 ignore_user_abort(true);
 
 $DockerClient = new DockerClient();
diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php
index c7d961720..d6dea8b07 100644
--- a/plugins/dynamix.docker.manager/include/DockerClient.php
+++ b/plugins/dynamix.docker.manager/include/DockerClient.php
@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2014-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2019, Lime Technology
+ * Copyright 2014-2019, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2019, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -13,7 +13,7 @@
 ?>
 <?
 $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-libxml_use_internal_errors(true); # Suppress any warnings from xml errors. 
+libxml_use_internal_errors(true); # Suppress any warnings from xml errors.
 
 require_once "$docroot/plugins/dynamix.docker.manager/include/Helpers.php";
 
@@ -762,7 +762,7 @@ class DockerClient {
 	}
 
 	public function pullImage($image, $callback=null) {
-		$header       = null;
+		$header = null;
 		$registryAuth = $this->getRegistryAuth( $image );
 		if ( $registryAuth ) {
 			$header = 'X-Registry-Auth: ' . base64_encode( json_encode( [
@@ -944,16 +944,19 @@ class DockerUtil {
 
 	public static function myIP($name, $version=4) {
 		$ipaddr = $version==4 ? 'IPAddress' : 'GlobalIPv6Address';
-		return static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.$ipaddr}}{{end}}' $name");
+		return rtrim(static::docker("inspect --format='{{range .NetworkSettings.Networks}}{{.$ipaddr}} {{end}}' $name"));
 	}
+
 	public static function driver() {
 		$list = [];
 		foreach (static::docker("network ls --format='{{.Name}}={{.Driver}}'",true) as $network) {list($name,$driver) = explode('=',$network); $list[$name] = $driver;}
 		return $list;
 	}
+
 	public static function custom() {
 		return static::docker("network ls --filter driver='bridge' --filter driver='macvlan' --format='{{.Name}}'|grep -v '^bridge$'",true);
 	}
+
 	public static function network($more) {
 		$list = ['bridge'=>'', 'host'=>'', 'none'=>''];
 		foreach ($more as $net) $list[$net] = substr(static::docker("network inspect --format='{{range .IPAM.Config}}{{.Subnet}}, {{end}}' $net"),0,-1);

From 9eb86bea7aaf303cbe320b699a8cfd877df0b77b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 8 Jan 2020 16:57:58 +0100
Subject: [PATCH 7/8] Docker: added new setting "Host access to custom
 networks"

---
 plugins/dynamix.docker.manager/default.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/dynamix.docker.manager/default.cfg b/plugins/dynamix.docker.manager/default.cfg
index 366233525..400b3a496 100644
--- a/plugins/dynamix.docker.manager/default.cfg
+++ b/plugins/dynamix.docker.manager/default.cfg
@@ -5,3 +5,4 @@ DOCKER_LOG_SIZE="50m"
 DOCKER_LOG_FILES="1"
 DOCKER_AUTHORING_MODE="no"
 DOCKER_USER_NETWORKS="remove"
+DOCKER_ALLOW_ACCESS=""
\ No newline at end of file

From b1f22043deb515c0d99316722065f66629cbbded Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Wed, 8 Jan 2020 17:46:51 +0100
Subject: [PATCH 8/8] Patched vulnerability in template.php

---
 plugins/dynamix/template.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/plugins/dynamix/template.php b/plugins/dynamix/template.php
index a7cdfe7e6..e424d4a6f 100644
--- a/plugins/dynamix/template.php
+++ b/plugins/dynamix/template.php
@@ -43,9 +43,6 @@ foreach (glob('plugins/*', GLOB_ONLYDIR) as $plugin) {
   if ($plugin != 'plugins/dynamix') build_pages("$plugin/*.page");
 }
 
-// Extract the 'querystring'
-extract($_GET);
-
 // Need the following to make php-fpm & nginx work
 if (empty($path))
   $path = substr(explode('?', $_SERVER['REQUEST_URI'])[0], 1);