8460: Inject permChecker from main.

[arvados.git] / services / ws / router.go

diff --git a/services/ws/router.go b/services/ws/router.go
index 6aef64761b87e09c93198fc99476cf45f42f1efc..1558a1d00ebc5d40af105d093fa077c54d307aa7 100644 (file)
--- a/services/ws/router.go
+++ b/services/ws/router.go
@@ -8,7 +8,6 @@ import (
        "sync"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/arvados"
        "github.com/Sirupsen/logrus"
        "golang.org/x/net/websocket"
 )
@@ -21,17 +20,18 @@ type wsConn interface {
 }
 
 type router struct {
-       Config *Config
+       Config         *Config
+       eventSource    eventSource
+       newPermChecker func() permChecker
 
-       eventSource eventSource
-       mux         *http.ServeMux
-       setupOnce   sync.Once
+       mux       *http.ServeMux
+       setupOnce sync.Once
 
        lastReqID  int64
        lastReqMtx sync.Mutex
 }
 
-type sessionFactory func(wsConn, chan<- interface{}, arvados.Client, *sql.DB) (session, error)
+type sessionFactory func(wsConn, chan<- interface{}, *sql.DB, permChecker) (session, error)
 
 func (rtr *router) setup() {
        rtr.mux = http.NewServeMux()
@@ -44,7 +44,7 @@ func (rtr *router) makeServer(newSession sessionFactory) *websocket.Server {
                PingTimeout: rtr.Config.PingTimeout.Duration(),
                QueueSize:   rtr.Config.ClientEventQueue,
                NewSession: func(ws wsConn, sendq chan<- interface{}) (session, error) {
-                       return newSession(ws, sendq, rtr.Config.Client, rtr.eventSource.DB())
+                       return newSession(ws, sendq, rtr.eventSource.DB(), rtr.newPermChecker())
                },
        }
        return &websocket.Server{