X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/187382bb88eee65d887c004d73eddf46cbd86bc2..41a378b99c8c4411a66c19e878b7535c67de2ba3:/services/ws/session_v0.go

diff --git a/services/ws/session_v0.go b/services/ws/session_v0.go
index db60738bdb..309352b39e 100644
--- a/services/ws/session_v0.go
+++ b/services/ws/session_v0.go
@@ -2,18 +2,20 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package ws
 
 import (
 	"database/sql"
 	"encoding/json"
 	"errors"
+	"reflect"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"github.com/Sirupsen/logrus"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"github.com/sirupsen/logrus"
 )
 
 var (
@@ -43,7 +45,7 @@ type v0session struct {
 	permChecker   permChecker
 	subscriptions []v0subscribe
 	lastMsgID     uint64
-	log           *logrus.Entry
+	log           logrus.FieldLogger
 	mtx           sync.Mutex
 	setupOnce     sync.Once
 }
@@ -58,7 +60,7 @@ func newSessionV0(ws wsConn, sendq chan<- interface{}, db *sql.DB, pc permChecke
 		db:          db,
 		ac:          ac,
 		permChecker: pc,
-		log:         logger(ws.Request().Context()),
+		log:         ctxlog.FromContext(ws.Request().Context()),
 	}
 
 	err := ws.Request().ParseForm()
@@ -86,6 +88,24 @@ func (sess *v0session) Receive(buf []byte) error {
 		sess.mtx.Unlock()
 		sub.sendOldEvents(sess)
 		return nil
+	} else if sub.Method == "unsubscribe" {
+		sess.mtx.Lock()
+		found := false
+		for i, s := range sess.subscriptions {
+			if !reflect.DeepEqual(s.Filters, sub.Filters) {
+				continue
+			}
+			copy(sess.subscriptions[i:], sess.subscriptions[i+1:])
+			sess.subscriptions = sess.subscriptions[:len(sess.subscriptions)-1]
+			found = true
+			break
+		}
+		sess.mtx.Unlock()
+		sess.log.WithField("sub", sub).WithField("found", found).Debug("unsubscribe")
+		if found {
+			sess.sendq <- v0subscribeOK
+			return nil
+		}
 	} else {
 		sess.log.WithField("Method", sub.Method).Info("unknown method")
 	}
@@ -109,7 +129,7 @@ func (sess *v0session) EventMessage(e *event) ([]byte, error) {
 	} else {
 		permTarget = detail.ObjectUUID
 	}
-	ok, err := sess.permChecker.Check(permTarget)
+	ok, err := sess.permChecker.Check(sess.ws.Request().Context(), permTarget)
 	if err != nil || !ok {
 		return nil, err
 	}
@@ -162,7 +182,7 @@ func (sub *v0subscribe) sendOldEvents(sess *v0session) {
 	if sub.LastLogID == 0 {
 		return
 	}
-	sess.log.WithField("LastLogID", sub.LastLogID).Debug("getOldEvents")
+	sess.log.WithField("LastLogID", sub.LastLogID).Debug("sendOldEvents")
 	// Here we do a "select id" query and queue an event for every
 	// log since the given ID, then use (*event)Detail() to
 	// retrieve the whole row and decide whether to send it. This
@@ -177,17 +197,26 @@ func (sub *v0subscribe) sendOldEvents(sess *v0session) {
 		sub.LastLogID,
 		time.Now().UTC().Add(-10*time.Minute).Format(time.RFC3339Nano))
 	if err != nil {
-		sess.log.WithError(err).Error("db.Query failed")
+		sess.log.WithError(err).Error("sendOldEvents db.Query failed")
 		return
 	}
-	defer rows.Close()
+
+	var ids []uint64
 	for rows.Next() {
 		var id uint64
 		err := rows.Scan(&id)
 		if err != nil {
-			sess.log.WithError(err).Error("row Scan failed")
+			sess.log.WithError(err).Error("sendOldEvents row Scan failed")
 			continue
 		}
+		ids = append(ids, id)
+	}
+	if err := rows.Err(); err != nil {
+		sess.log.WithError(err).Error("sendOldEvents db.Query failed")
+	}
+	rows.Close()
+
+	for _, id := range ids {
 		for len(sess.sendq)*2 > cap(sess.sendq) {
 			// Ugly... but if we fill up the whole client
 			// queue with a backlog of old events, a
@@ -196,6 +225,10 @@ func (sub *v0subscribe) sendOldEvents(sess *v0session) {
 			// client will probably reconnect and do the
 			// same thing all over again.
 			time.Sleep(100 * time.Millisecond)
+			if sess.ws.Request().Context().Err() != nil {
+				// Session terminated while we were sleeping
+				return
+			}
 		}
 		now := time.Now()
 		e := &event{
@@ -212,9 +245,6 @@ func (sub *v0subscribe) sendOldEvents(sess *v0session) {
 			}
 		}
 	}
-	if err := rows.Err(); err != nil {
-		sess.log.WithError(err).Error("db.Query failed")
-	}
 }
 
 type v0subscribe struct {