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

auth bearer fix

Browse Source 
x-api-key now says unauthorized
This commit is contained in:
Tiago vasconcelos 2021-10-15 16:21:05 +01:00
parent 9096ed38b9
commit 43653cb84d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lnbits/decorators.py
View File

@ -1,5 +1,6 @@
from functools import wraps from functools import wraps
from http import HTTPStatus from http import HTTPStatus
from base64 import b64decode
from fastapi.security import api_key from fastapi.security import api_key
from pydantic.types import UUID4 from pydantic.types import UUID4
@ -12,6 +13,7 @@ from fastapi.exceptions import HTTPException
from fastapi.openapi.models import APIKey, APIKeyIn from fastapi.openapi.models import APIKey, APIKeyIn
from fastapi.params import Security from fastapi.params import Security
from fastapi.security.api_key import APIKeyHeader, APIKeyQuery from fastapi.security.api_key import APIKeyHeader, APIKeyQuery
from fastapi.security import OAuth2PasswordBearer
from fastapi.security.base import SecurityBase from fastapi.security.base import SecurityBase
from starlette.requests import Request from starlette.requests import Request
@ -85,14 +87,19 @@ class WalletTypeInfo():
api_key_header = APIKeyHeader(name="X-API-KEY", auto_error=False, description="Admin or Invoice key for wallet API's") api_key_header = APIKeyHeader(name="X-API-KEY", auto_error=False, description="Admin or Invoice key for wallet API's")
api_key_query = APIKeyQuery(name="api-key", auto_error=False, description="Admin or Invoice key for wallet API's") api_key_query = APIKeyQuery(name="api-key", auto_error=False, description="Admin or Invoice key for wallet API's")
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
async def get_key_type(r: Request, async def get_key_type(r: Request,
token: str = Security(oauth2_scheme),
api_key_header: str = Security(api_key_header), api_key_header: str = Security(api_key_header),
api_key_query: str = Security(api_key_query)) -> WalletTypeInfo: api_key_query: str = Security(api_key_query)) -> WalletTypeInfo:
# 0: admin # 0: admin
# 1: invoice # 1: invoice
# 2: invalid # 2: invalid
# print("TOKEN", b64decode(token).decode("utf-8").split(":"))
key_type, key = b64decode(token).decode("utf-8").split(":")
try: try:
checker = WalletAdminKeyChecker(api_key=api_key_query) checker = WalletAdminKeyChecker(api_key=key if token else api_key_query)
await checker.__call__(r) await checker.__call__(r)
return WalletTypeInfo(0, checker.wallet) return WalletTypeInfo(0, checker.wallet)
except HTTPException as e: except HTTPException as e:
@ -104,7 +111,7 @@ async def get_key_type(r: Request,
raise raise
try: try:
checker = WalletInvoiceKeyChecker() checker = WalletInvoiceKeyChecker(api_key=key if token else None)
await checker.__call__(r) await checker.__call__(r)
return WalletTypeInfo(1, checker.wallet) return WalletTypeInfo(1, checker.wallet)
except HTTPException as e: except HTTPException as e: