Add an additional error code, and fix the error codes for ACL denied

riseofthetigers · Aug 26, 2015 · 01c80f7 · 01c80f7
1 parent 4974cf4
commit 01c80f7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/go/vt/proto/vtrpc/vtrpc.pb.go b/go/vt/proto/vtrpc/vtrpc.pb.go
diff --git a/go/vt/tabletserver/query_executor.go b/go/vt/tabletserver/query_executor.go
@@ -220,7 +220,7 @@ func (qre *QueryExecutor) checkPermissions() error {
 	callerID := callerid.ImmediateCallerIDFromContext(qre.ctx)
 	if callerID == nil {
 		if qre.qe.strictTableAcl {
-			return NewTabletError(ErrFail, "missing caller id")
+			return NewTabletError(ErrFail, vtrpc.ErrorCode_UNAUTHENTICATED, "missing caller id")
 		}
 		return nil
 	}
@@ -231,7 +231,7 @@ func (qre *QueryExecutor) checkPermissions() error {
 		return nil
 	}
 	if qre.plan.Authorized == nil {
-		return NewTabletError(ErrFail, "table acl error: nil acl")
+		return NewTabletError(ErrFail, vtrpc.ErrorCode_PERMISSION_DENIED, "table acl error: nil acl")
 	}
 	tableACLStatsKey := []string{
 		qre.plan.TableName,

diff --git a/proto/vtrpc.proto b/proto/vtrpc.proto
@@ -111,6 +111,10 @@ enum ErrorCode {
   // 1. Query has been throttled
   // 2. VtGate could have request backlog
   TRANSIENT_ERROR = 11;
+
+  // UNAUTHENTICATED errors are returned when a user requests access to something,
+  // and we're unable to verify the user's authentication.
+  UNAUTHENTICATED = 12;
 }
 
 // ErrorCodeDeprecated is the enum values for Errors. These are deprecated errors, we

diff --git a/py/vtproto/vtrpc_pb2.py b/py/vtproto/vtrpc_pb2.py