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

session_rpcserver: marshal new Session fields

Browse source 
Marshal the new Session fields into the proto Session struct.
This commit is contained in:
Elle Mouton 2023-06-18 13:26:39 +02:00
parent e92350254f
commit 477a5115dd
No known key found for this signature in database
GPG key ID: D7D916376026F177
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
session_rpcserver.go
View file

@ -1228,7 +1228,10 @@ func (s *sessionRpcServer) marshalRPCSession(sess *session.Session) (
revokedAt = uint64(sess.RevokedAt.Unix())
}
featureInfo := make(map[string]*litrpc.RulesMap)
var (
featureInfo = make(map[string]*litrpc.RulesMap)
initRuleValues = s.cfg.ruleMgrs.InitRuleValues
)
if sess.MacaroonRecipe != nil {
for _, cav := range sess.MacaroonRecipe.Caveats {
info, err := firewall.ParseRuleCaveat(string(cav.Id))
@ -1241,13 +1244,17 @@ func (s *sessionRpcServer) marshalRPCSession(sess *session.Session) (
for feature, rules := range info.FeatureRules {
ruleMap := make(map[string]*litrpc.RuleValue)
for name, rule := range rules {
val, err := s.cfg.ruleMgrs.InitRuleValues(name, []byte(rule))
val, err := initRuleValues(
name, []byte(rule),
)
if err != nil {
return nil, err
}
if sess.WithPrivacyMapper {
db := s.cfg.privMap(sess.ID)
db := s.cfg.privMap(
sess.GroupID,
)
val, err = val.PseudoToReal(db)
if err != nil {
return nil, err
@ -1257,7 +1264,9 @@ func (s *sessionRpcServer) marshalRPCSession(sess *session.Session) (
ruleMap[name] = val.ToProto()
}
featureInfo[feature] = &litrpc.RulesMap{Rules: ruleMap}
featureInfo[feature] = &litrpc.RulesMap{
Rules: ruleMap,
}
}
}
}
@ -1278,6 +1287,7 @@ func (s *sessionRpcServer) marshalRPCSession(sess *session.Session) (
RevokedAt: revokedAt,
MacaroonRecipe: macRecipe,
AutopilotFeatureInfo: featureInfo,
GroupId: sess.GroupID[:],
}, nil
}