diff --git a/nagixsc_conf2http.py b/nagixsc_conf2http.py
index 4200af20a6f0571c44c4528604c87b2342cf6570..941fa1ccb122438ac01fd8b68df70dbed6d442bd 100755 (executable)
--- a/nagixsc_conf2http.py
+++ b/nagixsc_conf2http.py
#!/usr/bin/python
import BaseHTTPServer
+import ConfigParser
import base64
-import md5
+import optparse
import os
import re
import subprocess
+import sys
-config = { 'ip': '',
- 'port': 15666,
- }
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
-users = { 'nagixsc': '019b0966d98fb71d1a4bc4ca0c81d5cc', # PW: nagixsc
- }
+##############################################################################
-CONFDIR='./examples'
-C2X='./nagixsc_conf2xml.py'
+parser = optparse.OptionParser()
+
+parser.add_option('-c', '', dest='cfgfile', help='Config file')
+
+parser.set_defaults(cfgfile='conf2http.cfg')
+
+(options, args) = parser.parse_args()
+
+cfgread = ConfigParser.SafeConfigParser()
+cfgread.optionxform = str # We need case-sensitive options
+cfg_list = cfgread.read(options.cfgfile)
+
+if cfg_list == []:
+ print 'Config file "%s" could not be read!' % options.cfgfile
+ sys.exit(1)
+
+config = {}
+try:
+ config['ip'] = cfgread.get('server', 'ip')
+ config['port'] = cfgread.getint('server', 'port')
+
+ 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
+ sys.exit(1)
+
+users = {}
+for u in cfgread.options('users'):
+ users[u] = cfgread.get('users', u)
+
+##############################################################################
class Conf2HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
- def http_error(code, output):
+ def http_error(self, code, output):
self.send_response(code)
self.send_header('Content-Type', 'text/plain')
self.end_headers()
def do_GET(self):
- cmdline = C2X
+ cmdline = config['conf2xml_cmdline']
path = self.path.split('/')
# Check Basic Auth
try:
authdata = base64.b64decode(self.headers['Authorization'].split(' ')[1]).split(':')
- if not users[authdata[0]] == md5.md5(authdata[1]).hexdigest():
+ if not users[authdata[0]] == md5(authdata[1]).hexdigest():
raise Exception
except:
self.send_response(401)
- self.send_header('WWW-Authenticate', 'Basic realm="Nag(ix)SC"')
+ self.send_header('WWW-Authenticate', 'Basic realm="Nag(ix)SC Pull"')
self.send_header('Content-Type', 'text/plain')
self.end_headers()
self.wfile.write('Sorry! No action without login!')
configfile =''
if re.search('\.\.', configfile):
- http_error(500, 'Found ".." in config file name')
+ self.http_error(500, 'Found ".." in config file name')
return
if configfile and not re.search('^[a-zA-Z0-9-_\.]+$', configfile):
- http_error(500, 'Config file name contains invalid characters')
+ self.http_error(500, 'Config file name contains invalid characters')
return
if configfile:
configfile += '.conf'
- cmdline += ' -c ' + os.path.join(CONFDIR, configfile)
+ cmdline += ' -c ' + os.path.join(config['conf_dir'], configfile)
if host:
cmdline += ' -H %s' % host
output = cmd.communicate()[0].rstrip()
retcode = cmd.returncode
except OSError:
- http_error(500, 'Could not execute "%s"' % cmdline)
+ self.http_error(500, 'Could not execute "%s"' % cmdline)
return
if retcode == 0:
self.end_headers()
self.wfile.write(output)
else:
- http_error(500, output)
+ self.http_error(500, output)
return