tokenserver: Allow customizing list of OAuth scopes to use for CRL fetch.

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

Index: tokenserver/api/admin/v1/config.pb.go
diff --git a/tokenserver/api/admin/v1/config.pb.go b/tokenserver/api/admin/v1/config.pb.go
index 1e8ab4c64364ea17816a2d75b86091efaa32c6f8..8a72155192094f76ccf543dd5edc4af5ed6cd4e2 100644
--- a/tokenserver/api/admin/v1/config.pb.go
+++ b/tokenserver/api/admin/v1/config.pb.go
@@ -43,11 +43,12 @@ func (m *TokenServerConfig) GetCertificateAuthority() []*CertificateAuthorityCon
 // for generating a token that contains machine's FQDN and certificate serial
 // number (among other things, see MachineTokenBody in machine_token.proto).
 type CertificateAuthorityConfig struct {
-	UniqueId int64  `protobuf:"varint,6,opt,name=unique_id,json=uniqueId" json:"unique_id,omitempty"`
-	Cn       string `protobuf:"bytes,1,opt,name=cn" json:"cn,omitempty"`
-	CertPath string `protobuf:"bytes,2,opt,name=cert_path,json=certPath" json:"cert_path,omitempty"`
-	CrlUrl   string `protobuf:"bytes,3,opt,name=crl_url,json=crlUrl" json:"crl_url,omitempty"`
-	UseOauth bool   `protobuf:"varint,4,opt,name=use_oauth,json=useOauth" json:"use_oauth,omitempty"`
+	UniqueId    int64    `protobuf:"varint,6,opt,name=unique_id,json=uniqueId" json:"unique_id,omitempty"`
+	Cn          string   `protobuf:"bytes,1,opt,name=cn" json:"cn,omitempty"`
+	CertPath    string   `protobuf:"bytes,2,opt,name=cert_path,json=certPath" json:"cert_path,omitempty"`
+	CrlUrl      string   `protobuf:"bytes,3,opt,name=crl_url,json=crlUrl" json:"crl_url,omitempty"`
+	UseOauth    bool     `protobuf:"varint,4,opt,name=use_oauth,json=useOauth" json:"use_oauth,omitempty"`
+	OauthScopes []string `protobuf:"bytes,7,rep,name=oauth_scopes,json=oauthScopes" json:"oauth_scopes,omitempty"`
 	// KnownDomains describes parameters to use for each particular domain.
 	KnownDomains []*DomainConfig `protobuf:"bytes,5,rep,name=known_domains,json=knownDomains" json:"known_domains,omitempty"`
 }
@@ -92,6 +93,13 @@ func (m *CertificateAuthorityConfig) GetUseOauth() bool {
 	return false
 }
 
