try to fix Check_MK 1.4 login problem part III

HenriWahl · Sep 5, 2017 · b7e99da · b7e99da
1 parent 165dacb
commit b7e99da
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -101,7 +101,7 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '2.1-20170904'
+    VERSION = '2.1-20170905'
     WEBSITE = 'https://nagstamon.ifw-dresden.de'
     COPYRIGHT = '©2008-2017 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'

diff --git a/Nagstamon/Servers/Multisite.py b/Nagstamon/Servers/Multisite.py
@@ -138,7 +138,7 @@ def _is_auth_in_cookies(self):
         """
         if not self.session == None:
             for cookie in self.session.cookies:
-                if cookie.startswith('auth_'):
+                if cookie.name.startswith('auth_'):
                     return True
         return False
 
@@ -168,18 +168,15 @@ def _get_url(self, url):
                                               status_code=status_code))
 
         # in case of auth problem enable GUI auth part in popup
-        ###if self.CookieAuth == True and len(self.session.cookies) == 0:
         if self.CookieAuth == True and not self.session == None:
-            if not 'auth_monitor' in self.session.cookies:
+            if not self._is_auth_in_cookies():
                 self.refresh_authentication = True
                 return ''
 
        # looks like cookieauth
         elif content.startswith('<'):
             self.CookieAuth = True
             # if first attempt login and then try to get data again
-            ###if len(self.session.cookies) == 0:
-            ###if not 'auth_monitor' in self.session.cookies:
             if not self._is_auth_in_cookies():
                 self._get_cookie_login()
                 result = self.FetchURL(url, 'raw')

diff --git a/Nagstamon/resources/nagstamon.1.gz b/Nagstamon/resources/nagstamon.1.gz
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ It is inspired by Nagios Checker for Firefox – just without an open Firefox wi
 Nagstamon is released under the GPLv2 and free to use and modify.
 
 Nagstamon is written in Python 3 and uses the Qt 5 GUI toolkit which makes it very portable. It has been tested successfully on latest Ubuntu, Debian, Windows, NetBSD, OpenBSD, FreeBSD and MacOS X.
-It works with GNOME, KDE, Windows and MacOS X desktop.
+It works with GNOME, KDE, Windows and macOS desktops.
 
 Successfully tested monitors include:
 

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,4 +1,4 @@
-nagstamon (2.1-20170904) unstable; urgency=low
+nagstamon (2.1-20170905) unstable; urgency=low
   * New upstream
    - added Kerberos authentification
    - added increased security by taking TLS seriously