projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing in vnf/ns-package artifacts
[osm/NBI.git]
/
osm_nbi
/
auth.py
diff --git
a/osm_nbi/auth.py
b/osm_nbi/auth.py
index
1b8fa2b
..
ec6a406
100644
(file)
--- a/
osm_nbi/auth.py
+++ b/
osm_nbi/auth.py
@@
-114,9
+114,9
@@
class Authenticator:
.format(config["message"]["driver"]))
if not self.backend:
if config["authentication"]["backend"] == "keystone":
.format(config["message"]["driver"]))
if not self.backend:
if config["authentication"]["backend"] == "keystone":
- self.backend = AuthconnKeystone(self.config["authentication"], self.db)
+ self.backend = AuthconnKeystone(self.config["authentication"], self.db
, self.role_permissions
)
elif config["authentication"]["backend"] == "internal":
elif config["authentication"]["backend"] == "internal":
- self.backend = AuthconnInternal(self.config["authentication"], self.db)
+ self.backend = AuthconnInternal(self.config["authentication"], self.db
, self.role_permissions
)
self._internal_tokens_prune()
else:
raise AuthException("Unknown authentication backend: {}"
self._internal_tokens_prune()
else:
raise AuthException("Unknown authentication backend: {}"
@@
-147,7
+147,7
@@
class Authenticator:
self.role_permissions.append(permission)
elif k in ("TODO", "METHODS"):
continue
self.role_permissions.append(permission)
elif k in ("TODO", "METHODS"):
continue
- el
se
:
+ el
if method_dict[k]
:
load_role_permissions(method_dict[k])
load_role_permissions(self.valid_methods)
load_role_permissions(method_dict[k])
load_role_permissions(self.valid_methods)
@@
-404,10
+404,8
@@
class Authenticator:
def new_token(self, token_info, indata, remote):
new_token_info = self.backend.authenticate(
def new_token(self, token_info, indata, remote):
new_token_info = self.backend.authenticate(
- user=indata.get("username"),
- password=indata.get("password"),
+ credentials=indata,
token_info=token_info,
token_info=token_info,
- project=indata.get("project_id")
)
new_token_info["remote_port"] = remote.port
)
new_token_info["remote_port"] = remote.port