This commit is contained in:
yumoqing 2025-08-15 11:30:47 +08:00
parent 59d19f6bc3
commit dba0ff2d4b
2 changed files with 7 additions and 5 deletions

View File

@ -58,9 +58,9 @@ async def bearer_auth(sor, request):
return None return None
apikey = auth[7:] apikey = auth[7:]
client_ip = request['client_ip'] 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: if apikey is None:
return None return None
user = await get_apikey_user(sor, apikey, client_ip) user = await get_apikey_user(sor, apikey, client_ip)
@ -75,9 +75,9 @@ async def deerer_auth(sor, request):
return None return None
deer_data = auth[7:] deer_data = auth[7:]
client_ip = request['client_ip'] 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('-:-') appid, cyber = deer_data.split('-:-')
secretkey = await get_secretkey(sor, appid) secretkey = await get_secretkey(sor, appid)
try: try:

View File

@ -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 ahserver.serverenv import ServerEnv
from rbac.check_perm import register_auth_method from rbac.check_perm import register_auth_method
def load_dapi(): def load_dapi():
env = ServerEnv() env = ServerEnv()
env.sync_user = sync_user env.sync_user = sync_user
env.deerer_user = deerer_user
env.apikey_user = apikey_user
register_auth_method('Bearer ', bearer_auth) register_auth_method('Bearer ', bearer_auth)
register_auth_method('Deerer ', deerer_auth) register_auth_method('Deerer ', deerer_auth)