tokenserver: Protos for service account rules.

tokenserver/api/oauth_token_grant.pb.go

Index: tokenserver/api/oauth_token_grant.pb.go
diff --git a/tokenserver/api/oauth_token_grant.pb.go b/tokenserver/api/oauth_token_grant.pb.go
index 896067a94185a2545e7bc95bd823b08d205e5c3e..efbb7b59f7fbc5acef1e574589c61c18cfe327bb 100644
--- a/tokenserver/api/oauth_token_grant.pb.go
+++ b/tokenserver/api/oauth_token_grant.pb.go
@@ -29,16 +29,18 @@ type OAuthTokenGrantBody struct {
 	//
 	// A string of the form "user:<email>".
 	ServiceAccount string `protobuf:"bytes,2,opt,name=service_account,json=serviceAccount" json:"service_account,omitempty"`
-	// Who requested this token and who can pass it to MintOAuthTokenViaGrant.
+	// Who can pass this token to MintOAuthTokenViaGrant to get an OAuth token.
 	//
 	// A string of the form "user:<email>". On Swarming, this is Swarming's own
 	// service account name.
-	WielderIdentity string `protobuf:"bytes,3,opt,name=wielder_identity,json=wielderIdentity" json:"wielder_identity,omitempty"`
+	Proxy string `protobuf:"bytes,3,opt,name=proxy" json:"proxy,omitempty"`
 	// An end user that wants to act as the service account (perhaps indirectly).
 	//
 	// A string of the form "user:<email>". On Swarming, this is an identity of
 	// a user that posted the task.
-	EndUserIdentity string `protobuf:"bytes,4,opt,name=end_user_identity,json=endUserIdentity" json:"end_user_identity,omitempty"`
+	//
+	// This is informational field currently (not used in authorization checks).
+	EndUser string `protobuf:"bytes,4,opt,name=end_user,json=endUser" json:"end_user,omitempty"`
 	// When the token was generated (and when it becomes valid).
 	IssuedAt *google_protobuf.Timestamp `protobuf:"bytes,5,opt,name=issued_at,json=issuedAt" json:"issued_at,omitempty"`
 	// How long the token is considered valid (in seconds).
@@ -67,16 +69,16 @@ func (m *OAuthTokenGrantBody) GetServiceAccount() string {
 	return ""
 }
 
-func (m *OAuthTokenGrantBody) GetWielderIdentity() string {
+func (m *OAuthTokenGrantBody) GetProxy() string {
 	if m != nil {
-		return m.WielderIdentity
+		return m.Proxy
 	}
 	return ""
 }
 
-func (m *OAuthTokenGrantBody) GetEndUserIdentity() string {
+func (m *OAuthTokenGrantBody) GetEndUser() string {
 	if m != nil {
-		return m.EndUserIdentity
+		return m.EndUser
 	}
 	return ""
 }
@@ -140,28 +142,27 @@ func init() {
 }
 
 var fileDescriptor1 = []byte{
-	// 360 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x5d, 0x6b, 0xdb, 0x30,
-	0x18, 0x85, 0x71, 0xb2, 0x64, 0x89, 0x12, 0xf2, 0xa1, 0x31, 0xe6, 0x05, 0xc6, 0x42, 0x6e, 0xe6,
-	0x6d, 0xcc, 0x66, 0x19, 0xdb, 0x2e, 0x47, 0x46, 0x4b, 0xc9, 0x55, 0xc1, 0x49, 0xaf, 0x85, 0x6c,
-	0xbd, 0xb5, 0x85, 0x1d, 0xc9, 0x58, 0x52, 0x8a, 0xff, 0x48, 0x7f, 0x6f, 0xb1, 0xe4, 0x40, 0xe8,
-	0x8d, 0xc1, 0xcf, 0x7b, 0x74, 0xe0, 0x3c, 0xe8, 0x5f, 0xc6, 0x75, 0x6e, 0x92, 0x30, 0x95, 0xa7,
-	0xa8, 0x34, 0x29, 0xb7, 0x9f, 0x1f, 0x99, 0x8c, 0xb4, 0x2c, 0x40, 0x28, 0xa8, 0xcf, 0x50, 0x47,
-	0xb4, 0xe2, 0x91, 0xa4, 0x46, 0xe7, 0xc4, 0x52, 0x92, 0xd5, 0x54, 0xe8, 0xb0, 0xaa, 0xa5, 0x96,
-	0x78, 0x72, 0x15, 0x5c, 0x7d, 0xce, 0xa4, 0xcc, 0x4a, 0x88, 0xec, 0x29, 0x31, 0x8f, 0x91, 0xe6,
-	0x27, 0x50, 0x9a, 0x9e, 0x2a, 0x97, 0xde, 0x3c, 0xf7, 0xd0, 0xbb, 0xfb, 0x9d, 0xd1, 0xf9, 0xb1,
-	0x7d, 0x75, 0xd7, 0xf6, 0xfc, 0x97, 0xac, 0xc1, 0x1f, 0xd1, 0xc8, 0x55, 0x73, 0xe6, 0x7b, 0x6b,
-	0x2f, 0xe8, 0xc7, 0x6f, 0xed, 0xff, 0x9e, 0xe1, 0x2f, 0x68, 0xde, 0xb6, 0xf3, 0x14, 0x08, 0x4d,
-	0x53, 0x69, 0x84, 0xf6, 0x7b, 0x6b, 0x2f, 0x18, 0xc7, 0xb3, 0x0e, 0xef, 0x1c, 0xc5, 0x5f, 0xd1,
-	0xe2, 0x89, 0x43, 0xc9, 0xa0, 0x26, 0x9c, 0x81, 0xd0, 0x5c, 0x37, 0x7e, 0xdf, 0x26, 0xe7, 0x1d,
-	0xdf, 0x77, 0x18, 0x7f, 0x43, 0x4b, 0x10, 0x8c, 0x18, 0x75, 0x9d, 0x7d, 0xe3, 0xb2, 0x20, 0xd8,
-	0x83, 0xba, 0xca, 0xfe, 0x45, 0x63, 0xae, 0x94, 0x01, 0x46, 0xa8, 0xf6, 0x07, 0x6b, 0x2f, 0x98,
-	0x6c, 0x57, 0xa1, 0xdb, 0x19, 0x5e, 0x76, 0x86, 0xc7, 0xcb, 0xce, 0x78, 0xe4, 0xc2, 0x3b, 0x8d,
-	0xbf, 0xa3, 0xe5, 0x99, 0x96, 0x9c, 0x71, 0xdd, 0x10, 0x66, 0x6a, 0xaa, 0xb9, 0x14, 0xfe, 0xd0,
-	0x8e, 0x5b, 0x5c, 0x0e, 0x37, 0x1d, 0xdf, 0x34, 0xe8, 0xc3, 0x2b, 0x2f, 0xb7, 0xe2, 0x0c, 0xa5,
-	0xac, 0x00, 0x7f, 0x42, 0xc8, 0xb9, 0x49, 0x24, 0x6b, 0xac, 0x9d, 0x69, 0x3c, 0xb6, 0xc4, 0xaa,
-	0x7b, 0x8f, 0x86, 0x05, 0x34, 0xad, 0x38, 0xa7, 0x65, 0x50, 0x40, 0xb3, 0x67, 0x38, 0x40, 0x8b,
-	0xaa, 0x48, 0xd5, 0x4f, 0xa2, 0x72, 0xba, 0xfd, 0xfd, 0x87, 0x28, 0x9e, 0x59, 0x1b, 0xd3, 0x78,
-	0x66, 0xf9, 0xc1, 0xe2, 0x03, 0xcf, 0x92, 0xa1, 0x5d, 0xf1, 0xeb, 0x25, 0x00, 0x00, 0xff, 0xff,
-	0xf3, 0xd2, 0xcf, 0x20, 0x0b, 0x02, 0x00, 0x00,
+	// 348 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0x5d, 0x4b, 0xe3, 0x40,
+	0x14, 0x86, 0xc9, 0x76, 0xfb, 0x35, 0x2d, 0xdd, 0xee, 0xec, 0x2e, 0x1b, 0x0b, 0x62, 0xe9, 0x8d,
+	0x01, 0x31, 0xc1, 0x8a, 0x7a, 0x29, 0x15, 0x45, 0x7a, 0x25, 0xa4, 0xf5, 0x7a, 0x98, 0x64, 0x8e,
+	0xc9, 0x90, 0x34, 0x13, 0xe6, 0xa3, 0x98, 0x7f, 0xed, 0x4f, 0x90, 0xcc, 0xb4, 0x20, 0xde, 0x04,
+	0xce, 0xf3, 0x9e, 0xbc, 0xcc, 0x73, 0xd0, 0x7d, 0xc6, 0x75, 0x6e, 0x92, 0x30, 0x15, 0xbb, 0xa8,
+	0x34, 0x29, 0xb7, 0x9f, 0xcb, 0x4c, 0x44, 0x5a, 0x14, 0x50, 0x29, 0x90, 0x7b, 0x90, 0x11, 0xad,
+	0x79, 0x24, 0xa8, 0xd1, 0x39, 0xb1, 0x94, 0x64, 0x92, 0x56, 0x3a, 0xac, 0xa5, 0xd0, 0x02, 0x8f,
+	0xbe, 0x2c, 0xce, 0xce, 0x32, 0x21, 0xb2, 0x12, 0x22, 0x1b, 0x25, 0xe6, 0x2d, 0xd2, 0x7c, 0x07,
+	0x4a, 0xd3, 0x5d, 0xed, 0xb6, 0x17, 0x1f, 0x1e, 0xfa, 0xf3, 0xb2, 0x32, 0x3a, 0xdf, 0xb6, 0x7f,
+	0x3d, 0xb7, 0x3d, 0x0f, 0x82, 0x35, 0xf8, 0x04, 0x0d, 0x5c, 0x35, 0x67, 0xbe, 0x37, 0xf7, 0x82,
+	0x4e, 0xdc, 0xb7, 0xf3, 0x9a, 0xe1, 0x73, 0xf4, 0xab, 0x6d, 0xe7, 0x29, 0x10, 0x9a, 0xa6, 0xc2,
+	0x54, 0xda, 0xff, 0x31, 0xf7, 0x82, 0x61, 0x3c, 0x39, 0xe0, 0x95, 0xa3, 0xf8, 0x2f, 0xea, 0xd6,
+	0x52, 0xbc, 0x37, 0x7e, 0xc7, 0xc6, 0x6e, 0x68, 0x9b, 0xa1, 0x62, 0xc4, 0x28, 0x90, 0xfe, 0x4f,
+	0x1b, 0xf4, 0xa1, 0x62, 0xaf, 0x0a, 0x24, 0xbe, 0x43, 0x43, 0xae, 0x94, 0x01, 0x46, 0xa8, 0xf6,
+	0xbb, 0x73, 0x2f, 0x18, 0x2d, 0x67, 0xa1, 0x33, 0x08, 0x8f, 0x06, 0xe1, 0xf6, 0x68, 0x10, 0x0f,
+	0xdc, 0xf2, 0x4a, 0xe3, 0x0b, 0xf4, 0x7b, 0x4f, 0x4b, 0xce, 0xb8, 0x6e, 0x08, 0x33, 0x92, 0x6a,
+	0x2e, 0x2a, 0xbf, 0x67, 0x9f, 0x3d, 0x3d, 0x06, 0x8f, 0x07, 0xbe, 0x68, 0xd0, 0xff, 0x6f, 0xc6,
+	0x4f, 0xd5, 0x1e, 0x4a, 0x51, 0x03, 0x3e, 0x45, 0xc8, 0x59, 0x27, 0x82, 0x35, 0xd6, 0x7b, 0x1c,
+	0x0f, 0x2d, 0xb1, 0x47, 0xf9, 0x87, 0x7a, 0x05, 0x34, 0xed, 0x49, 0x9c, 0x70, 0xb7, 0x80, 0x66,
+	0xcd, 0x70, 0x80, 0xa6, 0x75, 0x91, 0xaa, 0x2b, 0xa2, 0x72, 0xba, 0xbc, 0xb9, 0x25, 0x8a, 0x67,
+	0x56, 0x79, 0x1c, 0x4f, 0x2c, 0xdf, 0x58, 0xbc, 0xe1, 0x59, 0xd2, 0xb3, 0x16, 0xd7, 0x9f, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0xd4, 0x1a, 0x4c, 0xb4, 0xe5, 0x01, 0x00, 0x00,
 }