Updates based on comments

Signed-off-by: Derek Collison <[email protected]>

Author: derekcollison

server/accounts_test.go

@@ -582,7 +582,7 @@ func TestNoPrefixWildcardMapping(t *testing.T) {
 		t.Fatalf("Error registering client with 'bar' account: %v", err)
 	}
 
-	if err := cfoo.acc.addStreamExport(">", []*Account{barAcc}); err != nil { // Public with no accounts defined.
+	if err := cfoo.acc.addStreamExport(">", []*Account{barAcc}); err != nil {
 		t.Fatalf("Error adding stream export to client foo: %v", err)
 	}
 	if err := cbar.acc.addStreamImport(fooAcc, "*", ""); err != nil {
@@ -635,7 +635,7 @@ func TestPrefixWildcardMapping(t *testing.T) {
 		t.Fatalf("Error registering client with 'bar' account: %v", err)
 	}
 
-	if err := cfoo.acc.addStreamExport(">", []*Account{barAcc}); err != nil { // Public with no accounts defined.
+	if err := cfoo.acc.addStreamExport(">", []*Account{barAcc}); err != nil {
 		t.Fatalf("Error adding stream export to client foo: %v", err)
 	}
 	// Checking that trailing '.' is accepted, tested that it is auto added above.
@@ -689,7 +689,7 @@ func TestPrefixWildcardMappingWithLiteralSub(t *testing.T) {
 		t.Fatalf("Error registering client with 'bar' account: %v", err)
 	}
 
-	if err := cfoo.acc.addStreamExport(">", []*Account{barAcc}); err != nil { // Public with no accounts defined.
+	if err := cfoo.acc.addStreamExport(">", []*Account{barAcc}); err != nil {
 		t.Fatalf("Error adding stream export to client foo: %v", err)
 	}
 	if err := cbar.acc.addStreamImport(fooAcc, "*", "pub.imports."); err != nil {

server/client.go

@@ -1956,29 +1956,34 @@ func (c *client) typeString() string {
 // longer authorized, e.g. due to a config reload.
 func (c *client) removeUnauthorizedSubs() {
 	c.mu.Lock()
-	if c.perms == nil {
+	if c.perms == nil || c.sl == nil {
 		c.mu.Unlock()
 		return
 	}
 	srv := c.srv
-	subs := make(map[string]*subscription, len(c.subs))
-	for sid, sub := range c.subs {
-		subs[sid] = sub
+
+	var subsa [32]*subscription
+	subs := subsa[:0]
+	for _, sub := range c.subs {
+		subs = append(subs, sub)
 	}
 
 	var removedSubs [32]*subscription
 	removed := removedSubs[:0]
 
-	for sid, sub := range subs {
-		if c.sl != nil && !c.canSubscribe(sub.subject) {
+	for _, sub := range subs {
+		if !c.canSubscribe(sub.subject) {
 			removed = append(removed, sub)
-			delete(c.subs, sid)
+			delete(c.subs, string(sub.sid))
 		}
 	}
 	c.mu.Unlock()
 
+	// Remove unauthorized clients subscriptions.
+	c.sl.RemoveBatch(removed)
+
+	// Report back to client and logs.
 	for _, sub := range removed {
-		c.sl.Remove(sub)
 		c.sendErr(fmt.Sprintf("Permissions Violation for Subscription to %q (sid %s)",
 			sub.subject, sub.sid))
 		srv.Noticef("Removed sub %q for user %q - not authorized",

server/server.go

@@ -833,7 +833,6 @@ func (s *Server) copyInfo() Info {
 
 func (s *Server) createClient(conn net.Conn) *client {
 	// Snapshot server options.
-	// TODO(dlc) - This can get expensive.
 	opts := s.getOpts()
 
 	max_pay := int64(opts.MaxPayload)