fix ssv verify for CentreonAPI.py

Author: HenriWahl

Nagstamon/Config.py

@@ -125,7 +125,7 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '3.9-20220807'
+    VERSION = '3.9-20220814'
     WEBSITE = 'https://nagstamon.de'
     COPYRIGHT = '©2008-2022 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'

Nagstamon/QUI/__init__.py

@@ -2091,6 +2091,8 @@ def finish_worker_thread(self):
         """
             attempt to shutdown thread cleanly
         """
+        # stop debugging
+        self.worker.debug_loop_looping = False
         # tell thread to quit
         self.worker_thread.quit()
         # wait until thread is really stopped
@@ -2157,7 +2159,7 @@ def debug_loop(self):
                     time.sleep(1)
 
                 # unset looping
-                self.debug_mode_looping = False
+                self.debug_loop_looping = False
                 # close file if any
                 if self.debug_file is not None:
                     self.close_debug_file()
@@ -7008,7 +7010,7 @@ def exit():
     # save configuration
     conf.SaveConfig()
 
-    # hide statuswindow first ro avoid lag when waiting for finished threads
+    # hide statuswindow first to avoid lag when waiting for finished threads
     statuswindow.hide()
 
     # stop statuswindow workers
@@ -7020,16 +7022,6 @@ def exit():
         server_vbox.table.worker.finish.emit()
 
     APP.exit()
-    # # delete all windows
-    # for dialog in dialogs.__dict__.values():
-    #     try:
-    #         dialog.window().destroy()
-    #     except:
-    #         dialog.window.destroy()
-    # statuswindow.destroy()
-    # 
-    # bye bye
-    # APP.instance().quit()
 
 
 def check_servers():

Nagstamon/Servers/Centreon/CentreonAPI.py

@@ -17,13 +17,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
+import traceback
 import urllib.request
 import urllib.parse
 import urllib.error
-import socket
 import sys
-import re
-import copy
 # API V2
 import pprint
 import json
@@ -103,12 +101,11 @@ def init_config(self):
 
 
     def init_HTTP(self):
+        GenericServer.init_HTTP(self)
         if self.session is None:
-            GenericServer.init_HTTP(self)
             self.session.headers.update({'Content-Type': 'application/json'})
             self.token = self.get_token().result
 
-
     def define_url(self):
         urls_centreon_api_v2 = {
             'resources': self.monitor_cgi_url + '/api/' + self.restapi_version + '/monitoring/resources',
@@ -175,7 +172,6 @@ def get_token(self):
             return Result(result=token)
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             result, error = self.Error(sys.exc_info())
             return Result(result=result, error=error)
@@ -207,7 +203,6 @@ def GetHost(self, host):
             return Result(result=fqdn)
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             # set checking flag back to False
             self.isChecking = False
@@ -241,13 +236,6 @@ def get_host_and_service_id(self, host, service=''):
                 return host_id
 
             except:
-                import traceback
-
-
-
-
-
-
                 traceback.print_exc(file=sys.stdout)
                 # set checking flag back to False
                 self.isChecking = False
@@ -284,7 +272,6 @@ def get_host_and_service_id(self, host, service=''):
                 return host_id,service_id
 
             except:
-                import traceback
                 traceback.print_exc(file=sys.stdout)
                 # set checking flag back to False
                 self.isChecking = False
@@ -365,7 +352,6 @@ def _get_status(self):
                 self.Debug(server='[' + self.get_name() + ']', debug='Host indexed : ' + new_host)
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             # set checking flag back to False
             self.isChecking = False
@@ -427,7 +413,6 @@ def _get_status(self):
                 self.new_hosts[new_host].services[new_service].criticality = alerts["severity_level"]
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             # set checking flag back to False
             self.isChecking = False
@@ -524,7 +509,6 @@ def _set_acknowledge(self, host, service, author, comment, sticky, notify, persi
                                debug="Set Acks, status code : " + str(status_code))
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             # set checking flag back to False
             self.isChecking = False
@@ -598,7 +582,6 @@ def _set_recheck(self, host, service):
                                debug="Reckeck on Host ("+host+") / Service ("+service+"), status code : " + str(status_code))
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             # set checking flag back to False
             self.isChecking = False
