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-08-27 18:36:23 +08:00
parent 07c76e402c
commit cdff11dd2b
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dapi/dapi.py
View File

@ -43,18 +43,24 @@ where a.userid = b.id
if len(recs) < 1: if len(recs) < 1:
debug(f'{apikey=} not registered') debug(f'{apikey=} not registered')
return None return None
ips = rec[i].allowedips.split(',') rec = recs[0]
if rec.allowips is None:
return rec
ips = rec.allowedips.split(',')
ips = [ ip.strip() for ip in ips ] ips = [ ip.strip() for ip in ips ]
if client_ip not in ips: if client_ip not in ips:
debug(f' {client_ip} not in {ips=}') debug(f' {client_ip} not in {rec.allowips=}')
return None return None
return recs[0] return rec
async def bearer_auth(sor, request): async def bearer_auth(sor, request):
auth = request.headers.get('Authentication') auth = request.headers.get('Authentication')
if auth is None: if auth is None:
debug(f'headers has not "Authentication"')
return None return None
if not auth.startswith('Bearer '): if not auth.startswith('Bearer '):
debug(f'"Authentication" not starts with "Bearer "')
return None return None
apikey = auth[7:] apikey = auth[7:]
client_ip = request['client_ip'] client_ip = request['client_ip']
@ -62,6 +68,7 @@ async def bearer_auth(sor, request):
async def apikey_user(sor, apikey, client_ip): async def apikey_user(sor, apikey, client_ip):
if apikey is None: if apikey is None:
debug(f'keykey is None')
return None return None
user = await get_apikey_user(sor, apikey, client_ip) user = await get_apikey_user(sor, apikey, client_ip)
await user_login(user.id, username=user.username, userorgid=user.orgid) await user_login(user.id, username=user.username, userorgid=user.orgid)