highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-10-01 06:56:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

lnurl-auth: hashing_key -> linking_key.

Browse Source
This commit is contained in:
fiatjaf
2020-11-11 22:37:55 -03:00
parent 805000cd06
commit b794f8302d
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lnbits/core/models.py
View File

@@ -1,4 +1,5 @@
import json import json
import hmac
import hashlib import hashlib
from ecdsa import SECP256k1, SigningKey # type: ignore from ecdsa import SECP256k1, SigningKey # type: ignore
from typing import List, NamedTuple, Optional, Dict from typing import List, NamedTuple, Optional, Dict
@@ -35,10 +36,12 @@ class Wallet(NamedTuple):
def balance(self) -> int: def balance(self) -> int:
return self.balance_msat // 1000 return self.balance_msat // 1000
@property def lnurlauth_key(self, domain: str) -> SigningKey:
def lnurlauth_key(self) -> SigningKey: hashing_key = hashlib.sha256(self.id.encode("utf-8")).digest()
linking_key = hmac.digest(hashing_key, domain.encode("utf-8"), "sha256")
return SigningKey.from_string( return SigningKey.from_string(
hashlib.sha256(self.id.encode("utf-8")).digest(), linking_key,
curve=SECP256k1, curve=SECP256k1,
hashfunc=hashlib.sha256, hashfunc=hashlib.sha256,
) )

6
lnbits/core/services.py
View File

@@ -160,8 +160,10 @@ async def redeem_lnurl_withdraw(wallet_id: str, res: LnurlWithdrawResponse, memo
async def perform_lnurlauth(callback: str) -> Optional[LnurlErrorResponse]: async def perform_lnurlauth(callback: str) -> Optional[LnurlErrorResponse]:
k1 = unhexlify(parse_qs(urlparse(callback).query)["k1"][0]) cb = urlparse(callback)
key = g.wallet.lnurlauth_key
k1 = unhexlify(parse_qs(cb.query)["k1"][0])
key = g.wallet.lnurlauth_key(cb.netloc)
def int_to_bytes_suitable_der(x: int) -> bytes: def int_to_bytes_suitable_der(x: int) -> bytes:
"""for strict DER we need to encode the integer with some quirks""" """for strict DER we need to encode the integer with some quirks"""

4
lnbits/core/views/api.py
View File

@@ -310,7 +310,9 @@ async def api_lnurlscan(code: str):
if url.is_login: if url.is_login:
params.update(kind="auth") params.update(kind="auth")
params.update(callback=url.url) # with k1 already in it params.update(callback=url.url) # with k1 already in it
params.update(pubkey=g.wallet.lnurlauth_key.verifying_key.to_string("compressed").hex())
lnurlauth_key = g.wallet.lnurlauth_key(domain)
params.update(pubkey=lnurlauth_key.verifying_key.to_string("compressed").hex())
else: else:
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
r = await client.get(url.url, timeout=40) r = await client.get(url.url, timeout=40)