Archives/loop
2
0
Fork 0
mirror of https://github.com/lightninglabs/loop synced 2024-11-08 01:10:29 +00:00
Code Issues Releases Wiki Activity

loopd: verify that dest addr is for correct chain

Browse Source 
This commit adds verification to the loop out request to ensure that the
formatting of the specified destination address matches the network that
lnd is running on.
This commit is contained in:
Elle Mouton 2021-03-08 10:52:57 +02:00
parent 5c34dd1177
commit 5399e60554
2 changed files with 66 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
loopd/swapclient_server.go
View File

@ -8,6 +8,7 @@ import (
"sync"
"time"
"github.com/btcsuite/btcd/chaincfg"
"github.com/btcsuite/btcutil"
"github.com/lightninglabs/lndclient"
"github.com/lightninglabs/loop"
@ -35,6 +36,11 @@ const (
)
var (
// errIncorrectChain is returned when the format of the
// destination address provided does not match the active chain.
errIncorrectChain = errors.New("invalid address format for the " +
"active chain")
// errConfTargetTooLow is returned when the chosen confirmation target
// is below the allowed minimum.
errConfTargetTooLow = errors.New("confirmation target too low")
@ -82,8 +88,9 @@ func (s *swapClientServer) LoopOut(ctx context.Context,
}
}
sweepConfTarget, err := validateLoopOutRequest(in.SweepConfTarget,
in.Label)
sweepConfTarget, err := validateLoopOutRequest(
s.lnd.ChainParams, in.SweepConfTarget, sweepAddr, in.Label,
)
if err != nil {
return nil, err
}
@ -922,9 +929,17 @@ func validateLoopInRequest(htlcConfTarget int32, external bool) (int32, error) {
return validateConfTarget(htlcConfTarget, loop.DefaultHtlcConfTarget)
}
// validateLoopOutRequest validates the confirmation target and label of the
// loop out request.
func validateLoopOutRequest(confTarget int32, label string) (int32, error) {
// validateLoopOutRequest validates the confirmation target, destination
// address and label of the loop out request.
func validateLoopOutRequest(chainParams *chaincfg.Params, confTarget int32,
sweepAddr btcutil.Address, label string) (int32, error) {
// Check that the provided destination address has the correct format
// for the active network.
if !sweepAddr.IsForNet(chainParams) {
return 0, fmt.Errorf("%w: Current active network is %s",
errIncorrectChain, chainParams.Name)
}
// Check that the label is valid.
if err := labels.Validate(label); err != nil {
return 0, err

47
loopd/swapclient_server_test.go
View File

@ -163,13 +163,53 @@ func TestValidateLoopInRequest(t *testing.T) {
func TestValidateLoopOutRequest(t *testing.T) {
tests := []struct {
name string
chain chaincfg.Params
confTarget int32
destAddr btcutil.Address
label string
err error
expectedTarget int32
}{
{
name: "mainnet address with mainnet backend",
chain: chaincfg.MainNetParams,
destAddr: mainnetAddr,
label: "label ok",
confTarget: 2,
err: nil,
expectedTarget: 2,
},
{
name: "mainnet address with testnet backend",
chain: chaincfg.TestNet3Params,
destAddr: mainnetAddr,
label: "label ok",
confTarget: 2,
err: errIncorrectChain,
expectedTarget: 0,
},
{
name: "testnet address with testnet backend",
chain: chaincfg.TestNet3Params,
destAddr: testnetAddr,
label: "label ok",
confTarget: 2,
err: nil,
expectedTarget: 2,
},
{
name: "testnet address with mainnet backend",
chain: chaincfg.MainNetParams,
destAddr: testnetAddr,
label: "label ok",
confTarget: 2,
err: errIncorrectChain,
expectedTarget: 0,
},
{
name: "invalid label",
chain: chaincfg.MainNetParams,
destAddr: mainnetAddr,
label: labels.Reserved,
confTarget: 2,
err: labels.ErrReservedPrefix,
@ -177,6 +217,8 @@ func TestValidateLoopOutRequest(t *testing.T) {
},
{
name: "invalid conf target",
chain: chaincfg.MainNetParams,
destAddr: mainnetAddr,
label: "label ok",
confTarget: 1,
err: errConfTargetTooLow,
@ -184,6 +226,8 @@ func TestValidateLoopOutRequest(t *testing.T) {
},
{
name: "default conf target",
chain: chaincfg.MainNetParams,
destAddr: mainnetAddr,
label: "label ok",
confTarget: 0,
err: nil,
@ -198,7 +242,8 @@ func TestValidateLoopOutRequest(t *testing.T) {
t.Parallel()
conf, err := validateLoopOutRequest(
test.confTarget, test.label,
&test.chain, test.confTarget, test.destAddr,
test.label,
)
require.True(t, errors.Is(err, test.err))
require.Equal(t, test.expectedTarget, conf)