projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Bug 917: Revoke NBI's Auth token once user is deleted
[osm/NBI.git]
/
osm_nbi
/
engine.py
diff --git
a/osm_nbi/engine.py
b/osm_nbi/engine.py
index
0cd0666
..
5bdbb7e
100644
(file)
--- a/
osm_nbi/engine.py
+++ b/
osm_nbi/engine.py
@@
-15,7
+15,7
@@
import logging
import yaml
import logging
import yaml
-from osm_common import dbmongo, dbmemory, fslocal, msglocal, msgkafka, version as common_version
+from osm_common import dbmongo, dbmemory, fslocal,
fsmongo,
msglocal, msgkafka, version as common_version
from osm_common.dbbase import DbException
from osm_common.fsbase import FsException
from osm_common.msgbase import MsgException
from osm_common.dbbase import DbException
from osm_common.fsbase import FsException
from osm_common.msgbase import MsgException
@@
-68,7
+68,7
@@
class Engine(object):
# Add new versions here
}
# Add new versions here
}
- def __init__(self):
+ def __init__(self
, token_cache
):
self.db = None
self.fs = None
self.msg = None
self.db = None
self.fs = None
self.msg = None
@@
-78,6
+78,7
@@
class Engine(object):
self.logger = logging.getLogger("nbi.engine")
self.map_topic = {}
self.write_lock = None
self.logger = logging.getLogger("nbi.engine")
self.map_topic = {}
self.write_lock = None
+ self.token_cache = token_cache
def start(self, config):
"""
def start(self, config):
"""
@@
-106,6
+107,9
@@
class Engine(object):
if config["storage"]["driver"] == "local":
self.fs = fslocal.FsLocal()
self.fs.fs_connect(config["storage"])
if config["storage"]["driver"] == "local":
self.fs = fslocal.FsLocal()
self.fs.fs_connect(config["storage"])
+ elif config["storage"]["driver"] == "mongo":
+ self.fs = fsmongo.FsMongo()
+ self.fs.fs_connect(config["storage"])
else:
raise EngineException("Invalid configuration param '{}' at '[storage]':'driver'".format(
config["storage"]["driver"]))
else:
raise EngineException("Invalid configuration param '{}' at '[storage]':'driver'".format(
config["storage"]["driver"]))
@@
-123,7
+127,7
@@
class Engine(object):
if config["authentication"]["backend"] == "keystone":
self.auth = AuthconnKeystone(config["authentication"], self.db, None)
else:
if config["authentication"]["backend"] == "keystone":
self.auth = AuthconnKeystone(config["authentication"], self.db, None)
else:
- self.auth = AuthconnInternal(config["authentication"], self.db,
dict()
)
+ self.auth = AuthconnInternal(config["authentication"], self.db,
self.token_cache
)
if not self.operations:
if "resources_to_operations" in config["rbac"]:
resources_to_operations_file = config["rbac"]["resources_to_operations"]
if not self.operations:
if "resources_to_operations" in config["rbac"]:
resources_to_operations_file = config["rbac"]["resources_to_operations"]