mirror of https://github.com/MISP/misp-modules
Minimal logging added to the server
parent
f17d24beb3
commit
4b7aba64cb
|
@ -24,9 +24,20 @@ import sys
|
||||||
import tornado.web
|
import tornado.web
|
||||||
import importlib
|
import importlib
|
||||||
import json
|
import json
|
||||||
|
import logging
|
||||||
|
|
||||||
runPath = os.path.dirname(os.path.realpath(__file__))
|
runPath = os.path.dirname(os.path.realpath(__file__))
|
||||||
sys.path.append(os.path.join(runPath, '..'))
|
sys.path.append(os.path.join(runPath, '..'))
|
||||||
|
port = 6666
|
||||||
|
|
||||||
|
log = logging.getLogger('misp-modules')
|
||||||
|
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||||
|
handler = logging.StreamHandler(stream=sys.stdout)
|
||||||
|
handler.setFormatter(formatter)
|
||||||
|
handler.setLevel(logging.INFO)
|
||||||
|
|
||||||
|
log.addHandler(handler)
|
||||||
|
log.setLevel(logging.INFO)
|
||||||
|
|
||||||
modulesdir = '../modules/expansion'
|
modulesdir = '../modules/expansion'
|
||||||
|
|
||||||
|
@ -37,6 +48,7 @@ for module in os.listdir(modulesdir):
|
||||||
continue
|
continue
|
||||||
modulename = module.split(".")[0]
|
modulename = module.split(".")[0]
|
||||||
modules.append(modulename)
|
modules.append(modulename)
|
||||||
|
log.info('MISP modules {0} imported'.format(modulename))
|
||||||
mhandlers[modulename] = importlib.import_module('modules.expansion.'+modulename)
|
mhandlers[modulename] = importlib.import_module('modules.expansion.'+modulename)
|
||||||
|
|
||||||
class ListModules(tornado.web.RequestHandler):
|
class ListModules(tornado.web.RequestHandler):
|
||||||
|
@ -46,13 +58,14 @@ class ListModules(tornado.web.RequestHandler):
|
||||||
x = {}
|
x = {}
|
||||||
x['name'] = module
|
x['name'] = module
|
||||||
x['mispattributes'] = mhandlers[module].introspection()
|
x['mispattributes'] = mhandlers[module].introspection()
|
||||||
print (x['mispattributes'])
|
|
||||||
ret.append(x)
|
ret.append(x)
|
||||||
|
log.debug('MISP ListModules request')
|
||||||
self.write(json.dumps(ret))
|
self.write(json.dumps(ret))
|
||||||
class QueryModule(tornado.web.RequestHandler):
|
class QueryModule(tornado.web.RequestHandler):
|
||||||
def post(self):
|
def post(self):
|
||||||
jsonpayload = self.request.body.decode('utf-8')
|
jsonpayload = self.request.body.decode('utf-8')
|
||||||
x=json.loads(jsonpayload)
|
x=json.loads(jsonpayload)
|
||||||
|
log.debug('MISP QueryModule request {0}'.format(jsonpayload))
|
||||||
ret = mhandlers[x['module']].handler(q=jsonpayload)
|
ret = mhandlers[x['module']].handler(q=jsonpayload)
|
||||||
self.write(json.dumps(ret))
|
self.write(json.dumps(ret))
|
||||||
|
|
||||||
|
@ -60,5 +73,6 @@ class QueryModule(tornado.web.RequestHandler):
|
||||||
service = [(r'/modules',ListModules), (r'/query',QueryModule)]
|
service = [(r'/modules',ListModules), (r'/query',QueryModule)]
|
||||||
|
|
||||||
application = tornado.web.Application(service)
|
application = tornado.web.Application(service)
|
||||||
application.listen(6666)
|
log.info('MISP modules server started on TCP port {0}'.format(port))
|
||||||
|
application.listen(port)
|
||||||
tornado.ioloop.IOLoop.instance().start()
|
tornado.ioloop.IOLoop.instance().start()
|
||||||
|
|
Loading…
Reference in New Issue