From 7a0a18d469005576c52b0744d0902e344cd85d03 Mon Sep 17 00:00:00 2001
From: Elle Mouton <elle.mouton@gmail.com>
Date: Mon, 17 Jan 2022 17:25:08 +0200
Subject: [PATCH] session_rpcserver: revoke & stop expired sessions

In this commit, we ensure that an expired session is revoked and stopped.
---
 session_rpcserver.go | 49 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/session_rpcserver.go b/session_rpcserver.go
index c9331f00e..d2e459f02 100644
--- a/session_rpcserver.go
+++ b/session_rpcserver.go
@@ -22,8 +22,8 @@ type sessionRpcServer struct {
 	db            *session.DB
 	sessionServer *session.Server
 
-	quit chan struct{}
-
+	quit     chan struct{}
+	wg       sync.WaitGroup
 	stopOnce sync.Once
 }
 
@@ -31,6 +31,7 @@ type sessionRpcServer struct {
 func (s *sessionRpcServer) stop() {
 	s.stopOnce.Do(func() {
 		close(s.quit)
+		s.wg.Wait()
 	})
 }
 
@@ -84,6 +85,9 @@ func (s *sessionRpcServer) AddSession(_ context.Context,
 // resumeSession tries to start an existing session if it is not expired, not
 // revoked and a LiT session.
 func (s *sessionRpcServer) resumeSession(sess *session.Session) error {
+	pubKey := sess.LocalPublicKey
+	pubKeyBytes := pubKey.SerializeCompressed()
+
 	// We only start non-revoked, non-expired LiT sessions. Everything else
 	// we just skip.
 	if sess.State != session.StateInUse &&
@@ -100,12 +104,49 @@ func (s *sessionRpcServer) resumeSession(sess *session.Session) error {
 	}
 	if sess.Expiry.Before(time.Now()) {
 		log.Debugf("Not resuming session %x with expiry %s",
-			sess.LocalPublicKey.SerializeCompressed(), sess.Expiry)
+			pubKeyBytes, sess.Expiry)
+
+		if err := s.db.RevokeSession(pubKey); err != nil {
+			return fmt.Errorf("error revoking session: %v", err)
+		}
+
 		return nil
 	}
 
 	authData := []byte("Authorization: Basic " + s.basicAuth)
-	_, err := s.sessionServer.StartSession(sess, authData)
+	sessionClosedSub, err := s.sessionServer.StartSession(sess, authData)
+	if err != nil {
+		return err
+	}
+
+	s.wg.Add(1)
+	go func() {
+		defer s.wg.Done()
+
+		ticker := time.NewTimer(time.Until(sess.Expiry))
+		defer ticker.Stop()
+
+		select {
+		case <-s.quit:
+		case <-sessionClosedSub:
+		case <-ticker.C:
+			log.Debugf("Stopping expired session %x with "+
+				"type %d", pubKeyBytes, sess.Type)
+
+			err = s.sessionServer.StopSession(pubKey)
+			if err != nil {
+				log.Debugf("Error stopping session: "+
+					"%v", err)
+			}
+
+			err = s.db.RevokeSession(pubKey)
+			if err != nil {
+				log.Debugf("error revoking session: "+
+					"%v", err)
+			}
+		}
+	}()
+
 	return err
 }