tokenserver: Extract rules check into a separate function.

tokenserver/api/admin/v1/admin.pb.go

Index: tokenserver/api/admin/v1/admin.pb.go
diff --git a/tokenserver/api/admin/v1/admin.pb.go b/tokenserver/api/admin/v1/admin.pb.go
index 38a87a2f7cdba6e4aa03f65f6bf5f4aaeedad5ed..42df448a831a1e12e00384d544140a8ef3dd4f23 100644
--- a/tokenserver/api/admin/v1/admin.pb.go
+++ b/tokenserver/api/admin/v1/admin.pb.go
@@ -427,7 +427,8 @@ func (m *InspectOAuthTokenGrantRequest) GetToken() string {
 type InspectOAuthTokenGrantResponse struct {
 	// True if the token is valid.
 	//
-	// A token is valid if its signature is correct and it hasn't expired yet.
+	// A token is valid if its signature is correct, it hasn't expired yet and
+	// token server rules still allow it.
 	Valid bool `protobuf:"varint,1,opt,name=valid" json:"valid,omitempty"`
 	// Human readable summary of why token is invalid.
 	//
@@ -459,6 +460,12 @@ type InspectOAuthTokenGrantResponse struct {
 	//
 	// May be empty if token was malformed and couldn't be deserialized.
 	TokenBody *tokenserver1.OAuthTokenGrantBody `protobuf:"bytes,6,opt,name=token_body,json=tokenBody" json:"token_body,omitempty"`
+	// The service_accounts.cfg rule that governs the service account usage.
+	//
+	// May be present even if the token is not allowed by it.
+	MatchingRule *ServiceAccountRule `protobuf:"bytes,7,opt,name=matching_rule,json=matchingRule" json:"matching_rule,omitempty"`
+	// True if current service_accounts.cfg rules allow this token.
+	AllowedByRules bool `protobuf:"varint,8,opt,name=allowed_by_rules,json=allowedByRules" json:"allowed_by_rules,omitempty"`
 }
 
 func (m *InspectOAuthTokenGrantResponse) Reset()                    { *m = InspectOAuthTokenGrantResponse{} }
@@ -508,6 +515,20 @@ func (m *InspectOAuthTokenGrantResponse) GetTokenBody() *tokenserver1.OAuthToken
 	return nil
 }
 
+func (m *InspectOAuthTokenGrantResponse) GetMatchingRule() *ServiceAccountRule {
+	if m != nil {
+		return m.MatchingRule
+	}
+	return nil
+}
+
+func (m *InspectOAuthTokenGrantResponse) GetAllowedByRules() bool {
+	if m != nil {
+		return m.AllowedByRules
+	}
+	return false
+}
+
 func init() {
 	proto.RegisterType((*ImportedConfigs)(nil), "tokenserver.admin.ImportedConfigs")
 	proto.RegisterType((*InspectMachineTokenRequest)(nil), "tokenserver.admin.InspectMachineTokenRequest")
@@ -917,47 +938,52 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 672 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x4f, 0x4f, 0xdb, 0x4e,
-	0x10, 0xfd, 0x85, 0x1f, 0x49, 0xc3, 0x82, 0x28, 0x6c, 0x11, 0x75, 0x4d, 0x69, 0xa3, 0xa8, 0x07,
-	0xa4, 0x8a, 0x75, 0xa1, 0xe2, 0x54, 0x24, 0x94, 0x52, 0x54, 0x50, 0x45, 0x2b, 0x19, 0x7a, 0xe9,
-	0xc5, 0x72, 0xec, 0xc1, 0x59, 0x11, 0xef, 0xba, 0xde, 0xb5, 0x55, 0x1f, 0x7a, 0xea, 0x07, 0xed,
-	0x27, 0xa9, 0x54, 0x79, 0xd7, 0x0e, 0x4e, 0xe2, 0x44, 0xa9, 0xc4, 0x81, 0x8b, 0xb5, 0x3b, 0x3b,
-	0xef, 0xcd, 0x78, 0xfe, 0x3c, 0x74, 0x1c, 0x50, 0x39, 0x48, 0xfa, 0xc4, 0xe3, 0xa1, 0x35, 0x4c,
-	0x3c, 0xaa, 0x3e, 0xfb, 0x01, 0xb7, 0x24, 0xbf, 0x05, 0x26, 0x20, 0x4e, 0x21, 0xb6, 0xdc, 0x88,
-	0x5a, 0xae, 0x1f, 0x52, 0x66, 0xa5, 0x07, 0xfa, 0x40, 0xa2, 0x98, 0x4b, 0x8e, 0x37, 0x2b, 0x5e,
-	0x44, 0x3d, 0x98, 0x3b, 0x01, 0xe7, 0xc1, 0x10, 0x2c, 0xe5, 0xd0, 0x4f, 0x6e, 0x2c, 0x08, 0x23,
-	0x99, 0x69, 0x7f, 0xf3, 0x7c, 0x56, 0xb4, 0x32, 0x50, 0x22, 0x07, 0x96, 0x0f, 0x43, 0x08, 0x5c,
-	0x49, 0x39, 0xb3, 0x42, 0x10, 0xc2, 0x0d, 0x40, 0x54, 0x6c, 0x05, 0xd3, 0xbb, 0x45, 0xf3, 0x0e,
-	0x5d, 0x6f, 0x40, 0x19, 0x38, 0xca, 0x5e, 0x80, 0x4f, 0x16, 0x05, 0xf3, 0x3c, 0x21, 0x0d, 0x75,
-	0x82, 0xd8, 0x65, 0x52, 0x13, 0x74, 0xf7, 0xd1, 0xe3, 0x8b, 0x30, 0xe2, 0xb1, 0x04, 0xff, 0x94,
-	0xb3, 0x1b, 0x1a, 0x08, 0x6c, 0xa2, 0x76, 0x0c, 0x29, 0x15, 0x94, 0x33, 0xa3, 0xd1, 0x69, 0xec,
-	0xad, 0xd8, 0xa3, 0x7b, 0x37, 0x42, 0xe6, 0x05, 0x13, 0x11, 0x78, 0xf2, 0x52, 0x67, 0x73, 0x9d,
-	0x33, 0xda, 0xf0, 0x3d, 0x01, 0x21, 0xf1, 0x31, 0x42, 0x3a, 0x82, 0xcc, 0x22, 0x50, 0xd8, 0xf5,
-	0xc3, 0x5d, 0x52, 0xad, 0x6c, 0x15, 0x75, 0x9d, 0x45, 0x60, 0xaf, 0xc8, 0xf2, 0x88, 0xb7, 0x50,
-	0x53, 0x5d, 0x8c, 0x25, 0x15, 0x54, 0x5f, 0xba, 0xbf, 0x97, 0xd0, 0x4e, 0x6d, 0x48, 0x11, 0x71,
-	0x26, 0x14, 0x2a, 0x75, 0x87, 0xd4, 0x57, 0xe1, 0xda, 0xb6, 0xbe, 0xe0, 0xd7, 0x68, 0x93, 0x32,
-	0x75, 0xa4, 0x32, 0x73, 0x62, 0x70, 0x05, 0x2f, 0x79, 0x37, 0xee, 0x1e, 0x6c, 0x65, 0xc7, 0xdb,
-	0xa8, 0x25, 0x68, 0xc0, 0xc0, 0x37, 0xfe, 0x57, 0x1c, 0xc5, 0x0d, 0xbf, 0x44, 0xab, 0x8c, 0x33,
-	0x07, 0x7e, 0x44, 0x34, 0x06, 0xdf, 0x58, 0x56, 0x8f, 0x88, 0x71, 0x76, 0xa6, 0x2d, 0xa5, 0x43,
-	0x0c, 0x29, 0xbf, 0x05, 0xdf, 0x68, 0x8e, 0x1c, 0x6c, 0x6d, 0xc1, 0xaf, 0xd0, 0x7a, 0xce, 0x45,
-	0x59, 0xe0, 0xdc, 0x42, 0xe6, 0x50, 0xdf, 0x68, 0xa9, 0x1c, 0xd6, 0x0a, 0xeb, 0x27, 0xc8, 0x2e,
-	0x7c, 0xdc, 0x41, 0x6b, 0x1e, 0xc4, 0xd2, 0xf1, 0x5c, 0x87, 0xb9, 0x21, 0x18, 0x8f, 0x94, 0x0f,
-	0xca, 0x6d, 0xa7, 0xee, 0x67, 0x37, 0x04, 0x7c, 0x89, 0x70, 0xde, 0x58, 0x67, 0x6c, 0x04, 0x8c,
-	0xad, 0x4e, 0x63, 0x6f, 0x75, 0x4e, 0x81, 0xdf, 0x73, 0x3f, 0x3b, 0xff, 0xcf, 0xde, 0xc8, 0xa1,
-	0x63, 0xf6, 0xb5, 0x6a, 0x9f, 0xba, 0x47, 0x68, 0xb7, 0x28, 0xf0, 0x87, 0xd1, 0x6c, 0x8e, 0xb5,
-	0x75, 0xd4, 0x98, 0x46, 0xb5, 0x31, 0xbf, 0x96, 0xd0, 0x8b, 0x59, 0xb8, 0x07, 0xd0, 0x9b, 0x23,
-	0xd4, 0x06, 0x96, 0xc2, 0x90, 0x47, 0xa0, 0x1a, 0xb3, 0x7a, 0xf8, 0x8c, 0x94, 0x4b, 0x48, 0x26,
-	0x13, 0x1e, 0xb9, 0x62, 0x82, 0xda, 0x22, 0xe9, 0xeb, 0xdf, 0x6d, 0x29, 0x18, 0xbe, 0x83, 0x5d,
-	0x15, 0x2f, 0xf6, 0xc8, 0xa7, 0x52, 0xbc, 0x2f, 0xbd, 0x44, 0x0e, 0x14, 0xdd, 0xc7, 0x7c, 0xbf,
-	0x16, 0x2e, 0xde, 0x14, 0xee, 0x01, 0x14, 0x6f, 0x7a, 0x6e, 0x9b, 0x35, 0x73, 0x7b, 0x52, 0x8e,
-	0x51, 0x9f, 0xfb, 0x59, 0x51, 0xad, 0xce, 0xd8, 0x34, 0x4e, 0xfc, 0x5b, 0x3e, 0x90, 0xc5, 0xc6,
-	0xe7, 0xc7, 0xc3, 0x3f, 0xcb, 0xa8, 0xd9, 0xcb, 0xb5, 0x16, 0x5f, 0x96, 0x32, 0x74, 0xda, 0x2b,
-	0x65, 0x68, 0x9b, 0x68, 0xfd, 0x25, 0xa5, 0xfe, 0x92, 0xb3, 0x5c, 0x7f, 0xcd, 0x2e, 0x99, 0x92,
-	0x6a, 0x32, 0x29, 0x61, 0x5f, 0xd1, 0x53, 0x6d, 0xba, 0x6b, 0xf4, 0x7d, 0xd0, 0x7e, 0x43, 0xcf,
-	0xb5, 0xe9, 0x0a, 0xe2, 0x94, 0x7a, 0xd0, 0xf3, 0x3c, 0x9e, 0x30, 0x29, 0xee, 0x83, 0x5b, 0xa2,
-	0x27, 0x35, 0x32, 0x87, 0xf7, 0xeb, 0xa0, 0x33, 0x15, 0xd8, 0x24, 0x8b, 0xba, 0x17, 0x43, 0xf6,
-	0x13, 0x6d, 0xd7, 0xef, 0x30, 0x7e, 0x33, 0x9b, 0xa9, 0x5e, 0x26, 0xcc, 0x83, 0x7f, 0x40, 0x4c,
-	0x85, 0x9f, 0x98, 0x94, 0x79, 0xe1, 0xeb, 0x17, 0x6d, 0x5e, 0xf8, 0x19, 0x2b, 0xd6, 0x6f, 0xa9,
-	0x3e, 0xbd, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x36, 0x69, 0x05, 0x5b, 0x3b, 0x08, 0x00, 0x00,
+	// 741 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x41, 0x4f, 0xdb, 0x4a,
+	0x10, 0x7e, 0xe1, 0x91, 0xbc, 0xb0, 0xc9, 0xe3, 0xc1, 0x3e, 0x44, 0xdd, 0x50, 0xda, 0x28, 0x6a,
+	0x25, 0xa4, 0x0a, 0xbb, 0xa4, 0xe2, 0x54, 0x2a, 0x14, 0x28, 0x2a, 0xb4, 0xa2, 0x95, 0x0c, 0xbd,
+	0xf4, 0x62, 0x39, 0xf6, 0xe0, 0xac, 0xb0, 0x77, 0x5d, 0xef, 0x3a, 0xad, 0x0f, 0x3d, 0xf5, 0x87,
+	0xf6, 0x77, 0xf4, 0x50, 0xa9, 0xf2, 0xae, 0x9d, 0x38, 0x89, 0x13, 0x81, 0xc4, 0x81, 0x8b, 0xb5,
+	0x3b, 0x3b, 0xdf, 0x37, 0xb3, 0x33, 0xdf, 0x8e, 0xd1, 0x81, 0x47, 0xc4, 0x20, 0xee, 0xeb, 0x0e,
+	0x0b, 0x0c, 0x3f, 0x76, 0x88, 0xfc, 0xec, 0x7a, 0xcc, 0x10, 0xec, 0x1a, 0x28, 0x87, 0x68, 0x08,
+	0x91, 0x61, 0x87, 0xc4, 0xb0, 0xdd, 0x80, 0x50, 0x63, 0xb8, 0xa7, 0x16, 0x7a, 0x18, 0x31, 0xc1,
+	0xf0, 0x7a, 0xc1, 0x4b, 0x97, 0x07, 0xad, 0x2d, 0x8f, 0x31, 0xcf, 0x07, 0x43, 0x3a, 0xf4, 0xe3,
+	0x2b, 0x03, 0x82, 0x50, 0x24, 0xca, 0xbf, 0x75, 0x3a, 0x2f, 0x5a, 0x1e, 0x28, 0x16, 0x03, 0xc3,
+	0x05, 0x1f, 0x3c, 0x5b, 0x10, 0x46, 0x8d, 0x00, 0x38, 0xb7, 0x3d, 0xe0, 0x05, 0x5b, 0xc6, 0xf4,
+	0xfa, 0xd6, 0x79, 0x3b, 0x8c, 0x5e, 0x11, 0x2f, 0x83, 0xbf, 0xba, 0x29, 0x3c, 0xb0, 0x9d, 0x01,
+	0xa1, 0x60, 0x49, 0x7b, 0x06, 0x3e, 0xbc, 0x29, 0x98, 0xa5, 0xf7, 0x51, 0x50, 0xcb, 0x8b, 0x6c,
+	0x2a, 0x14, 0x41, 0x67, 0x17, 0xfd, 0x77, 0x16, 0x84, 0x2c, 0x12, 0xe0, 0x1e, 0xcb, 0xac, 0x38,
+	0x6e, 0xa1, 0x7a, 0x04, 0x43, 0xc2, 0x09, 0xa3, 0x5a, 0xa5, 0x5d, 0xd9, 0x59, 0x31, 0x47, 0xfb,
+	0x4e, 0x88, 0x5a, 0x67, 0x94, 0x87, 0xe0, 0x88, 0x73, 0x95, 0xcd, 0x65, 0xca, 0x68, 0xc2, 0x97,
+	0x18, 0xb8, 0xc0, 0x07, 0x08, 0xa9, 0x08, 0x22, 0x09, 0x41, 0x62, 0x57, 0xbb, 0xdb, 0x7a, 0xb1,
+	0x31, 0x45, 0xd4, 0x65, 0x12, 0x82, 0xb9, 0x22, 0xf2, 0x25, 0xde, 0x40, 0x55, 0xb9, 0xd1, 0x96,
+	0x64, 0x50, 0xb5, 0xe9, 0xfc, 0x5c, 0x42, 0x5b, 0xa5, 0x21, 0x79, 0xc8, 0x28, 0x97, 0xa8, 0xa1,
+	0xed, 0x13, 0x57, 0x86, 0xab, 0x9b, 0x6a, 0x83, 0x9f, 0xa3, 0x75, 0x42, 0xe5, 0x92, 0x88, 0xc4,
+	0x8a, 0xc0, 0xe6, 0x2c, 0xe7, 0x5d, 0x1b, 0x1f, 0x98, 0xd2, 0x8e, 0x37, 0x51, 0x8d, 0x13, 0x8f,
+	0x82, 0xab, 0xfd, 0x2d, 0x39, 0xb2, 0x1d, 0x7e, 0x82, 0x1a, 0x94, 0x51, 0x0b, 0xbe, 0x85, 0x24,
+	0x02, 0x57, 0x5b, 0x96, 0x87, 0x88, 0x32, 0x7a, 0xa2, 0x2c, 0xb9, 0x43, 0x04, 0x43, 0x76, 0x0d,
+	0xae, 0x56, 0x1d, 0x39, 0x98, 0xca, 0x82, 0x9f, 0xa2, 0xd5, 0x94, 0x8b, 0x50, 0xcf, 0xba, 0x86,
+	0xc4, 0x22, 0xae, 0x56, 0x93, 0x39, 0x34, 0x33, 0xeb, 0x7b, 0x48, 0xce, 0x5c, 0xdc, 0x46, 0x4d,
+	0x07, 0x22, 0x61, 0x39, 0xb6, 0x45, 0xed, 0x00, 0xb4, 0x7f, 0xa4, 0x0f, 0x4a, 0x6d, 0xc7, 0xf6,
+	0x07, 0x3b, 0x00, 0x7c, 0x8e, 0x70, 0xda, 0x58, 0x6b, 0x42, 0x02, 0xda, 0x46, 0xbb, 0xb2, 0xd3,
+	0x58, 0x50, 0xe0, 0x23, 0xe6, 0x26, 0xa7, 0x7f, 0x99, 0x6b, 0x29, 0x74, 0xc2, 0xde, 0x2c, 0xf6,
+	0xa9, 0xb3, 0x8f, 0xb6, 0xb3, 0x02, 0xbf, 0x19, 0x49, 0x7b, 0xa2, 0xad, 0xa3, 0xc6, 0x54, 0x8a,
+	0x8d, 0xf9, 0xb1, 0x84, 0x1e, 0xcf, 0xc3, 0xdd, 0x83, 0xde, 0xec, 0xa3, 0x3a, 0xd0, 0x21, 0xf8,
+	0x2c, 0x04, 0xd9, 0x98, 0x46, 0xf7, 0xa1, 0x9e, 0xbf, 0x61, 0x7d, 0x3a, 0xe1, 0x91, 0x2b, 0xd6,
+	0x51, 0x9d, 0xc7, 0x7d, 0x75, 0xdd, 0x9a, 0x84, 0xe1, 0x31, 0xec, 0x22, 0x3b, 0x31, 0x47, 0x3e,
+	0x85, 0xe2, 0x7d, 0xec, 0xc5, 0x62, 0x20, 0xe9, 0xde, 0xa6, 0xef, 0x6b, 0x71, 0xf1, 0x7e, 0x8d,
+	0x8b, 0x37, 0x83, 0xbb, 0x07, 0xc5, 0x9b, 0xd5, 0x6d, 0xb5, 0x44, 0xb7, 0x87, 0xb9, 0x8c, 0xfa,
+	0xcc, 0x4d, 0xb2, 0x6a, 0xb5, 0x27, 0xd4, 0x38, 0x75, 0xb7, 0x54, 0x90, 0xd9, 0x8b, 0x4f, 0x97,
+	0xf8, 0x1d, 0xfa, 0x37, 0xb0, 0x45, 0x2a, 0x4c, 0xcf, 0x8a, 0x62, 0x5f, 0x29, 0xbf, 0xd1, 0x7d,
+	0xa6, 0xcf, 0xcc, 0x72, 0xfd, 0x02, 0xa2, 0x21, 0x71, 0xa0, 0xe7, 0x38, 0x2c, 0xa6, 0xc2, 0x8c,
+	0x7d, 0x30, 0x9b, 0x39, 0x36, 0xdd, 0xe1, 0x1d, 0xb4, 0x66, 0xfb, 0x3e, 0xfb, 0x0a, 0xae, 0xd5,
+	0x4f, 0x24, 0x1b, 0xd7, 0xea, 0xf2, 0x62, 0xab, 0x99, 0xfd, 0x28, 0x49, 0x1d, 0x79, 0xf7, 0xf7,
+	0x32, 0xaa, 0xf6, 0x52, 0x52, 0x7c, 0x9e, 0x0f, 0xbf, 0xe3, 0x5e, 0x3e, 0xfc, 0x36, 0x75, 0xf5,
+	0xd3, 0xd0, 0xf3, 0x9f, 0x86, 0x7e, 0x92, 0xfe, 0x34, 0x5a, 0x9d, 0x92, 0x9c, 0xa6, 0x07, 0xe7,
+	0x27, 0xf4, 0x40, 0x99, 0xc6, 0xf2, 0xba, 0x0b, 0xda, 0xcf, 0xe8, 0x91, 0x32, 0x4d, 0xd6, 0x80,
+	0xdf, 0x05, 0xb7, 0x40, 0xff, 0x97, 0x0c, 0x57, 0xbc, 0x5b, 0x06, 0x9d, 0x3b, 0xf7, 0x5b, 0xfa,
+	0x4d, 0xdd, 0x33, 0x69, 0x7f, 0x47, 0x9b, 0xe5, 0x93, 0x03, 0xbf, 0x98, 0xcf, 0x54, 0x3e, 0x9c,
+	0x5a, 0x7b, 0xb7, 0x40, 0xcc, 0x84, 0x9f, 0xd2, 0xe7, 0xa2, 0xf0, 0xe5, 0xcf, 0x7b, 0x51, 0xf8,
+	0x39, 0x0f, 0xbb, 0x5f, 0x93, 0x7d, 0x7a, 0xf9, 0x27, 0x00, 0x00, 0xff, 0xff, 0xdc, 0xfc, 0xfe,
+	0x18, 0xf0, 0x08, 0x00, 0x00,
 }