diff --git a/dapi/dapi.py b/dapi/dapi.py index a4aca83..e50e055 100644 --- a/dapi/dapi.py +++ b/dapi/dapi.py @@ -50,8 +50,8 @@ where a.userid = b.id return None return recs[0] -async def bearer_auth(request): - auth = request.headers.get('Authorization') +async def bearer_auth(sor, request): + auth = request.headers.get('Authentication') if auth is None: return None if not auth.startswith('Bearer '): @@ -60,16 +60,12 @@ async def bearer_auth(request): client_ip = request['client_ip'] if apikey is None: return None - db = DBPools() - dbname = get_dbname() - async with db.sqlorContext(dbname) as sor: - user = await get_apikey_user(sor, apikey, client_ip) - await user_login(user.id, username=user.username, userorgid=user.orgid) - return user.id - return None + user = await get_apikey_user(sor, apikey, client_ip) + await user_login(user.id, username=user.username, userorgid=user.orgid) + return user.id -async def deerer_auth(request): - auth = request.headers.get('Authorization') +async def deerer_auth(sor, request): + auth = request.headers.get('Authentication') if auth is None: return None if not auth.startswith('Deerer '): @@ -77,17 +73,12 @@ async def deerer_auth(request): client_ip = request['client_ip'] deer_data = auth[7:] appid, cyber = bear_data.split('-:-') - db = DBPools() - dbname = get_dbname() - async with db.sqlorContext(dbname) as sor: - secretkey = await get_secretkey(sor, appid) - txt = aes_decrypt_ecb(secretkey, cyber) - t, apikey = txt.split(':') - user = await get_apikey_user(sor, apikey, client_ip) - await user_login(user.id, username=user.username, userorgid=user.orgid) - return user.id - - return None + secretkey = await get_secretkey(sor, appid) + txt = aes_decrypt_ecb(secretkey, cyber) + t, apikey = txt.split(':') + user = await get_apikey_user(sor, apikey, client_ip) + await user_login(user.id, username=user.username, userorgid=user.orgid) + return user.id def return_error(code): return { diff --git a/dapi/init.py b/dapi/init.py index 9f6a0d2..8379d48 100644 --- a/dapi/init.py +++ b/dapi/init.py @@ -5,6 +5,6 @@ from rbac.check_perm import register_auth_method def load_dapi(): env = ServerEnv() env.sync_user = sync_user - register_auth_method('Bearer', bearer_auth) - register_auth_method('Deerer', deerer_auth) + register_auth_method('Bearer ', bearer_auth) + register_auth_method('Deerer ', deerer_auth)