Reorder daemonizing (creation of PID file)

[nagixsc.git] / nagixsc_conf2http.py

diff --git a/nagixsc_conf2http.py b/nagixsc_conf2http.py
index 941fa1ccb122438ac01fd8b68df70dbed6d442bd..1c5d28ff137af6c64218c6eb4bfb138d80bbdde0 100755 (executable)
--- a/nagixsc_conf2http.py
+++ b/nagixsc_conf2http.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import BaseHTTPServer
 import ConfigParser
 import base64
 import optparse
@@ -16,9 +15,15 @@ except ImportError:
 
 ##############################################################################
 
+from nagixsc import *
+
+##############################################################################
+
 parser = optparse.OptionParser()
 
 parser.add_option('-c', '', dest='cfgfile', help='Config file')
+parser.add_option('-d', '--daemon', action='store_true', dest='daemon', help='Daemonize, go to background')
+parser.add_option('', '--nossl', action='store_true', dest='nossl', help='Disable SSL (overwrites config file)')
 
 parser.set_defaults(cfgfile='conf2http.cfg')
 
@@ -36,9 +41,10 @@ config = {}
 try:
        config['ip']   = cfgread.get('server', 'ip')
        config['port'] = cfgread.getint('server', 'port')
+       config['ssl']  = cfgread.getboolean('server', 'ssl')
+       config['cert'] = cfgread.get('server', 'sslcert')
 
        config['conf_dir']         = cfgread.get('server', 'conf_dir')
-       config['conf2xml_cmdline'] = cfgread.get('server', 'conf2xml_cmdline')
 
 except ConfigParser.NoOptionError, e:
        print 'Config file error: %s ' % e
@@ -50,7 +56,7 @@ for u in cfgread.options('users'):
 
 ##############################################################################
 
-class Conf2HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class Conf2HTTPHandler(MyHTTPRequestHandler):
 
        def http_error(self, code, output):
                self.send_response(code)
@@ -61,8 +67,6 @@ class Conf2HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
 
        def do_GET(self):
-               cmdline = config['conf2xml_cmdline']
-
                path = self.path.split('/')
 
                # Check Basic Auth
@@ -82,57 +86,58 @@ class Conf2HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                if len(path) >= 4:
                        service = path[3]
                else:
-                       service = ''
+                       service = None
 
                if len(path) >= 3:
                        host = path[2]
                else:
-                       host = ''
+                       host = None
 
                if len(path) >= 2:
-                       configfile = path[1]
+                       configfile = path[1] + '.conf'
                else:
-                       configfile =''
+                       self.http_error(500, 'No config file specified')
+                       return
 
                if re.search('\.\.', configfile):
                        self.http_error(500, 'Found ".." in config file name')
                        return
-               if configfile and not re.search('^[a-zA-Z0-9-_\.]+$', configfile):
+               if not re.search('^[a-zA-Z0-9-_]+.conf$', configfile):
                        self.http_error(500, 'Config file name contains invalid characters')
                        return
 
-               if configfile:
-                       configfile += '.conf'
-                       cmdline    += ' -c ' + os.path.join(config['conf_dir'], configfile)
-
-               if host:
-                       cmdline += ' -H %s' % host
-                       if service:
-                               cmdline += ' -D %s' % service
+               check_config = read_inifile(os.path.join(config['conf_dir'], configfile))
+               if not check_config:
+                       self.http_error(500, 'Could not read config file "%s"' % configfile)
+                       return
 
-               try:
-                       cmd     = subprocess.Popen(cmdline.split(' '), stdout=subprocess.PIPE)
-                       output  = cmd.communicate()[0].rstrip()
-                       retcode = cmd.returncode
-               except OSError:
-                       self.http_error(500, 'Could not execute "%s"' % cmdline)
+               checks = conf2dict(check_config, host, service)
+               if not checks:
+                       self.http_error(500, 'No checks executed')
                        return
 
-               if retcode == 0:
-                       self.send_response(200)
-                       self.send_header('Content-Type', 'text/xml')
-                       self.end_headers()
-                       self.wfile.write(output)
-               else:
-                       self.http_error(500, output)
+               self.send_response(200)
+               self.send_header('Content-Type', 'text/xml')
+               self.end_headers()
+               self.wfile.write(xml_from_dict(checks))
 
                return
 
 
 
 def main():
+       if options.nossl:
+               config['ssl'] = False
+
+       if config['ssl'] and not os.path.isfile(config['cert']):
+               print 'SSL certificate "%s" not found!' % config['cert']
+               sys.exit(127)
+
+       if options.daemon:
+               daemonize(pidfile='/var/run/nagixsc_conf2http.pid')
+
+       server = MyHTTPServer((config['ip'], config['port']), Conf2HTTPHandler, ssl=config['ssl'], sslpemfile=config['cert'])
        try:
-               server = BaseHTTPServer.HTTPServer((config['ip'], config['port']), Conf2HTTPHandler)
                server.serve_forever()
        except:
                server.socket.close()