From 0d8550e25ec6abe50eeab8c216229fc920a53f84 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 4 Sep 2017 09:14:11 +0200
Subject: [PATCH 1/3] Corrected invalid links in Browse function

---
 plugins/dynamix/Browse.page        | 2 +-
 plugins/dynamix/include/Browse.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix/Browse.page b/plugins/dynamix/Browse.page
index 9207c6f83..70fb23106 100644
--- a/plugins/dynamix/Browse.page
+++ b/plugins/dynamix/Browse.page
@@ -16,7 +16,7 @@ Tag="navicon"
 <style>.loc{text-align:left;white-space:nowrap}</style>
 <script>
 $(function(){
-  $.get('/webGui/include/Browse.php',{dir:"<?=addslashes(htmlspecialchars($dir))?>",path:"<?=$path?>",user:<?=strpos($dir,'/mnt/user')===0?1:0?>},function(data){
+  $.get('/webGui/include/Browse.php',{dir:"<?=addslashes(urlencode($dir))?>",path:"<?=$path?>",user:<?=strpos($dir,'/mnt/user')===0?1:0?>},function(data){
     var table = $('table.indexer');
     var col = $.cookie('col')||1;
     var dir = $.cookie('dir')||0;
diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php
index 0e36d8d2f..250fc8171 100644
--- a/plugins/dynamix/include/Browse.php
+++ b/plugins/dynamix/include/Browse.php
@@ -17,14 +17,14 @@ require_once "$docroot/webGui/include/Helpers.php";
 function parent_link() {
   global $dir,$path;
   return ($dir && dirname($dir)!='/' && dirname($dir)!='/mnt' && dirname($dir)!='/mnt/user')
-  ? "<a href=\"".htmlspecialchars("/$path?dir=".urlencode_path(dirname($dir)))."\">Parent Directory...</a>" : "";
+  ? "<a href=\"/$path?dir=".htmlspecialchars(urlencode_path(dirname($dir)))."\">Parent Directory</a>" : "";
 }
 function trim_slash($url){
   return preg_replace('/\/\/+/','/',$url);
 }
 extract(parse_plugin_cfg('dynamix',true));
 $disks = parse_ini_file('state/disks.ini',true);
-$dir = $_GET['dir'];
+$dir = urldecode($_GET['dir']);
 $path = $_GET['path'];
 $user = $_GET['user'];
 $list = [];
@@ -76,7 +76,7 @@ foreach ($list as $row) {
   if ($row['type']=='directory') {
     echo "<tr>";
     echo "<td data=''><div class='icon-folder'></div></td>";
-    echo "<td><a href=\"".htmlspecialchars("/$path?dir=".urlencode_path(trim_slash($dir.'/'.$row['name'])))."\">".htmlspecialchars($row['name'])."</a></td>";
+    echo "<td><a href=\"/$path?dir=".htmlspecialchars(urlencode_path(trim_slash($dir.'/'.$row['name'])))."\">".htmlspecialchars($row['name'])."</a></td>";
     echo "<td data='0'>&lt;DIR&gt;</td>";
     echo "<td data='{$row['time']}'>".my_time($row['time'],"%F {$display['time']}")."</td>";
     echo "<td class='loc'>{$row['disk']}</td>";
@@ -87,7 +87,7 @@ foreach ($list as $row) {
     $tag = strpos($row['disk'],',')===false ? '' : 'warning';
     echo "<tr>";
     echo "<td data='{$row['fext']}'><div class='icon-file icon-{$row['fext']}'></div></td>";
-    echo "<td><a href=\"".htmlspecialchars(urlencode_path(trim_slash($dir.'/'.$row['name'])))."\" class=\"".($tag?:'none')."\">".htmlspecialchars($row['name'])."</a></td>";
+    echo "<td><a href=\"".htmlspecialchars(trim_slash($dir.'/'.$row['name']))."\" class=\"".($tag?:'none')."\">".htmlspecialchars($row['name'])."</a></td>";
     echo "<td data='{$row['size']}' class='$tag'>".my_scale($row['size'],$unit)." $unit</td>";
     echo "<td data='{$row['time']}' class='$tag'>".my_time($row['time'],"%F {$display['time']}")."</td>";
     echo "<td class='loc $tag'>{$row['disk']}</td>";

From 1b6fad459deae09367e58f2183a712009e870638 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 4 Sep 2017 09:47:29 +0200
Subject: [PATCH 2/3] Corrected USG typo

---
 plugins/dynamix/SSLSettings.page | 44 +++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/plugins/dynamix/SSLSettings.page b/plugins/dynamix/SSLSettings.page
index 3f57ecc99..6f8efbf93 100644
--- a/plugins/dynamix/SSLSettings.page
+++ b/plugins/dynamix/SSLSettings.page
@@ -27,13 +27,17 @@ function provisionSSL(internalip, keyfile, form) {
         result = false;
     };
 
-    $.post('https://keys.lime-technology.com/account/ssl/provisioncert',{internalip:internalip,keyfile:keyfile},function(data) {
+    $.post("https://keys.lime-technology.com/account/ssl/provisioncert",{internalip:internalip,keyfile:keyfile},function(data) {
       if (data.bundle) {
-        $.post("/webGui/include/CertUpload.php",{text:data.bundle,csrf_token:'<?=$var['csrf_token']?>'},function(data) {
-          var msg = "Your Let's Encrypt SSL Certificate has been provisioned and a DNS record " +
-                    "for local IP address "+internalip+" has been created on unraid.net.";
-          swal({title:'',text:msg,type:'success'},function(){form.submit();});
-        }).fail(failure);
+        $.get("//"+data.internal_dns+"/dnscheck",function() {
+          $.post("/webGui/include/CertUpload.php",{text:data.bundle,csrf_token:"<?=$var['csrf_token']?>"},function(data) {
+            var msg = "Your Let's Encrypt SSL Certificate has been provisioned and a DNS record " +
+                      "for local IP address "+internalip+" has been created on unraid.net.";
+            swal({title:'',text:msg,type:'success'},function(){form.submit();});
+          }).fail(failure);
+        }).fail(function(){
+          failure({"status": 403, "responseJSON": {"error": "Your router or configured DNS servers are protecting against DNS rebinding thus preventing this SSL certificate from working.  See help for more details and workarounds"}});
+        });
       } else {
         failure({"status": 403, "responseJSON": {"error": "Server was unable to provision SSL certificate"}});
       }
@@ -92,4 +96,32 @@ Certificate info:
 > **Provision** may be used to allocate a *free* SSL Certficiate from [Let's Encrypt](https://letsencrypt.org/) and
 > then upload to your server.
 
+> Note: **Provision** may fail if your router or upstream DNS server has
+> [DNS rebinding protection](https://en.wikipedia.org/wiki/DNS_rebinding) enabled.  DNS rebinding
+> protection prevents DNS from resolving a private IP network range.  DNS rebinding protection is meant as
+> a security feature on a local LAN which includes legacy devices with buggy/insecure "web" interfaces.
+
+> One source of DNS rebinding protection could be your ISP DNS server.  In this case the problem may be solved by
+> switching to a different DNS server such as Google's public DNS.
+
+> More commonly, DNS rebinding protection could be enabled in your router.  Most consumer routers do not implement DNS
+> rebinding protection; but, if they do, a configuration setting should be available to turn it off.
+
+> Higher end routers usually do enable DNS rebinding protection however.  Typically there are ways of turning it off
+> entirely or selectively based on domain.  Examples:
+
+> **DD-WRT:** If you are using "dnsmasq" with DNS rebinding protection enabled, you can add this line to your router
+> configuration file:
+
+> `rebind-domain-ok=/unraid.net/`
+
+> **pfSense:** If you are using pfSense internal DNS resolver service, you can add these Custom Option lines:
+
+> `server:`<br>
+> `private-domain: "unraid.net"`
+
+> **Ubiquiti USG router:** you can add this configuration line:
+
+> `set service dns forwarding options rebind-domain-ok=/unraid.net/`
+
 </form>

From fc5670a14c857ef1bab265a8da098243a0245f82 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Mon, 4 Sep 2017 13:37:29 +0200
Subject: [PATCH 3/3] Correct size calculation for unassigned disks

---
 plugins/dynamix/include/DeviceList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php
index c1a7a3a78..bd25415c2 100644
--- a/plugins/dynamix/include/DeviceList.php
+++ b/plugins/dynamix/include/DeviceList.php
@@ -74,7 +74,7 @@ function device_browse(&$disk) {
 }
 function device_desc(&$disk) {
   global $var;
-  $size = my_scale($disk['size']*1024,$unit);
+  $size = my_scale($disk['size'] ? $disk['size']*1024 : $disk['sectors']*$disk['sector_size'],$unit);
   $log = $var['fsState']=='Started' ? "<a href=\"#\" title=\"Disk Log Information\" onclick=\"openBox('/webGui/scripts/disk_log&arg1={$disk['device']}','Disk Log Information',600,900,false);return false\"><i class=\"fa fa-hdd-o icon\"></i></a>" : "";
   return  $log.my_id($disk['id'])." - $size $unit ({$disk['device']})";
 }