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

multi: deprecate UIPassword session type

Browse source
This commit is contained in:
Elle Mouton 2022-05-16 14:37:33 +02:00
parent 7a4d84a21b
commit 6ebab93063
No known key found for this signature in database
GPG key ID: D7D916376026F177
3 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

15
itest/litd_mode_integrated_test.go
View file

@ -335,9 +335,8 @@ func testModeIntegrated(net *NetworkHarness, t *harnessTest) {
endpoint := endpoint
tt.Run(endpoint.name+" lit port", func(ttt *testing.T) {
runLNCAuthTest(
ttt, cfg.LitAddr(), cfg.UIPassword,
cfg.TLSCertPath,
endpoint.requestFn,
ttt, cfg.LitAddr(), cfg.TLSCertPath,
cfg.LitMacPath, endpoint.requestFn,
endpoint.successPattern,
endpoint.allowedThroughLNC,
)
@ -583,7 +582,7 @@ func runRESTAuthTest(t *testing.T, hostPort, uiPassword, macaroonPath, restURI,
// runLNCAuthTest tests authentication of the given interface when connecting
// through Lightning Node Connect.
func runLNCAuthTest(t *testing.T, hostPort, uiPassword, tlsCertPath string,
func runLNCAuthTest(t *testing.T, hostPort, tlsCertPath, macPath string,
makeRequest requestFn, successContent string, callAllowed bool) {
ctxb := context.Background()
@ -593,9 +592,12 @@ func runLNCAuthTest(t *testing.T, hostPort, uiPassword, tlsCertPath string,
rawConn, err := connectRPC(ctxt, hostPort, tlsCertPath)
require.NoError(t, err)
macBytes, err := ioutil.ReadFile(macPath)
require.NoError(t, err)
ctxm := macaroonContext(ctxt, macBytes)
// We first need to create an LNC session that we can use to connect.
// We use the UI password to create the session.
ctxm := uiPasswordContext(ctxt, uiPassword, true)
litClient := litrpc.NewSessionsClient(rawConn)
sessResp, err := litClient.AddSession(ctxm, &litrpc.AddSessionRequest{
Label: "integration-test",
@ -618,7 +620,7 @@ func runLNCAuthTest(t *testing.T, hostPort, uiPassword, tlsCertPath string,
// endpoint, unless it is explicitly disallowed (we currently don't want
// to support creating more sessions through LNC until we have all
// macaroon permissions properly set up).
resp, err := makeRequest(ctxm, rawLNCConn)
resp, err := makeRequest(ctxt, rawLNCConn)
// Is this a disallowed call?
if !callAllowed {
@ -744,6 +746,7 @@ func connectMailbox(ctx context.Context,
grpc.WithContextDialer(transportConn.Dial),
grpc.WithTransportCredentials(noiseConn),
grpc.WithPerRPCCredentials(noiseConn),
grpc.WithBlock(),
}
return grpc.DialContext(ctx, mailboxServerAddr, dialOpts...)

5
itest/litd_mode_remote_test.go
View file

@ -137,9 +137,8 @@ func testModeRemote(net *NetworkHarness, t *harnessTest) {
endpoint := endpoint
tt.Run(endpoint.name+" lit port", func(ttt *testing.T) {
runLNCAuthTest(
ttt, cfg.LitAddr(), cfg.UIPassword,
cfg.LitTLSCertPath,
endpoint.requestFn,
ttt, cfg.LitAddr(), cfg.LitTLSCertPath,
cfg.LitMacPath, endpoint.requestFn,
endpoint.successPattern,
endpoint.allowedThroughLNC,
)

45
session_rpcserver.go
View file

@ -119,12 +119,11 @@ func (s *sessionRpcServer) AddSession(_ context.Context,
return nil, err
}
if typ != session.TypeUIPassword && typ != session.TypeMacaroonAdmin &&
if typ != session.TypeMacaroonAdmin &&
typ != session.TypeMacaroonReadonly {
return nil, fmt.Errorf("invalid session type, only UI " +
"password, admin and readonly macaroon types " +
"supported in LiT")
return nil, fmt.Errorf("invalid session type, only admin " +
"and readonly macaroon types supported in LiT")
}
sess, err := session.NewSession(
@ -181,33 +180,29 @@ func (s *sessionRpcServer) resumeSession(sess *session.Session) error {
return nil
}
var authData []byte
switch sess.Type {
case session.TypeUIPassword:
authData = []byte("Authorization: Basic " + s.cfg.basicAuth)
if sess.Type != session.TypeMacaroonAdmin &&
sess.Type != session.TypeMacaroonReadonly {
case session.TypeMacaroonAdmin, session.TypeMacaroonReadonly:
ctx := context.Background()
readOnly := sess.Type == session.TypeMacaroonReadonly
mac, err := s.cfg.superMacBaker(
ctx, sess.MacaroonRootKey, &session.MacaroonRecipe{
Permissions: GetAllPermissions(readOnly),
},
)
if err != nil {
log.Debugf("Not resuming session %x. Could not bake"+
"the necessary macaroon: %w", pubKeyBytes, err)
return nil
}
authData = []byte(fmt.Sprintf("%s: %s", HeaderMacaroon, mac))
default:
log.Debugf("Not resuming session %x with type %d", pubKeyBytes,
sess.Type)
return nil
}
readOnly := sess.Type == session.TypeMacaroonReadonly
mac, err := s.cfg.superMacBaker(
context.Background(), sess.MacaroonRootKey,
&session.MacaroonRecipe{
Permissions: GetAllPermissions(readOnly),
},
)
if err != nil {
log.Debugf("Not resuming session %x. Could not bake "+
"the necessary macaroon: %w", pubKeyBytes, err)
return nil
}
authData := []byte(fmt.Sprintf("%s: %s", HeaderMacaroon, mac))
sessionClosedSub, err := s.sessionServer.StartSession(sess, authData)
if err != nil {
return err