litrpc+session: add CreatedAt member to Session

Author: ellemouton

litrpc/lit-sessions.pb.go

@@ -74,6 +74,8 @@ message Session {
     bytes local_public_key = 9;
 
     bytes remote_public_key = 10;
+
+    uint64 created_at = 11 [jstype = JS_STRING];
 }
 
 message ListSessionsRequest {

litrpc/lit-sessions.proto

@@ -43,6 +43,7 @@ type Session struct {
 	State           State
 	Type            Type
 	Expiry          time.Time
+	CreatedAt       time.Time
 	ServerAddr      string
 	DevServer       bool
 	MacaroonRootKey uint64
@@ -78,6 +79,7 @@ func NewSession(label string, typ Type, expiry time.Time, serverAddr string,
 		State:           StateCreated,
 		Type:            typ,
 		Expiry:          expiry,
+		CreatedAt:       time.Now(),
 		ServerAddr:      serverAddr,
 		DevServer:       devServer,
 		MacaroonRootKey: macRootKey,

session/interface.go

@@ -24,6 +24,7 @@ const (
 	typeLocalPrivateKey tlv.Type = 10
 	typeRemotePublicKey tlv.Type = 11
 	typeMacaroonRecipe  tlv.Type = 12
+	typeCreatedAt       tlv.Type = 13
 
 	// typeMacaroon is no longer used, but we leave it defined for backwards
 	// compatibility.
@@ -56,6 +57,7 @@ func SerializeSession(w io.Writer, session *Session) error {
 		devServer     = uint8(0)
 		pairingSecret = session.PairingSecret[:]
 		privateKey    = session.LocalPrivateKey.Serialize()
+		createdAt     = uint64(session.CreatedAt.Unix())
 	)
 
 	if session.DevServer {
@@ -99,6 +101,10 @@ func SerializeSession(w io.Writer, session *Session) error {
 		))
 	}
 
+	tlvRecords = append(
+		tlvRecords, tlv.MakePrimitiveRecord(typeCreatedAt, &createdAt),
+	)
+
 	tlvStream, err := tlv.NewStream(tlvRecords...)
 	if err != nil {
 		return err
@@ -115,7 +121,7 @@ func DeserializeSession(r io.Reader) (*Session, error) {
 		label, serverAddr         []byte
 		pairingSecret, privateKey []byte
 		state, typ, devServer     uint8
-		expiry                    uint64
+		expiry, createdAt         uint64
 		macRecipe                 MacaroonRecipe
 	)
 	tlvStream, err := tlv.NewStream(
@@ -137,6 +143,7 @@ func DeserializeSession(r io.Reader) (*Session, error) {
 			typeMacaroonRecipe, &macRecipe, nil,
 			macaroonRecipeEncoder, macaroonRecipeDecoder,
 		),
+		tlv.MakePrimitiveRecord(typeCreatedAt, &createdAt),
 	)
 	if err != nil {
 		return nil, err
@@ -151,6 +158,7 @@ func DeserializeSession(r io.Reader) (*Session, error) {
 	session.State = State(state)
 	session.Type = Type(typ)
 	session.Expiry = time.Unix(int64(expiry), 0)
+	session.CreatedAt = time.Unix(int64(createdAt), 0)
 	session.ServerAddr = string(serverAddr)
 	session.DevServer = devServer == 1
 

session/tlv.go

@@ -99,6 +99,9 @@ func TestSerializeDeserializeSession(t *testing.T) {
 			)
 			session.Expiry = time.Time{}
 			deserializedSession.Expiry = time.Time{}
+			session.CreatedAt = time.Time{}
+			deserializedSession.CreatedAt = time.Time{}
+
 			require.Equal(t, session, deserializedSession)
 		})
 	}

session/tlv_test.go

@@ -333,6 +333,7 @@ func marshalRPCSession(sess *session.Session) (*litrpc.Session, error) {
 		PairingSecretMnemonic:  strings.Join(mnemonic[:], " "),
 		LocalPublicKey:         sess.LocalPublicKey.SerializeCompressed(),
 		RemotePublicKey:        remotePubKey,
+		CreatedAt:              uint64(sess.CreatedAt.Unix()),
 	}, nil
 }