harden version check

HenriWahl · Oct 10, 2023 · 1f0f397 · 1f0f397
1 parent 4537339
commit 1f0f397
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py
@@ -7010,7 +7010,11 @@ def check(self):
                                                giveback='raw',
                                                no_auth=True)
                     # stop searching the available download URLs
-                    if response.error == "" and not response.result.startswith('<'):
+                    if response.error == "" and \
+                            not response.result.startswith('<') and \
+                            not '\n' in response.result and \
+                            len(response.result) > 5 and \
+                            response.result[0].isdigit():
                         latest_version = response.result.strip()
                         break
                 # ignore TLS error in case it was caused by requesting latest version - not important for monitoring

diff --git a/Nagstamon/Servers/Multisite.py b/Nagstamon/Servers/Multisite.py
@@ -179,18 +179,21 @@ def _get_url(self, url):
         #        return ''
 
         # looks like cookieauth
-        elif content.startswith('<'):
+        elif content.startswith('<') or\
+                '<!DOCTYPE html>' in content:
             self.CookieAuth = True
             # if first attempt login and then try to get data again
             if not self._is_auth_in_cookies():
                 self._get_cookie_login()
                 result = self.FetchURL(url, 'raw')
                 content, error = result.result, result.error
-                if content.startswith('<'):
+                if content.startswith('<') or\
+                '<!DOCTYPE html>' in content:
                     return ''
 
         # if finally still some <HTML> is sent this looks like a new login due to password change
-        if content.startswith('<'):
+        if content.startswith('<') or\
+                '<!DOCTYPE html>' in content:
             self.refresh_authentication = True
             return ''