![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/nagixsc_conf2http.py b/nagixsc_conf2http.py
index 941fa1ccb122438ac01fd8b68df70dbed6d442bd..7698d43a18cfb8811a300ecf730850e69cfe9010 100755 (executable)
--- a/nagixsc_conf2http.py
+++ b/nagixsc_conf2http.py
#!/usr/bin/python
-import BaseHTTPServer
import ConfigParser
import base64
import optparse
##############################################################################
+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')
print 'Config file "%s" could not be read!' % options.cfgfile
sys.exit(1)
-config = {}
+config = {
+ 'ip': '0.0.0.0',
+ 'port': '15666',
+ 'ssl': False,
+ 'sslcert': None,
+ 'conf_dir': '',
+ 'pidfile': '/var/run/nagixsc_conf2http.pid'
+ }
+
+if 'ip' in cfgread.options('server'):
+ config['ip'] = cfgread.get('server', 'ip')
+
+if 'port' in cfgread.options('server'):
+ config['port'] = cfgread.get('server', 'port')
try:
- config['ip'] = cfgread.get('server', 'ip')
- config['port'] = cfgread.getint('server', 'port')
+ config['port'] = int(config['port'])
+except ValueError:
+ print 'Port "%s" not an integer!' % config['port']
+ sys.exit(127)
- config['conf_dir'] = cfgread.get('server', 'conf_dir')
- config['conf2xml_cmdline'] = cfgread.get('server', 'conf2xml_cmdline')
+if 'ssl' in cfgread.options('server'):
+ try:
+ config['ssl'] = cfgread.getboolean('server', 'ssl')
+ except ValueError:
+ print 'Value for "ssl" ("%s") not boolean!' % config['ssl']
+ sys.exit(127)
+
+if config['ssl']:
+ if 'sslcert' in cfgread.options('server'):
+ config['sslcert'] = cfgread.get('server', 'sslcert')
+ else:
+ print 'SSL but no certificate file specified!'
+ sys.exit(127)
+
+try:
+ config['conf_dir'] = cfgread.get('server', 'conf_dir')
+except ConfigParser.NoOptionError:
+ print 'No "conf_dir" specified!'
+ sys.exit(127)
+
+if 'pidfile' in cfgread.options('server'):
+ config['pidfile'] = cfgread.get('server', 'pidfile')
-except ConfigParser.NoOptionError, e:
- print 'Config file error: %s ' % e
- sys.exit(1)
users = {}
for u in cfgread.options('users'):
##############################################################################
-class Conf2HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+class Conf2HTTPHandler(MyHTTPRequestHandler):
def http_error(self, code, output):
self.send_response(code)
def do_GET(self):
- cmdline = config['conf2xml_cmdline']
-
path = self.path.split('/')
# Check Basic Auth
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['sslcert']):
+ print 'SSL certificate "%s" not found!' % config['sslcert']
+ sys.exit(127)
+
+ if not os.path.isdir(config['conf_dir']):
+ print 'Not a config file directory: "%s"' % config['conf_dir']
+ sys.exit(127)
+
+ if options.daemon:
+ daemonize(pidfile=config['pidfile'])
+
+ server = MyHTTPServer((config['ip'], config['port']), Conf2HTTPHandler, ssl=config['ssl'], sslpemfile=config['sslcert'])
try:
- server = BaseHTTPServer.HTTPServer((config['ip'], config['port']), Conf2HTTPHandler)
server.serve_forever()
except:
server.socket.close()