Fix enable_license and webadmin timeout

zentyal · May 9, 2024 · da6fcd4 · da6fcd4
1 parent cf5c9c1
commit da6fcd4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/main/core/ChangeLog b/main/core/ChangeLog
@@ -1,3 +1,6 @@
+8.0.3
+	+ Fix auth.conf in enable_license script
+	+ Avoid Webadmin timeout when zentyal.com is down or collapsed
 8.0.2
 	+ Fix configuration backup dependency. Fix #2160
 	+ Fix CPU load on Widget. Fix #2154

diff --git a/main/core/debian/changelog b/main/core/debian/changelog
@@ -1,3 +1,9 @@
+zentyal-core (8.0.3) jammy; urgency=high
+
+  * New upstream release
+
+ -- Daniel Joven <djoven@novadevs.com>  Tue, 07 May 2024 16:12:37 +0100
+
 zentyal-core (8.0.2) jammy; urgency=high
 
   * New upstream release

diff --git a/main/core/src/EBox/Dashboard/CGI/Index.pm b/main/core/src/EBox/Dashboard/CGI/Index.pm
@@ -270,7 +270,7 @@ sub _getNewVersionFromCloud
 
     my $version = EBox::Config::version();
     my $newVersionString;
-    system("wget --quiet -O /tmp/new-release - http://update.zentyal.org/update-from-'$version'.txt");
+    system("timeout 15 wget --timeout 15 --quiet -O /tmp/new-release - http://update.zentyal.org/update-from-'$version'.txt");
     try {
         $newVersionString = $self->_readVersion();
     } catch($ex) {
@@ -279,7 +279,7 @@ sub _getNewVersionFromCloud
 
     if ($newVersionString eq "") {
         $newVersionString = $version;
-    } 
+    }
 
     return $newVersionString;
 }

diff --git a/main/core/src/scripts/enable_license b/main/core/src/scripts/enable_license
@@ -4,6 +4,7 @@ CURMAJORV=`dpkg -l|grep zentyal-core | awk '{print $3}' | cut -d'.' -f1`
 CURMINORV=`dpkg -l|grep zentyal-core | awk '{print $3}' | cut -d'.' -f2`
 CURV="${CURMAJORV}.${CURMINORV}"
 KEYURL="keys.zentyal.org/zentyal-${CURV}-packages-com.asc"
+APT_AUTH_CONF='/etc/apt/auth.conf.d/zentyal-commercial.conf'
 
 # Preparing files to persist the response data
 LK_CODE_FILE="/var/lib/zentyal/.license"
@@ -104,7 +105,8 @@ if [ $REQUEST -eq "200" ]; then
 	# Save the license key code
 	LK_CODE=$(echo $LK_DATA | jq -r ".code")
 	echo $LK_CODE > $LK_CODE_FILE
-	echo "machine packages.zentyal.com login $LK_CODE password $SERVER_HASH" > /etc/apt/auth.conf
+	echo "machine https://packages.zentyal.com login $LK_CODE password $SERVER_HASH" > $APT_AUTH_CONF
+	chmod 600 $APT_AUTH_CONF
 
 	touch /var/lib/zentyal/.commercial-edition
 	logger UCP[$$] INFO: License key $LK_CODE was enabled.