From 11a83c786f2f38abe485a6fcd396092aa0a13453 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Mon, 31 Jan 2022 23:01:06 -0700 Subject: [PATCH 1/2] fix(ProvisionCert): cert subject parsing --- plugins/dynamix/include/ProvisionCert.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dynamix/include/ProvisionCert.php b/plugins/dynamix/include/ProvisionCert.php index 076ce6c76..f29476314 100644 --- a/plugins/dynamix/include/ProvisionCert.php +++ b/plugins/dynamix/include/ProvisionCert.php @@ -46,7 +46,7 @@ $isRegistered = !empty($remote) && !empty($remote['username']); $certPresent = file_exists($certPath); if ($certPresent) { // renew existing cert - $subject = exec("/usr/bin/openssl x509 -subject -noout -in ".escapeshellarg($certPath)); + $certSubject = exec("/usr/bin/openssl x509 -subject -noout -in ".escapeshellarg($certPath)); $isLegacyCert = preg_match('/.*\.unraid\.net$/', $certSubject); $isWildcardCert = preg_match('/.*\.myunraid\.net$/', $certSubject); if ($isLegacyCert || $isWildcardCert) { From ce84c517628a34400745b9890eddfecb9f432fc4 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Mon, 31 Jan 2022 23:04:00 -0700 Subject: [PATCH 2/2] fix(ProvisionCert): translation fixes --- plugins/dynamix/include/ProvisionCert.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/dynamix/include/ProvisionCert.php b/plugins/dynamix/include/ProvisionCert.php index f29476314..a417c0a30 100644 --- a/plugins/dynamix/include/ProvisionCert.php +++ b/plugins/dynamix/include/ProvisionCert.php @@ -57,7 +57,7 @@ if ($certPresent) { } } else { // assume custom cert - response_complete(406, '{"error":"'._('Cannot renew a custom cert at').' $certPath"}'); + response_complete(406, '{"error":"'._('Cannot renew a custom cert at').' '.$certPath.'"}'); } } else { // provision new cert @@ -69,7 +69,7 @@ $endpoint = ($certPresent && $isLegacyCert) ? "provisioncert" : "provisionwildca $keyfile = @file_get_contents($var['regFILE']); if ($keyfile === false) { - response_complete(406, '{"error":"'.('License key required').'"}'); + response_complete(406, '{"error":"'._('License key required').'"}'); } $keyfile = @base64_encode($keyfile); $ethX = 'eth0';