X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fauth.py;h=9098de7835a1c93c521a2d87e888532311b2ead5;hp=1b8fa2b0adcef246e817a3f3600f0e4379971907;hb=refs%2Fchanges%2F30%2F9030%2F2;hpb=ad682a52ef94fa2662e2a0f6e3f81fb7c8f5e0fe diff --git a/osm_nbi/auth.py b/osm_nbi/auth.py index 1b8fa2b..9098de7 100644 --- 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": - self.backend = AuthconnKeystone(self.config["authentication"], self.db) + self.backend = AuthconnKeystone(self.config["authentication"], self.db, self.role_permissions) 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: {}" @@ -404,10 +404,8 @@ class Authenticator: 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, - project=indata.get("project_id") ) new_token_info["remote_port"] = remote.port