diff --git a/dapi/dapi.py b/dapi/dapi.py index c3d7b46..e803020 100644 --- a/dapi/dapi.py +++ b/dapi/dapi.py @@ -58,9 +58,9 @@ async def bearer_auth(sor, request): return None apikey = auth[7:] client_ip = request['client_ip'] - return await apikey_user(apikey, client_ip) + return await apikey_user(sor, apikey, client_ip) -async def apikey_user(apikey, client_ip): +async def apikey_user(sor, apikey, client_ip): if apikey is None: return None user = await get_apikey_user(sor, apikey, client_ip) @@ -75,9 +75,9 @@ async def deerer_auth(sor, request): return None deer_data = auth[7:] client_ip = request['client_ip'] - return await deerer_user(deer_data, client_ip) + return await deerer_user(sor, deer_data, client_ip) -async def deerer_user(deer_data, client_ip): +async def deerer_user(sor, deer_data, client_ip): appid, cyber = deer_data.split('-:-') secretkey = await get_secretkey(sor, appid) try: diff --git a/dapi/init.py b/dapi/init.py index 8379d48..aa36947 100644 --- a/dapi/init.py +++ b/dapi/init.py @@ -1,10 +1,12 @@ -from dapi.dapi import sync_user, bearer_auth, deerer_auth +from dapi.dapi import sync_user, bearer_auth, deerer_auth, deerer_user, apikey_user from ahserver.serverenv import ServerEnv from rbac.check_perm import register_auth_method def load_dapi(): env = ServerEnv() env.sync_user = sync_user + env.deerer_user = deerer_user + env.apikey_user = apikey_user register_auth_method('Bearer ', bearer_auth) register_auth_method('Deerer ', deerer_auth)