GlcoinCore/lightning-terminal
1
0
Fork 0
mirror of https://github.com/lightninglabs/lightning-terminal.git synced 2026-08-13 12:33:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

multi: persist remote static key for handshakev2

Browse source 
This commit re-enables the second handshake for LNC.
This commit is contained in:
Oliver Gugger 2022-04-29 14:15:35 +02:00
parent 621f295b5b
commit 472d8f4602
No known key found for this signature in database
GPG key ID: 8E4256593F177720
7 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -10,7 +10,7 @@ require (
github.com/improbable-eng/grpc-web v0.12.0
github.com/jessevdk/go-flags v1.4.0
github.com/lightninglabs/faraday v0.2.7-alpha
github.com/lightninglabs/lightning-node-connect v0.1.8-alpha
github.com/lightninglabs/lightning-node-connect v0.1.9-alpha
github.com/lightninglabs/lndclient v0.14.2-3
github.com/lightninglabs/loop v0.18.0-beta-lnd-14
github.com/lightninglabs/loop/swapserverrpc v1.0.1

4
go.sum
View file

@ -610,8 +610,8 @@ github.com/lightninglabs/faraday v0.2.7-alpha h1:lpSUk3RFfgr4/OCx1OdJ2AMHCAiTObK
github.com/lightninglabs/faraday v0.2.7-alpha/go.mod h1:77P9EctYhneIXLvm9a6ylV9LCht/rj7j8mLwXpBgxB8=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf h1:HZKvJUHlcXI/f/O0Avg7t8sqkPo78HFzjmeYFl6DPnc=
github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf/go.mod h1:vxmQPeIQxPf6Jf9rM8R+B4rKBqLA2AjttNxkFBL2Plk=
github.com/lightninglabs/lightning-node-connect v0.1.8-alpha h1:bJ66JvVQCqEao4nLrPSahYtGtljUQ8tU9xx2nL/QfZE=
github.com/lightninglabs/lightning-node-connect v0.1.8-alpha/go.mod h1:jxSnezQYIvhNXqjyyiMEmdpOURrdVaujPZV6zGCVi8o=
github.com/lightninglabs/lightning-node-connect v0.1.9-alpha h1:ri3tgMegrxffg7w+hrC2vzdler5xJp/G74gI/7uCVgU=
github.com/lightninglabs/lightning-node-connect v0.1.9-alpha/go.mod h1:jxSnezQYIvhNXqjyyiMEmdpOURrdVaujPZV6zGCVi8o=
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2XZwcfE4xoS5AILqP1mj7kqnhbBSxW9BDxY=
github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
github.com/lightninglabs/lndclient v0.11.0-4/go.mod h1:8/cTKNwgL87NX123gmlv3Xh6p1a7pvzu+40Un3PhHiI=

13
itest/litd_mode_integrated_test.go
View file

@ -3,7 +3,6 @@ package itest
import (
"bytes"
"context"
"crypto/sha512"
"crypto/tls"
"crypto/x509"
"encoding/base64"
@ -723,11 +722,9 @@ func getServerCertificates(hostPort string) ([]*x509.Certificate, error) {
func connectMailbox(ctx context.Context,
connectPhrase []string) (grpc.ClientConnInterface, error) {
var mnemonicWords [mailbox.NumPasswordWords]string
var mnemonicWords [mailbox.NumPassphraseWords]string
copy(mnemonicWords[:], connectPhrase)
password := mailbox.PasswordMnemonicToEntropy(mnemonicWords)
sid := sha512.Sum512(password[:])
passphrase := mailbox.PassphraseMnemonicToEntropy(mnemonicWords)
privKey, err := btcec.NewPrivateKey(btcec.S256())
if err != nil {
@ -735,12 +732,14 @@ func connectMailbox(ctx context.Context,
}
ecdh := &keychain.PrivKeyECDH{PrivKey: privKey}
transportConn, err := mailbox.NewClient(ctx, sid)
connData := mailbox.NewConnData(ecdh, nil, passphrase[:], nil, nil, nil)
transportConn, err := mailbox.NewClient(ctx, connData)
if err != nil {
return nil, err
}
noiseConn := mailbox.NewNoiseGrpcConn(ecdh, nil, password[:])
noiseConn := mailbox.NewNoiseGrpcConn(connData)
dialOpts := []grpc.DialOption{
grpc.WithContextDialer(transportConn.Dial),

4
session/interface.go
View file

@ -47,7 +47,7 @@ type Session struct {
DevServer bool
MacaroonRootKey uint64
MacaroonRecipe *MacaroonRecipe
PairingSecret [mailbox.NumPasswordBytes]byte
PairingSecret [mailbox.NumPassphraseEntropyBytes]byte
LocalPrivateKey *btcec.PrivateKey
LocalPublicKey *btcec.PublicKey
RemotePublicKey *btcec.PublicKey
@ -58,7 +58,7 @@ func NewSession(label string, typ Type, expiry time.Time, serverAddr string,
devServer bool, perms []bakery.Op, caveats []macaroon.Caveat) (*Session,
error) {
_, pairingSecret, err := mailbox.NewPassword()
_, pairingSecret, err := mailbox.NewPassphraseEntropy()
if err != nil {
return nil, fmt.Errorf("error deriving pairing secret: %v", err)
}

28
session/server.go
View file

@ -32,16 +32,27 @@ func newMailboxSession() *mailboxSession {
}
func (m *mailboxSession) start(session *Session,
serverCreator GRPCServerCreator, authData []byte) error {
serverCreator GRPCServerCreator, authData []byte,
onUpdate func(sess *Session) error) error {
tlsConfig := &tls.Config{}
if session.DevServer {
tlsConfig = &tls.Config{InsecureSkipVerify: true}
}
ecdh := &keychain.PrivKeyECDH{PrivKey: session.LocalPrivateKey}
keys := mailbox.NewConnData(
ecdh, session.RemotePublicKey, session.PairingSecret[:],
authData, func(key *btcec.PublicKey) error {
session.RemotePublicKey = key
return onUpdate(session)
}, nil,
)
// Start the mailbox gRPC server.
mailboxServer, err := mailbox.NewServer(
session.ServerAddr, session.PairingSecret[:],
session.ServerAddr, keys,
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 2 * time.Minute,
@ -51,10 +62,7 @@ func (m *mailboxSession) start(session *Session,
return err
}
ecdh := &keychain.PrivKeyECDH{PrivKey: session.LocalPrivateKey}
noiseConn := mailbox.NewNoiseGrpcConn(
ecdh, authData, session.PairingSecret[:],
)
noiseConn := mailbox.NewNoiseGrpcConn(keys)
m.server = serverCreator(grpc.Creds(noiseConn))
m.wg.Add(1)
@ -95,8 +103,8 @@ func NewServer(serverCreator GRPCServerCreator) *Server {
}
}
func (s *Server) StartSession(session *Session, authData []byte) (chan struct{},
error) {
func (s *Server) StartSession(session *Session, authData []byte,
onUpdate func(sess *Session) error) (chan struct{}, error) {
s.activeSessionsMtx.Lock()
defer s.activeSessionsMtx.Unlock()
@ -112,7 +120,9 @@ func (s *Server) StartSession(session *Session, authData []byte) (chan struct{},
sess := newMailboxSession()
s.activeSessions[id] = sess
return sess.quit, sess.start(session, s.serverCreator, authData)
return sess.quit, sess.start(
session, s.serverCreator, authData, onUpdate,
)
}
func (s *Server) StopSession(localPublicKey *btcec.PublicKey) error {

1
session/store.go
View file

@ -3,7 +3,6 @@ package session
import (
"bytes"
"errors"
"github.com/btcsuite/btcd/btcec"
"go.etcd.io/bbolt"
)

6
session_rpcserver.go
View file

@ -216,7 +216,9 @@ func (s *sessionRpcServer) resumeSession(sess *session.Session) error {
authData := []byte(fmt.Sprintf("%s: %s", HeaderMacaroon, mac))
sessionClosedSub, err := s.sessionServer.StartSession(sess, authData)
sessionClosedSub, err := s.sessionServer.StartSession(
sess, authData, s.db.StoreSession,
)
if err != nil {
return err
}
@ -315,7 +317,7 @@ func marshalRPCSession(sess *session.Session) (*litrpc.Session, error) {
remotePubKey = sess.RemotePublicKey.SerializeCompressed()
}
mnemonic, err := mailbox.PasswordEntropyToMnemonic(sess.PairingSecret)
mnemonic, err := mailbox.PassphraseEntropyToMnemonic(sess.PairingSecret)
if err != nil {
return nil, err
}