aljaz/aperture
1
1
Fork 0
mirror of https://github.com/lightninglabs/aperture.git synced 2025-12-18 17:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

macaroons: remove temporary macaroon creation and verification logic

Browse Source
This commit is contained in:
Wilmer Paulino
2019-11-21 17:02:16 -08:00
parent 530894a5ed
commit 831a41b33e
4 changed files with 9 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
auth/authenticator.go
View File

@@ -4,11 +4,11 @@ import (
"context"
"encoding/base64"
"encoding/hex"
"errors"
"fmt"
"net/http"
"regexp"
"github.com/lightninglabs/kirin/macaroons"
"github.com/lightninglabs/kirin/mint"
"github.com/lightninglabs/loop/lsat"
"github.com/lightningnetwork/lnd/lntypes"
@@ -187,10 +187,10 @@ func FromHeader(header *http.Header) (*macaroon.Macaroon, lntypes.Preimage, erro
return nil, lntypes.Preimage{}, fmt.Errorf("unable to "+
"unmarshal macaroon: %v", err)
}
preimageHex, err := macaroons.ExtractCaveat(mac, macaroons.CondPreimage)
if err != nil {
return nil, lntypes.Preimage{}, fmt.Errorf("unable to extract "+
"preimage from macaroon: %v", err)
preimageHex, ok := lsat.HasCaveat(mac, lsat.PreimageKey)
if !ok {
return nil, lntypes.Preimage{}, errors.New("preimage caveat " +
"not found")
}
preimage, err := lntypes.MakePreimageFromStr(preimageHex)
if err != nil {