bugfix
This commit is contained in:
parent
746c8198c3
commit
44a1e1d1d8
15
dapi/dapi.py
15
dapi/dapi.py
@ -131,6 +131,21 @@ async def deerer_auth(sor, request):
|
|||||||
client_ip = request['client_ip']
|
client_ip = request['client_ip']
|
||||||
return await deerer_user(sor, deer_data, client_ip, request)
|
return await deerer_user(sor, deer_data, client_ip, request)
|
||||||
|
|
||||||
|
async def get_user_dapp_apikey(dappid, userid):
|
||||||
|
"""
|
||||||
|
获得用户在downapp的apikey
|
||||||
|
"""
|
||||||
|
sql = """b.* from downapp a, downapikey b where a.id=b.dappid and a.id=${dappid}$"""
|
||||||
|
env = ServerEnv()
|
||||||
|
async with get_sor_context(env, 'dapi') as sor:
|
||||||
|
recs = await sor.sqlExe(sql, {'dappid': dappid})
|
||||||
|
if not recs:
|
||||||
|
debug(f'{dappid=}, {userid=} not exist is downapikey')
|
||||||
|
return None
|
||||||
|
apikey = env.password_decode(recs[0].apikey)
|
||||||
|
return apikey
|
||||||
|
return None
|
||||||
|
|
||||||
def deerer_header(appid, sk, apikey):
|
def deerer_header(appid, sk, apikey):
|
||||||
tim = time.time()
|
tim = time.time()
|
||||||
txt = f'{tim}:{apikey}'
|
txt = f'{tim}:{apikey}'
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
from dapi.dapi import sync_user, bearer_auth, deerer_auth, deerer_user, apikey_user, create_user_apikey, x_api_key_auth
|
from dapi.dapi import get_user_dapp_apikey, sync_user, bearer_auth, deerer_auth, deerer_user, apikey_user, create_user_apikey, x_api_key_auth
|
||||||
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
|
||||||
|
|
||||||
@ -9,6 +9,7 @@ def load_dapi():
|
|||||||
env.apikey_user = apikey_user
|
env.apikey_user = apikey_user
|
||||||
env.create_user_apikey = create_user_apikey
|
env.create_user_apikey = create_user_apikey
|
||||||
env.x_api_key_auth = x_api_key_auth
|
env.x_api_key_auth = x_api_key_auth
|
||||||
|
env.get_user_dapp_apikey = get_user_dapp_apikey
|
||||||
register_auth_method('Bearer ', bearer_auth)
|
register_auth_method('Bearer ', bearer_auth)
|
||||||
register_auth_method('Deerer ', deerer_auth)
|
register_auth_method('Deerer ', deerer_auth)
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user