[fix] minor release - adds failsafe check before foreach loop

AlternC · Sep 18, 2020 · 8d75995 · 8d75995
1 parent b775daf
commit 8d75995
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+alternc-nginx-ssl (3.3.4) oldstable; urgency=low
+
+  * adds a failsafe check before starting loop
+
+ -- Thibault Francois <[email protected]>  Wed,  16 Sep 2020 11:11:00 +0200
+
 alternc-nginx-ssl (3.3.3) oldstable; urgency=low
 
   * fix the nginx template to ignore acme-challenge only, not all .well-known (fixes nextcloud caldav discovery for iOS)

diff --git a/update_nginx-ssl.sh b/update_nginx-ssl.sh
@@ -288,23 +288,25 @@ while (($c=readdir($d))!==false) {
 }
 closedir($d);
 // compare that with the status list (both ways)
-foreach($status["uninstall"] as $fqdn=>$ts) {
-    if (!in_array($fqdn,$badlist)) {
-        unset($status["uninstall"][$fqdn]);
-    }
-}
-foreach($badlist as $fqdn) {
-    if (!isset($status["uninstall"][$fqdn])) {
-        $status["uninstall"][$fqdn]=time();
-    } else {
-        // not new, therefore may be here since >2day ?
-        if ($status["uninstall"][$fqdn]<(time()-86400*2)) {
+if (array_key_exists("uninstall", $status)) {
+    foreach($status["uninstall"] as $fqdn=>$ts) {
+        if (!in_array($fqdn,$badlist)) {
             unset($status["uninstall"][$fqdn]);
-            // deleted since 2 days or more in a continuous way, let's delete cert & nginx conf
-            $reload=true;
-            unlink($nginxdir."/".$fqdn.".alternc.conf");
-            exec("rm -rf ".escapeshellarg($letsencryptdir."/live/$fqdn")." ".escapeshellarg($letsencryptdir."/archive/$fqdn")." ".escapeshellarg($letsencryptdir."/renewal/".$fqdn.".conf"));
-            syslog(LOG_INFO,"removed nginx conf & letsencrypt certificate for $fqdn");
+        }
+    }
+    foreach($badlist as $fqdn) {
+        if (!isset($status["uninstall"][$fqdn])) {
+            $status["uninstall"][$fqdn]=time();
+        } else {
+            // not new, therefore may be here since >2day ?
+            if ($status["uninstall"][$fqdn]<(time()-86400*2)) {
+                unset($status["uninstall"][$fqdn]);
+                // deleted since 2 days or more in a continuous way, let's delete cert & nginx conf
+                $reload=true;
+                unlink($nginxdir."/".$fqdn.".alternc.conf");
+                exec("rm -rf ".escapeshellarg($letsencryptdir."/live/$fqdn")." ".escapeshellarg($letsencryptdir."/archive/$fqdn")." ".escapeshellarg($letsencryptdir."/renewal/".$fqdn.".conf"));
+                syslog(LOG_INFO,"removed nginx conf & letsencrypt certificate for $fqdn");
+            }
         }
     }
 }