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

match AddSession pattern in resumeSession

Browse source
This commit is contained in:
liongrass 2026-04-06 16:24:05 -07:00
parent 0367667369
commit a5eb4c77d9
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
session_rpcserver.go
View file

@ -481,8 +481,9 @@ func (s *sessionRpcServer) resumeSession(ctx context.Context,
readOnly = sess.Type == session.TypeMacaroonReadonly
)
switch sess.Type {
// For the default session types we use empty caveats and permissions,
// the macaroons are baked correctly when creating the session.
// For the default session types, permissions are baked correctly when
// creating the session. Any stored caveats (e.g. account binding) are
// applied below after the switch.
case session.TypeMacaroonAdmin, session.TypeMacaroonReadonly:
permissions = s.cfg.permMgr.ActivePermissions(readOnly)
@ -494,19 +495,15 @@ func (s *sessionRpcServer) resumeSession(ctx context.Context,
"recipe to be set")
}
caveats = sess.MacaroonRecipe.Caveats
permissions = accounts.MacaroonPermissions
// For custom session types, we use the caveats and permissions that
// were persisted on session creation.
case session.TypeMacaroonCustom, session.TypeAutopilot:
if sess.MacaroonRecipe == nil {
break
if sess.MacaroonRecipe != nil {
permissions = sess.MacaroonRecipe.Permissions
}
permissions = sess.MacaroonRecipe.Permissions
caveats = append(caveats, sess.MacaroonRecipe.Caveats...)
// No other types are currently supported.
default:
log.Debugf("Not resuming session %x with type %d", pubKeyBytes,
@ -514,6 +511,11 @@ func (s *sessionRpcServer) resumeSession(ctx context.Context,
return nil
}
// Apply any stored caveats (e.g. account binding) for all session types.
if sess.MacaroonRecipe != nil {
caveats = append(caveats, sess.MacaroonRecipe.Caveats...)
}
// Add the session expiry as a macaroon caveat.
macExpiry := checkers.TimeBeforeCaveat(sess.Expiry)
caveats = append(caveats, macaroon.Caveat{