From a55b7c2744db7aae858ff20b4073308444a4e6a1 Mon Sep 17 00:00:00 2001
From: Derek Collison <derek.collison@gmail.com>
Date: Thu, 16 Jun 2016 20:42:54 -0700
Subject: [PATCH] log errors cleanup

---
 auth/multiuser.go |  3 +--
 server/client.go  | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/auth/multiuser.go b/auth/multiuser.go
index 1c419eda..e3104f56 100644
--- a/auth/multiuser.go
+++ b/auth/multiuser.go
@@ -3,9 +3,8 @@
 package auth
 
 import (
-	"golang.org/x/crypto/bcrypt"
-
 	"github.com/nats-io/gnatsd/server"
+	"golang.org/x/crypto/bcrypt"
 )
 
 // Plain authentication is a basic username and password
diff --git a/server/client.go b/server/client.go
index 42702345..d5ebbd76 100644
--- a/server/client.go
+++ b/server/client.go
@@ -404,7 +404,13 @@ func (c *client) authTimeout() {
 }
 
 func (c *client) authViolation() {
-	c.Errorf(ErrAuthorization.Error())
+	if c.srv != nil && c.srv.opts.Users != nil {
+		c.Errorf("%s - User %q",
+			ErrAuthorization.Error(),
+			c.opts.Username)
+	} else {
+		c.Errorf(ErrAuthorization.Error())
+	}
 	c.sendErr("Authorization Violation")
 	c.closeConnection()
 }
@@ -640,7 +646,7 @@ func (c *client) processSub(argo []byte) (err error) {
 		if len(r.psubs) == 0 {
 			c.mu.Unlock()
 			c.sendErr(fmt.Sprintf("Permissions Violation for Subscription to %q", sub.subject))
-			c.Debugf("Permissions Violation for Subcription to %q", sub.subject)
+			c.Errorf("Subscription Violation - User %q, Subject %q", c.opts.Username, sub.subject)
 			return nil
 		}
 	}
@@ -872,8 +878,7 @@ func (c *client) processMsg(msg []byte) {
 	// Disallow publish to _SYS.>, these are reserved for internals.
 	if c.pa.subject[0] == '_' && c.pa.subject[1] == 'S' &&
 		c.pa.subject[2] == 'Y' && c.pa.subject[3] == 'S' {
-		c.sendErr(fmt.Sprintf("Permissions Violation for Publish to %q", c.pa.subject))
-		c.Debugf("Permissions Violation for Publish to %q", c.pa.subject)
+		c.pubPermissionViolation(c.pa.subject)
 		return
 	}
 
@@ -881,15 +886,13 @@ func (c *client) processMsg(msg []byte) {
 	if c.perms != nil && c.perms.pub != nil {
 		allowed, ok := c.perms.pcache[string(c.pa.subject)]
 		if ok && !allowed {
-			c.sendErr(fmt.Sprintf("Permissions Violation for Publish to %q", c.pa.subject))
-			c.Debugf("Permissions Violation for Publish to %q", c.pa.subject)
+			c.pubPermissionViolation(c.pa.subject)
 			return
 		}
 		if !ok {
 			r := c.perms.pub.Match(string(c.pa.subject))
 			if len(r.psubs) == 0 {
-				c.sendErr(fmt.Sprintf("Permissions Violation for Publish to %q", c.pa.subject))
-				c.Debugf("Permissions Violation for Publish to %q", c.pa.subject)
+				c.pubPermissionViolation(c.pa.subject)
 				c.perms.pcache[string(c.pa.subject)] = false
 				return
 			} else {
@@ -1041,6 +1044,11 @@ func (c *client) processMsg(msg []byte) {
 	}
 }
 
+func (c *client) pubPermissionViolation(subject []byte) {
+	c.sendErr(fmt.Sprintf("Permissions Violation for Publish to %q", subject))
+	c.Errorf("Publish Violation - User %q, Subject %q", c.opts.Username, subject)
+}
+
 func (c *client) processPingTimer() {
 	c.mu.Lock()
 	defer c.mu.Unlock()