From ca06bd95462e58185f0cd8e10a2fc7317693f1cf Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sat, 14 Jul 2018 09:36:32 -0400 Subject: [PATCH 1/4] Remove control codes, and extended ascii characters from plugin urls on install Every once in a while, a copy / paste from a browser of CA's URL posted on the forum winds up with unicode and/or control characters in the middle of the URL, which prevents installation. (https://lime-technology.com/forums/topic/38582-plug-in-community-applications/?page=85&tab=comments#comment-669454 and https://lime-technology.com/forums/topic/38582-plug-in-community-applications/?page=84&tab=comments#comment-664991 ) Just replace them with a null character. Probably geographically related. --- plugins/dynamix.plugin.manager/scripts/plugin | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/dynamix.plugin.manager/scripts/plugin b/plugins/dynamix.plugin.manager/scripts/plugin index b1ecbfb32..d07c4c1a3 100755 --- a/plugins/dynamix.plugin.manager/scripts/plugin +++ b/plugins/dynamix.plugin.manager/scripts/plugin @@ -439,6 +439,7 @@ if ($argc < 3) { // $unraid = parse_ini_file('/etc/unraid-version'); if ($method == "install") { + $argv[2] = preg_replace('/[\x00-\x1F\x80-\xFF]/', '', $argv[2]); echo "plugin: installing: $argv[2]\n"; // check for URL if ((strpos($argv[2], "http://") === 0) || (strpos($argv[2], "https://") === 0)) { From d32b44311087d23efcdcf33d5654836c5d74734d Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sat, 14 Jul 2018 09:47:22 -0400 Subject: [PATCH 2/4] Update link for privileged help text --- plugins/dynamix.docker.manager/include/CreateDocker.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index bb9ae8157..29a0356ec 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -1441,7 +1441,7 @@ optgroup.title{background-color:#625D5D;color:#FFFFFF;text-align:center;margin-t

For containers that require the use of host-device access directly or need full exposure to host capabilities, this option will need to be selected. -
For more information, see this link: https://docs.docker.com/reference/run/#runtime-privilege-linux-capabilities-and-lxc-configuration

+
For more information, see this link: https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities

From 5bdb5f714af9884d7fe64694c79ad09c33360886 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Sat, 14 Jul 2018 11:49:00 -0400 Subject: [PATCH 3/4] Change capitalization Closes #348 --- plugins/dynamix.plugin.manager/Plugins.page | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix.plugin.manager/Plugins.page b/plugins/dynamix.plugin.manager/Plugins.page index b8e28e5c2..0e8d70641 100644 --- a/plugins/dynamix.plugin.manager/Plugins.page +++ b/plugins/dynamix.plugin.manager/Plugins.page @@ -73,9 +73,9 @@ function loadlist(id) { $(function() { loadlist(); $('#plugin_tree').fileTree({root:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);}); - $('.tabs').append(""); + $('.tabs').append(""); - $('.tabs').append(""); + $('.tabs').append(""); }); From d2113984e1a7bd84e93c22a97d8baeb099178f3c Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Tue, 17 Jul 2018 12:08:38 -0500 Subject: [PATCH 4/4] fix regex matching for unraid.net domain name validation when using new openssl1.1 --- plugins/dynamix/include/CertUpload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/include/CertUpload.php b/plugins/dynamix/include/CertUpload.php index fb00ea483..148b1d451 100644 --- a/plugins/dynamix/include/CertUpload.php +++ b/plugins/dynamix/include/CertUpload.php @@ -16,7 +16,7 @@ $text = $_POST['text'] ?? ''; file_put_contents('/boot/config/ssl/certs/certificate_bundle.pem.new', $text); //validate certificate_bundle.pem.new is for *.unraid.net before moving it over to certificate_bundle.pem -if (preg_match('/CN=[0-9a-f]{40}\.unraid\.net$/', exec('openssl x509 -in /boot/config/ssl/certs/certificate_bundle.pem.new -subject -noout 2>&1'))) { +if (preg_match('/[0-9a-f]{40}\.unraid\.net$/', exec('openssl x509 -in /boot/config/ssl/certs/certificate_bundle.pem.new -subject -noout 2>&1'))) { rename('/boot/config/ssl/certs/certificate_bundle.pem.new', '/boot/config/ssl/certs/certificate_bundle.pem'); } else { unlink('/boot/config/ssl/certs/certificate_bundle.pem.new');