+func (m *CertificateAuthorityConfig) GetOauthScopes() []string {
+	if m != nil {
+		return m.OauthScopes
+	}
+	return nil
+}
+
 func (m *CertificateAuthorityConfig) GetKnownDomains() []*DomainConfig {
 	if m != nil {
 		return m.KnownDomains
@@ -362,41 +370,43 @@ func init() {
 }
 
 var fileDescriptor2 = []byte{
-	// 574 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x5f, 0x4b, 0x1b, 0x4d,
-	0x14, 0xc6, 0x49, 0xb2, 0x89, 0x9b, 0x79, 0xd5, 0x37, 0x4e, 0xa3, 0x1d, 0x6c, 0xa1, 0x69, 0x40,
-	0x48, 0x2f, 0x4c, 0xa8, 0x2d, 0xf4, 0xa2, 0xb4, 0x20, 0xe6, 0xc6, 0x50, 0xa8, 0xac, 0xb6, 0xd0,
-	0xab, 0x61, 0x9c, 0x3d, 0x26, 0x83, 0xb3, 0x33, 0x71, 0xfe, 0x18, 0xfd, 0x1e, 0xfd, 0x84, 0xfd,
-	0x24, 0x65, 0x67, 0xc7, 0x9a, 0x60, 0x0a, 0xbd, 0x09, 0x39, 0xcf, 0xef, 0x39, 0x67, 0x78, 0xce,
-	0x61, 0xd1, 0xa7, 0xa9, 0x70, 0x33, 0x7f, 0x39, 0xe4, 0xba, 0x18, 0x49, 0xcf, 0x45, 0xf8, 0x39,
-	0x9c, 0xea, 0x91, 0xd3, 0xd7, 0xa0, 0x2c, 0x98, 0x5b, 0x30, 0x23, 0x36, 0x17, 0x23, 0x96, 0x17,
-	0x42, 0x8d, 0x6e, 0xdf, 0x8e, 0xb8, 0x56, 0x57, 0x62, 0x3a, 0x9c, 0x1b, 0xed, 0x34, 0xde, 0x59,
-	0xb2, 0x0d, 0x83, 0xa5, 0xbf, 0x40, 0x3b, 0x17, 0xa5, 0x78, 0x1e, 0xc4, 0x93, 0xe0, 0xc6, 0x97,
-	0x68, 0x97, 0x83, 0x71, 0xe2, 0x4a, 0x70, 0xe6, 0x80, 0x32, 0xef, 0x66, 0xda, 0x08, 0x77, 0x4f,
-	0x6a, 0xbd, 0xc6, 0xe0, 0xbf, 0xa3, 0xc3, 0xe1, 0x93, 0x39, 0xc3, 0x93, 0x47, 0xff, 0xf1, 0x83,
-	0xbd, 0x9a, 0x96, 0x75, 0xf9, 0x1a, 0xd6, 0xff, 0x55, 0x43, 0xfb, 0x7f, 0x6f, 0xc2, 0x2f, 0x50,
-	0xdb, 0x2b, 0x71, 0xe3, 0x81, 0x8a, 0x9c, 0xb4, 0x7a, 0xb5, 0x41, 0x23, 0x4b, 0x2b, 0xe1, 0x34,
-	0xc7, 0xdb, 0xa8, 0xce, 0x15, 0xa9, 0xf5, 0x6a, 0x83, 0x76, 0x56, 0xe7, 0xaa, 0x34, 0x97, 0x6f,
-	0xd0, 0x39, 0x73, 0x33, 0x52, 0x0f, 0x72, 0x5a, 0x0a, 0x67, 0xcc, 0xcd, 0xf0, 0x73, 0xb4, 0xc1,
-	0x8d, 0xa4, 0xde, 0x48, 0xd2, 0x08, 0xa8, 0xc5, 0x8d, 0xfc, 0x66, 0x64, 0x78, 0xc2, 0x02, 0xd5,
-	0x65, 0x3c, 0x92, 0xf4, 0x6a, 0x83, 0x34, 0x4b, 0xbd, 0x85, 0xaf, 0x65, 0x8d, 0xc7, 0x68, 0xeb,
-	0x5a, 0xe9, 0x85, 0xa2, 0xb9, 0x2e, 0x98, 0x50, 0x96, 0x34, 0x43, 0xf4, 0x57, 0x6b, 0xa2, 0x8f,
-	0x83, 0x23, 0x86, 0xdd, 0x0c, 0x5d, 0x95, 0x64, 0xfb, 0x0e, 0x6d, 0x2e, 0x53, 0xbc, 0x87, 0x5a,
-	0xd5, 0xbc, 0xb0, 0xc9, 0x76, 0x16, 0x2b, 0xfc, 0x1e, 0xed, 0x15, 0x8c, 0xcf, 0x84, 0x02, 0x1a,
-	0xe6, 0x53, 0x29, 0xae, 0xc0, 0x89, 0x02, 0x48, 0x33, 0x44, 0xef, 0x46, 0x1a, 0x4e, 0xf5, 0x25,
-	0xb2, 0x49, 0x92, 0xd6, 0x3b, 0x8d, 0x49, 0x92, 0x36, 0x3a, 0xc9, 0x24, 0x49, 0x93, 0x4e, 0x73,
-	0x92, 0xa4, 0xad, 0xce, 0x46, 0xff, 0x0c, 0xed, 0x8e, 0x41, 0xc2, 0x94, 0x39, 0xa1, 0xd5, 0x19,
-	0x98, 0x42, 0x58, 0x2b, 0xb4, 0xb2, 0xf8, 0x03, 0x6a, 0x1a, 0x2f, 0xc1, 0xc6, 0x3b, 0xbe, 0x5e,
-	0x17, 0xe6, 0x4f, 0x63, 0xe6, 0x25, 0x64, 0x95, 0xbf, 0xff, 0xb3, 0x8e, 0xb6, 0x57, 0x09, 0xc6,
-	0x28, 0x51, 0xac, 0x80, 0x78, 0x85, 0xf0, 0x1f, 0x77, 0x51, 0x53, 0x2f, 0x14, 0x18, 0x52, 0x0f,
-	0xe9, 0xaa, 0x02, 0xbf, 0x44, 0x6d, 0x03, 0x37, 0x1e, 0xac, 0xd3, 0x86, 0x34, 0x02, 0x79, 0x14,
-	0xca, 0xe8, 0x4c, 0x4a, 0xbd, 0x80, 0x9c, 0x3a, 0x4d, 0x45, 0x31, 0x07, 0x63, 0xb5, 0x62, 0x0e,
-	0x48, 0x12, 0xac, 0xdd, 0x48, 0x2f, 0xf4, 0xe9, 0x23, 0xc3, 0x6f, 0x50, 0xe7, 0xa1, 0x8b, 0xf9,
-	0x5c, 0x80, 0xe2, 0x10, 0x2e, 0xd4, 0xce, 0xfe, 0x8f, 0xfa, 0x71, 0x94, 0xf1, 0x01, 0xda, 0x76,
-	0xcc, 0x4c, 0xc1, 0xd1, 0x32, 0xa8, 0xe0, 0x40, 0x5a, 0xc1, 0xb8, 0x55, 0xa9, 0xe7, 0x95, 0x88,
-	0x8f, 0xd0, 0x6e, 0xc1, 0xee, 0xe8, 0x2d, 0x93, 0x22, 0x17, 0xee, 0x9e, 0xe6, 0xde, 0x84, 0xb0,
-	0x64, 0x23, 0x5c, 0xe0, 0x59, 0xc1, 0xee, 0xbe, 0x47, 0x36, 0x8e, 0xa8, 0xff, 0x03, 0xed, 0xc7,
-	0xf6, 0x63, 0xce, 0xb5, 0x57, 0xce, 0x2e, 0x6f, 0xfb, 0xe3, 0xea, 0xb6, 0x0f, 0xd6, 0x6c, 0x7b,
-	0xb5, 0x7b, 0x79, 0xe3, 0x9f, 0x11, 0x7e, 0x0a, 0xff, 0x7d, 0xe9, 0x97, 0xad, 0xf0, 0xc5, 0xbf,
-	0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x79, 0xa6, 0xb9, 0x32, 0x04, 0x00, 0x00,
+	// 597 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdf, 0x6a, 0xdb, 0x4a,
+	0x10, 0xc6, 0xb1, 0x24, 0xdb, 0xf2, 0xe6, 0xcf, 0x71, 0xf6, 0x38, 0x39, 0x4b, 0xce, 0x81, 0xe3,
+	0x18, 0x02, 0xee, 0x45, 0x6c, 0x9a, 0x16, 0x7a, 0x51, 0x5a, 0x08, 0xf1, 0x4d, 0x4c, 0xa1, 0x41,
+	0x49, 0x0b, 0xbd, 0x5a, 0x36, 0xab, 0x89, 0xbd, 0x44, 0xda, 0x75, 0x76, 0x57, 0x71, 0xf2, 0x00,
+	0x7d, 0x83, 0x3e, 0x70, 0xd1, 0x48, 0x69, 0x1c, 0xe2, 0x42, 0x6f, 0x8c, 0xe7, 0xfb, 0x7d, 0x33,
+	0xcb, 0x7c, 0x03, 0x22, 0x1f, 0x66, 0xca, 0xcf, 0x8b, 0xab, 0x91, 0x34, 0xf9, 0x38, 0x2b, 0xa4,
+	0xc2, 0x9f, 0xa3, 0x99, 0x19, 0x7b, 0x73, 0x03, 0xda, 0x81, 0xbd, 0x03, 0x3b, 0x16, 0x0b, 0x35,
+	0x16, 0x69, 0xae, 0xf4, 0xf8, 0xee, 0xf5, 0x58, 0x1a, 0x7d, 0xad, 0x66, 0xa3, 0x85, 0x35, 0xde,
+	0xd0, 0x9d, 0x15, 0xdb, 0x08, 0x2d, 0x83, 0x25, 0xd9, 0xb9, 0x2c, 0xc5, 0x0b, 0x14, 0x4f, 0xd1,
+	0x4d, 0xaf, 0xc8, 0xae, 0x04, 0xeb, 0xd5, 0xb5, 0x92, 0xc2, 0x03, 0x17, 0x85, 0x9f, 0x1b, 0xab,
+	0xfc, 0x03, 0x6b, 0xf4, 0xc3, 0xe1, 0xc6, 0xf1, 0xd1, 0xe8, 0xc5, 0x9c, 0xd1, 0xe9, 0x93, 0xff,
+	0xe4, 0xd1, 0x5e, 0x4d, 0x4b, 0x7a, 0x72, 0x0d, 0x1b, 0x7c, 0x0f, 0xc8, 0xfe, 0xef, 0x9b, 0xe8,
+	0xbf, 0xa4, 0x53, 0x68, 0x75, 0x5b, 0x00, 0x57, 0x29, 0x6b, 0xf5, 0x1b, 0xc3, 0x30, 0x89, 0x2b,
+	0xe1, 0x2c, 0xa5, 0xdb, 0x24, 0x90, 0x9a, 0x35, 0xfa, 0x8d, 0x61, 0x27, 0x09, 0xa4, 0x2e, 0xcd,
+	0xe5, 0x1b, 0x7c, 0x21, 0xfc, 0x9c, 0x05, 0x28, 0xc7, 0xa5, 0x70, 0x2e, 0xfc, 0x9c, 0xfe, 0x43,
+	0xda, 0xd2, 0x66, 0xbc, 0xb0, 0x19, 0x0b, 0x11, 0xb5, 0xa4, 0xcd, 0xbe, 0xd8, 0x0c, 0x9f, 0x70,
+	0xc0, 0x4d, 0xb9, 0x1e, 0x8b, 0xfa, 0x8d, 0x61, 0x9c, 0xc4, 0x85, 0x83, 0xcf, 0x65, 0x4d, 0x0f,
+	0xc8, 0x26, 0x02, 0xee, 0xa4, 0x59, 0x80, 0x63, 0xed, 0x7e, 0x38, 0xec, 0x24, 0x1b, 0xa8, 0x5d,
+	0xa0, 0x44, 0x27, 0x64, 0xeb, 0x46, 0x9b, 0xa5, 0xe6, 0xa9, 0xc9, 0x85, 0xd2, 0x8e, 0x35, 0x31,
+	0x9d, 0xff, 0xd7, 0xa4, 0x33, 0x41, 0x47, 0x9d, 0xc7, 0x26, 0x76, 0x55, 0x92, 0x1b, 0x78, 0xb2,
+	0xb9, 0x4a, 0xe9, 0x1e, 0x69, 0x55, 0xf3, 0x30, 0xec, 0x4e, 0x52, 0x57, 0xf4, 0x2d, 0xd9, 0xcb,
+	0x85, 0x9c, 0x2b, 0x0d, 0x1c, 0xe7, 0xf3, 0x4c, 0x5d, 0x83, 0x57, 0x39, 0xb0, 0x26, 0xa6, 0xd3,
+	0xab, 0x29, 0x5e, 0xf3, 0x53, 0xcd, 0xa6, 0x51, 0x1c, 0x74, 0xc3, 0x69, 0x14, 0x87, 0xdd, 0x68,
+	0x1a, 0xc5, 0x51, 0xb7, 0x39, 0x8d, 0xe2, 0x56, 0xb7, 0x3d, 0x38, 0x27, 0xbb, 0x13, 0xc8, 0x60,
+	0x26, 0xbc, 0x32, 0xfa, 0x1c, 0x6c, 0xae, 0x9c, 0x53, 0x46, 0x3b, 0xfa, 0x8e, 0x34, 0x6d, 0x91,
+	0x81, 0xab, 0x4f, 0x7d, 0xb0, 0x6e, 0x99, 0x5f, 0x8d, 0x49, 0x91, 0x41, 0x52, 0xf9, 0x07, 0x3f,
+	0x02, 0xb2, 0xfd, 0x9c, 0x50, 0x4a, 0x22, 0x2d, 0x72, 0xa8, 0x0f, 0x85, 0xff, 0x69, 0x8f, 0x34,
+	0xcd, 0x52, 0x83, 0x65, 0x01, 0x6e, 0x57, 0x15, 0xf4, 0x3f, 0xd2, 0xb1, 0x70, 0x5b, 0x80, 0xf3,
+	0xc6, 0xb2, 0x10, 0xc9, 0x93, 0x50, 0xae, 0x2e, 0xb2, 0xcc, 0x2c, 0x21, 0xe5, 0xde, 0x70, 0x95,
+	0x2f, 0xc0, 0x3a, 0xa3, 0x85, 0x07, 0x16, 0xa1, 0xb5, 0x57, 0xd3, 0x4b, 0x73, 0xf6, 0xc4, 0xe8,
+	0x2b, 0xd2, 0x7d, 0xec, 0x12, 0x45, 0xaa, 0x40, 0x4b, 0xc0, 0x0b, 0x75, 0x92, 0xbf, 0x6a, 0xfd,
+	0xa4, 0x96, 0xe9, 0x21, 0xd9, 0xf6, 0xc2, 0xce, 0xc0, 0xf3, 0x72, 0x51, 0x25, 0x81, 0xb5, 0xd0,
+	0xb8, 0x55, 0xa9, 0x17, 0x95, 0x48, 0x8f, 0xc9, 0x6e, 0x2e, 0xee, 0xf9, 0x9d, 0xc8, 0x54, 0xaa,
+	0xfc, 0x03, 0x4f, 0x0b, 0x8b, 0xcb, 0xb2, 0x36, 0x5e, 0xe0, 0xef, 0x5c, 0xdc, 0x7f, 0xad, 0xd9,
+	0xa4, 0x46, 0x83, 0x6f, 0x64, 0xbf, 0x6e, 0x3f, 0x91, 0xd2, 0x14, 0xda, 0xbb, 0xd5, 0xb4, 0xdf,
+	0x3f, 0x4f, 0xfb, 0x70, 0x4d, 0xda, 0xcf, 0xbb, 0x57, 0x13, 0xff, 0x48, 0xe8, 0x4b, 0xf8, 0xe7,
+	0xa1, 0x5f, 0xb5, 0xf0, 0xa3, 0xf0, 0xe6, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xd6, 0xfd,
+	0x81, 0x55, 0x04, 0x00, 0x00,
 }