subservers: start using the subservers manager

Author: positiveblue

subservers/manager.go

@@ -27,13 +27,16 @@ var (
 
 // Manager manages a set of subServer objects.
 type Manager struct {
-	servers []*subServerWrapper
-	mu      sync.RWMutex
+	servers  []*subServerWrapper
+	permsMgr *PermissionsMgr
+	mu       sync.RWMutex
 }
 
 // NewManager constructs a new subServerMgr.
-func NewManager() *Manager {
-	return &Manager{}
+func NewManager(permsMgr *PermissionsMgr) *Manager {
+	return &Manager{
+		permsMgr: permsMgr,
+	}
 }
 
 // AddServer adds a new subServer to the manager's set.
@@ -121,7 +124,9 @@ func (s *Manager) GetRemoteConn(uri string) (bool, *grpc.ClientConn) {
 	defer s.mu.RUnlock()
 
 	for _, ss := range s.servers {
-		// TODO(positiveblue): check subserver permissions.
+		if !s.permsMgr.IsSubServerURI(ss.subServer.Name(), uri) {
+			continue
+		}
 
 		if !ss.subServer.Remote() {
 			return false, nil
@@ -145,7 +150,9 @@ func (s *Manager) ValidateMacaroon(ctx context.Context,
 	defer s.mu.RUnlock()
 
 	for _, ss := range s.servers {
-		// TODO(positiveblue): check subserver permissions.
+		if !s.permsMgr.IsSubServerURI(ss.subServer.Name(), uri) {
+			continue
+		}
 
 		if ss.subServer.Remote() {
 			return true, nil
@@ -173,7 +180,13 @@ func (s *Manager) HandledBy(uri string) (bool, SubServerName) {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 
-	// TODO(positiveblue): check subserver permissions.
+	for _, ss := range s.servers {
+		if !s.permsMgr.IsSubServerURI(ss.subServer.Name(), uri) {
+			continue
+		}
+
+		return true, ss.subServer.Name()
+	}
 
 	return false, ""
 }
@@ -185,7 +198,9 @@ func (s *Manager) MacaroonPath(uri string) (bool, string) {
 	defer s.mu.RUnlock()
 
 	for _, ss := range s.servers {
-		// TODO(positiveblue): check subserver permissions.
+		if !s.permsMgr.IsSubServerURI(ss.subServer.Name(), uri) {
+			continue
+		}
 
 		if ss.subServer.Remote() {
 			return true, ss.subServer.RemoteConfig().MacaroonPath
@@ -205,7 +220,9 @@ func (s *Manager) ReadRemoteMacaroon(uri string) (macaroonPath string) {
 	defer s.mu.RUnlock()
 
 	for _, ss := range s.servers {
-		// TODO(positiveblue): check subserver permissions.
+		if !s.permsMgr.IsSubServerURI(ss.subServer.Name(), uri) {
+			continue
+		}
 
 		if !ss.subServer.Remote() {
 			return ""