ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-23 09:15:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled HTTP Auth, SSL and DMS disabling based on cloud.conf availability

Browse Source
This commit is contained in:
Michael
2014-09-08 21:51:56 -06:00
parent 17e4b51d18
commit 4fa87005bc
3 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
gns3server/server.py
View File

@ -140,37 +140,43 @@ class Server(object):
JSONRPCWebSocket.register_destination(destination, instance.name)
instance.start() # starts the new process
def _dummy_cloud_config(self):
config = configparser.ConfigParser()
config["CLOUD_SERVER"] = {
"WEB_AUTH_ENABLED" : "no",
"WEB_USERNAME" : "",
"WEB_PASSWORD" : "",
"SSL_ENABLED" : "no",
}
return config["CLOUD_SERVER"]
def run(self):
"""
Starts the Tornado web server and ZeroMQ server.
"""
# FIXME: debug mode!
try:
cloud_config = Config.instance().get_section_config("CLOUD_SERVER")
except KeyError:
cloud_config = self._dummy_cloud_config()
settings = {
"debug":True,
"cookie_secret": base64.b64encode(uuid.uuid4().bytes + uuid.uuid4().bytes),
"login_url": "/login",
"required_user" : cloud_config['WEB_USERNAME'],
"required_pass" : cloud_config['WEB_PASSWORD'],
}
ssl_options = {}
try:
cloud_config = Config.instance().get_section_config("CLOUD_SERVER")
cloud_settings = {
"required_user" : cloud_config['WEB_USERNAME'],
"required_pass" : cloud_config['WEB_PASSWORD'],
}
settings.update(cloud_settings)
if cloud_config["SSL_ENABLED"] == "yes":
ssl_options = {
"certfile" : cloud_config["SSL_CRT"],
"keyfile" : cloud_config["SSL_KEY"],
}
log.info("Certs found - starting in SSL mode")
except KeyError:
log.info("Missing cloud.conf - disabling HTTP auth and SSL")
router = self._create_zmq_router()
# Add our JSON-RPC Websocket handler to Tornado
self.handlers.extend([(r"/", JSONRPCWebSocket, dict(zmq_router=router))])
@ -190,13 +196,7 @@ class Server(object):
zmq.zmq_version()))
kwargs = {"address": self._host}
if cloud_config["SSL_ENABLED"] == "yes":
ssl_options = {
"certfile" : cloud_config["SSL_CRT"],
"keyfile" : cloud_config["SSL_KEY"],
}
log.info("Certs found - starting in SSL mode")
if ssl_options:
kwargs["ssl_options"] = ssl_options
if parse_version(tornado.version) >= parse_version("3.1"):