heierbtc/lnbits
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1232 from lnbits/fix/allowed_user

Browse Source 
BUG: fix auth issue for superusers  when allowed users are set
This commit is contained in:
calle 2022-12-24 11:22:49 +01:00 committed by GitHub
commit 7b7d06cee3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lnbits/core/views/generic.py
View File

@ -38,7 +38,7 @@ async def favicon():
@core_html_routes.get("/", response_class=HTMLResponse) @core_html_routes.get("/", response_class=HTMLResponse)
async def home(request: Request, lightning: str = None): async def home(request: Request, lightning: str = ""):
return template_renderer().TemplateResponse( return template_renderer().TemplateResponse(
"core/index.html", {"request": request, "lnurl": lightning} "core/index.html", {"request": request, "lnurl": lightning}
) )
@ -124,12 +124,15 @@ async def wallet(
if ( if (
len(settings.lnbits_allowed_users) > 0 len(settings.lnbits_allowed_users) > 0
and user_id not in settings.lnbits_allowed_users and user_id not in settings.lnbits_allowed_users
and user_id not in settings.lnbits_admin_users
and user_id != settings.super_user
): ):
return template_renderer().TemplateResponse( return template_renderer().TemplateResponse(
"error.html", {"request": request, "err": "User not authorized."} "error.html", {"request": request, "err": "User not authorized."}
) )
if user_id == settings.super_user or user_id in settings.lnbits_admin_users: if user_id == settings.super_user or user_id in settings.lnbits_admin_users:
user.admin = True user.admin = True
if not wallet_id: if not wallet_id:
if user.wallets and not wallet_name: # type: ignore if user.wallets and not wallet_name: # type: ignore
wallet = user.wallets[0] # type: ignore wallet = user.wallets[0] # type: ignore

2
lnbits/decorators.py
View File

@ -236,8 +236,8 @@ async def check_user_exists(usr: UUID4) -> User:
if ( if (
len(settings.lnbits_allowed_users) > 0 len(settings.lnbits_allowed_users) > 0
and g().user.id not in settings.lnbits_allowed_users and g().user.id not in settings.lnbits_allowed_users
and g().user.id != settings.super_user
and g().user.id not in settings.lnbits_admin_users and g().user.id not in settings.lnbits_admin_users
and g().user.id != settings.super_user
): ):
raise HTTPException( raise HTTPException(
status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized." status_code=HTTPStatus.UNAUTHORIZED, detail="User not authorized."