@@ -699,7 +682,6 @@ def _set_downtime(self, host, service, author, comment, fixed, start_time, end_t
 
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             # set checking flag back to False
             self.isChecking = False
@@ -715,7 +697,7 @@ def check_session(self):
         #     self.init_config()
         try:
             if conf.debug_mode == True:
-                self.Debug(server='[' + self.get_name() + ']', debug='Check-session, the token will be deleted if it has not been used for more than one hour. Current Token = ' + self.token )
+                self.Debug(server='[' + self.get_name() + ']', debug='Check-session, the token will be deleted if it has not been used for more than one hour. Current Token = ' + str(self.token) )
 
             cgi_data = {'limit':'0'}
             self.session = requests.Session()
@@ -725,7 +707,8 @@ def check_session(self):
             # Get en empty service list, to check the status of the current token
             # This request must be done in a GET, so just encode the parameters and fetch
             result = self.FetchURL(self.urls_centreon['resources'] + '?' + urllib.parse.urlencode(cgi_data), giveback="raw")
-
+            if result.status_code == 403:
+                self.get_token()
             data = json.loads(result.result)
             error = result.error
             status_code = result.status_code
@@ -743,7 +726,6 @@ def check_session(self):
                     self.Debug(server='[' + self.get_name() + ']', debug='Check-session, session renewed')
 
         except:
-            import traceback
             traceback.print_exc(file=sys.stdout)
             result, error = self.Error(sys.exc_info())
             return Result(result=result, error=error)

Nagstamon/Servers/Centreon/__init__.py

@@ -39,7 +39,7 @@ def __init__(self, **kwds):
                 data = json.loads(versions_raw.result)
                 ver_major = int(data["web"]["major"])
                 ver_minor = int(data["web"]["minor"])
-                # API V2 is usable only after 21.04 (not tested), ressources endpoit is buggy in 20.10
+                # API V2 is usable only after 21.04 (not tested), ressources endpoint is buggy in 20.10
                 if ver_major >= 21:
                     self.Debug(server='[' + self.get_name() + ']', debug='Loading class API, Centreon version : ' + str(ver_major) + '.' + str(ver_minor))
                     from .CentreonAPI import CentreonServer as CentreonServerReal

Nagstamon/Servers/Generic.py

@@ -1484,8 +1484,6 @@ def FetchURL(self, url, giveback='obj', cgi_data=None, no_auth=False, multipart=
 
             except Exception:
                 if conf.debug_mode:
-                    #traceback.print_exc(file=sys.stdout)
-                    #self.Debug(server=self.get_name(), debug=' '.join(sys.exc_info()))
                     self.Error(sys.exc_info())
                 result, error = self.Error(sys.exc_info())
                 if error.startswith('requests.exceptions.SSLError:'):
@@ -1516,9 +1514,7 @@ def FetchURL(self, url, giveback='obj', cgi_data=None, no_auth=False, multipart=
                               status_code=response.status_code)
 
         except Exception:
-            #traceback.print_exc(file=sys.stdout)
             self.Error(sys.exc_info())
-
             result, error = self.Error(sys.exc_info())
             return Result(result=result, error=error, status_code=response.status_code)
 

build/debian/changelog

@@ -1,7 +1,7 @@
-nagstamon (3.9-20220807) unstable; urgency=low
+nagstamon (3.9-20220814) unstable; urgency=low
   * New upstream
 
- -- Henri Wahl <[email protected]> Sun, 26 Jun 2022 08:00:00 +0100
+ -- Henri Wahl <[email protected]> Sun, 14 Aug 2022 08:00:00 +0100
 
 nagstamon (3.8.0) stable; urgency=low
   * New upstream