List only valid OCM token (#3722)

* list only valid ocm token * add changelog
cs3org · Mar 10, 2023 · fea342d · fea342d
1 parent 8cbc3c7
commit fea342d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/changelog/unreleased/ocm-shares.md b/changelog/unreleased/ocm-shares.md
@@ -0,0 +1,3 @@
+Enhancement: List only valid OCM tokens
+
+https://github.com/cs3org/reva/pull/3722
diff --git a/pkg/ocm/invite/repository/json/json.go b/pkg/ocm/invite/repository/json/json.go
@@ -25,6 +25,7 @@ import (
 	"os"
 	"strings"
 	"sync"
+	"time"
 
 	userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1"
 	invitepb "github.com/cs3org/go-cs3apis/cs3/ocm/invite/v1beta1"
@@ -173,13 +174,17 @@ func (m *manager) ListTokens(ctx context.Context, initiator *userpb.UserId) ([]*
 
 	tokens := []*invitepb.InviteToken{}
 	for _, token := range m.model.Invites {
-		if utils.UserEqual(token.UserId, initiator) {
+		if utils.UserEqual(token.UserId, initiator) && !tokenIsExpired(token) {
 			tokens = append(tokens, token)
 		}
 	}
 	return tokens, nil
 }
 
+func tokenIsExpired(token *invitepb.InviteToken) bool {
+	return token.Expiration != nil && token.Expiration.Seconds > uint64(time.Now().Unix())
+}
+
 func (m *manager) AddRemoteUser(ctx context.Context, initiator *userpb.UserId, remoteUser *userpb.User) error {
 	m.Lock()
 	defer m.Unlock()

diff --git a/pkg/ocm/invite/repository/sql/sql.go b/pkg/ocm/invite/repository/sql/sql.go
@@ -139,7 +139,7 @@ func convertToInviteToken(tkn dbToken) *invitepb.InviteToken {
 }
 
 func (m *mgr) ListTokens(ctx context.Context, initiator *userpb.UserId) ([]*invitepb.InviteToken, error) {
-	query := "SELECT token, initiator, expiration, description FROM ocm_tokens WHERE initiator=?"
+	query := "SELECT token, initiator, expiration, description FROM ocm_tokens WHERE initiator=? AND expiration > NOW()"
 
 	tokens := []*invitepb.InviteToken{}
 	rows, err := m.db.QueryContext(ctx, query, conversions.FormatUserID(initiator))