yumoqing/dapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2025-07-31 16:01:10 +08:00
parent 3d0253d297
commit 5aa3a06966
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dapi/dapi.py
View File

@ -50,8 +50,8 @@ where a.userid = b.id
return None return None
return recs[0] return recs[0]
async def bearer_auth(request): async def bearer_auth(sor, request):
auth = request.headers.get('Authorization') auth = request.headers.get('Authentication')
if auth is None: if auth is None:
return None return None
if not auth.startswith('Bearer '): if not auth.startswith('Bearer '):
@ -60,16 +60,12 @@ async def bearer_auth(request):
client_ip = request['client_ip'] client_ip = request['client_ip']
if apikey is None: if apikey is None:
return None return None
db = DBPools() user = await get_apikey_user(sor, apikey, client_ip)
dbname = get_dbname() await user_login(user.id, username=user.username, userorgid=user.orgid)
async with db.sqlorContext(dbname) as sor: return user.id
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
async def deerer_auth(request): async def deerer_auth(sor, request):
auth = request.headers.get('Authorization') auth = request.headers.get('Authentication')
if auth is None: if auth is None:
return None return None
if not auth.startswith('Deerer '): if not auth.startswith('Deerer '):
@ -77,17 +73,12 @@ async def deerer_auth(request):
client_ip = request['client_ip'] client_ip = request['client_ip']
deer_data = auth[7:] deer_data = auth[7:]
appid, cyber = bear_data.split('-:-') appid, cyber = bear_data.split('-:-')
db = DBPools() secretkey = await get_secretkey(sor, appid)
dbname = get_dbname() txt = aes_decrypt_ecb(secretkey, cyber)
async with db.sqlorContext(dbname) as sor: t, apikey = txt.split(':')
secretkey = await get_secretkey(sor, appid) user = await get_apikey_user(sor, apikey, client_ip)
txt = aes_decrypt_ecb(secretkey, cyber) await user_login(user.id, username=user.username, userorgid=user.orgid)
t, apikey = txt.split(':') return user.id
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
def return_error(code): def return_error(code):
return { return {

4
dapi/init.py
View File

@ -5,6 +5,6 @@ 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
register_auth_method('Bearer', bearer_auth) register_auth_method('Bearer ', bearer_auth)
register_auth_method('Deerer', deerer_auth) register_auth_method('Deerer ', deerer_auth)