Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Unified Diff: tokenserver/api/admin/v1/admin.pb.go

Issue 2413683004: token-server: Delegation config import, validation and evaluation. (Closed)
Patch Set: also check validity_duration Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tokenserver/api/admin/v1/admin.proto ('k') | tokenserver/api/admin/v1/adminserver_dec.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ad8a66457f974a504b1361315246b24db8bb3e55..412a3bd8e74a7e3d08df75f918f6e00f9ed7bc3f 100644
--- a/tokenserver/api/admin/v1/admin.pb.go
+++ b/tokenserver/api/admin/v1/admin.pb.go
@@ -256,10 +256,18 @@ const _ = grpc.SupportPackageIsVersion3
type AdminClient interface {
// ImportCAConfigs makes the server read CA configs from luci-config.
//
+ // This reads 'tokenserver.cfg' file.
+ //
// Note that regularly configs are read in background each 5 min.
// ImportCAConfigs can be used to force config reread immediately. It will
// block until the configs are read.
ImportCAConfigs(ctx context.Context, in *google_protobuf.Empty, opts ...grpc.CallOption) (*ImportedConfigs, error)
+ // ImportDelegationConfigs makes the server read 'delegation.cfg' config.
+ //
+ // Note that regularly configs are read in background each 5 min.
+ // ImportDelegationConfigs can be used to force config reread immediately. It
+ // will block until the configs are read.
+ ImportDelegationConfigs(ctx context.Context, in *google_protobuf.Empty, opts ...grpc.CallOption) (*ImportedConfigs, error)
// InspectMachineToken decodes a machine token and verifies it is valid.
//
// It verifies the token was signed by a private key of the token server and
@@ -294,6 +302,15 @@ func (c *adminPRPCClient) ImportCAConfigs(ctx context.Context, in *google_protob
return out, nil
}
+func (c *adminPRPCClient) ImportDelegationConfigs(ctx context.Context, in *google_protobuf.Empty, opts ...grpc.CallOption) (*ImportedConfigs, error) {
+ out := new(ImportedConfigs)
+ err := c.client.Call(ctx, "tokenserver.admin.Admin", "ImportDelegationConfigs", in, out, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
func (c *adminPRPCClient) InspectMachineToken(ctx context.Context, in *InspectMachineTokenRequest, opts ...grpc.CallOption) (*InspectMachineTokenResponse, error) {
out := new(InspectMachineTokenResponse)
err := c.client.Call(ctx, "tokenserver.admin.Admin", "InspectMachineToken", in, out, opts...)
@@ -320,6 +337,15 @@ func (c *adminClient) ImportCAConfigs(ctx context.Context, in *google_protobuf.E
return out, nil
}
+func (c *adminClient) ImportDelegationConfigs(ctx context.Context, in *google_protobuf.Empty, opts ...grpc.CallOption) (*ImportedConfigs, error) {
+ out := new(ImportedConfigs)
+ err := grpc.Invoke(ctx, "/tokenserver.admin.Admin/ImportDelegationConfigs", in, out, c.cc, opts...)
+ if err != nil {
+ return nil, err
+ }
+ return out, nil
+}
+
func (c *adminClient) InspectMachineToken(ctx context.Context, in *InspectMachineTokenRequest, opts ...grpc.CallOption) (*InspectMachineTokenResponse, error) {
out := new(InspectMachineTokenResponse)
err := grpc.Invoke(ctx, "/tokenserver.admin.Admin/InspectMachineToken", in, out, c.cc, opts...)
@@ -334,10 +360,18 @@ func (c *adminClient) InspectMachineToken(ctx context.Context, in *InspectMachin
type AdminServer interface {
// ImportCAConfigs makes the server read CA configs from luci-config.
//
+ // This reads 'tokenserver.cfg' file.
+ //
// Note that regularly configs are read in background each 5 min.
// ImportCAConfigs can be used to force config reread immediately. It will
// block until the configs are read.
ImportCAConfigs(context.Context, *google_protobuf.Empty) (*ImportedConfigs, error)
+ // ImportDelegationConfigs makes the server read 'delegation.cfg' config.
+ //
+ // Note that regularly configs are read in background each 5 min.
+ // ImportDelegationConfigs can be used to force config reread immediately. It
+ // will block until the configs are read.
+ ImportDelegationConfigs(context.Context, *google_protobuf.Empty) (*ImportedConfigs, error)
// InspectMachineToken decodes a machine token and verifies it is valid.
//
// It verifies the token was signed by a private key of the token server and
@@ -378,6 +412,24 @@ func _Admin_ImportCAConfigs_Handler(srv interface{}, ctx context.Context, dec fu
return interceptor(ctx, in, info, handler)
}
+func _Admin_ImportDelegationConfigs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+ in := new(google_protobuf.Empty)
+ if err := dec(in); err != nil {
+ return nil, err
+ }
+ if interceptor == nil {
+ return srv.(AdminServer).ImportDelegationConfigs(ctx, in)
+ }
+ info := &grpc.UnaryServerInfo{
+ Server: srv,
+ FullMethod: "/tokenserver.admin.Admin/ImportDelegationConfigs",
+ }
+ handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+ return srv.(AdminServer).ImportDelegationConfigs(ctx, req.(*google_protobuf.Empty))
+ }
+ return interceptor(ctx, in, info, handler)
+}
+
func _Admin_InspectMachineToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(InspectMachineTokenRequest)
if err := dec(in); err != nil {
@@ -405,6 +457,10 @@ var _Admin_serviceDesc = grpc.ServiceDesc{
Handler: _Admin_ImportCAConfigs_Handler,
},
{
+ MethodName: "ImportDelegationConfigs",
+ Handler: _Admin_ImportDelegationConfigs_Handler,
+ },
+ {
MethodName: "InspectMachineToken",
Handler: _Admin_InspectMachineToken_Handler,
},
@@ -418,36 +474,37 @@ func init() {
}
var fileDescriptor0 = []byte{
- // 493 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x6e, 0xd3, 0x40,
- 0x10, 0x26, 0x2d, 0x09, 0xed, 0x24, 0x6a, 0xd3, 0xa5, 0xaa, 0x2c, 0x57, 0x88, 0x2a, 0xe2, 0x50,
- 0x09, 0x65, 0x2d, 0xc2, 0x91, 0x5e, 0x4a, 0x54, 0x44, 0x84, 0xca, 0xc1, 0xea, 0x81, 0xdb, 0xca,
- 0xb1, 0xa7, 0xee, 0xaa, 0xf1, 0xee, 0x62, 0x6f, 0x22, 0xfc, 0x48, 0xbc, 0x0b, 0xef, 0xc0, 0xab,
- 0xb0, 0x3f, 0x4e, 0x9a, 0x40, 0x80, 0x5e, 0x92, 0x99, 0x6f, 0xbe, 0x99, 0xf9, 0xbc, 0xf3, 0xc1,
- 0x45, 0xce, 0xf5, 0xdd, 0x7c, 0x4a, 0x53, 0x59, 0x44, 0xb3, 0x79, 0xca, 0xdd, 0xcf, 0x30, 0x97,
- 0x91, 0x96, 0xf7, 0x28, 0x2a, 0x2c, 0x17, 0x58, 0x46, 0x89, 0xe2, 0x51, 0x92, 0x15, 0x5c, 0x44,
- 0x8b, 0x37, 0x3e, 0xa0, 0xaa, 0x94, 0x5a, 0x92, 0xa3, 0x35, 0x16, 0x75, 0x85, 0xf0, 0x34, 0x97,
- 0x32, 0x9f, 0x61, 0xe4, 0x08, 0xd3, 0xf9, 0x6d, 0x84, 0x85, 0xd2, 0xb5, 0xe7, 0x87, 0xef, 0x1e,
- 0xbb, 0xad, 0x48, 0xd2, 0x3b, 0x2e, 0x90, 0x39, 0xdc, 0x37, 0x0f, 0xbe, 0xb7, 0xe0, 0x70, 0x52,
- 0x28, 0x59, 0x6a, 0xcc, 0xc6, 0x52, 0xdc, 0xf2, 0xbc, 0x22, 0x5f, 0xa0, 0xcf, 0x1b, 0x88, 0xa5,
- 0x1e, 0x0b, 0x5a, 0x67, 0xbb, 0xe7, 0xdd, 0xd1, 0x90, 0xfe, 0xa1, 0x8d, 0xfe, 0xd6, 0x4d, 0xfd,
- 0xff, 0x07, 0x3e, 0xc3, 0xf8, 0x90, 0x6f, 0xd6, 0xc2, 0x0b, 0x80, 0x87, 0x32, 0x21, 0xf0, 0x54,
- 0x24, 0x05, 0x9a, 0xd9, 0xad, 0xf3, 0xfd, 0xd8, 0xc5, 0x24, 0x84, 0xbd, 0x12, 0x17, 0xbc, 0xe2,
- 0x52, 0x04, 0x3b, 0x0e, 0x5f, 0xe5, 0x03, 0x05, 0xe1, 0x44, 0x54, 0x0a, 0x53, 0x7d, 0xed, 0xbf,
- 0xe4, 0xc6, 0x8a, 0x89, 0xf1, 0xeb, 0x1c, 0x2b, 0x4d, 0xcc, 0x6c, 0x27, 0x8e, 0xe9, 0x5a, 0xf9,
- 0x99, 0x07, 0xa3, 0x17, 0x1b, 0x7a, 0xd7, 0xbb, 0x6e, 0x0c, 0x29, 0xde, 0xd7, 0xcb, 0x90, 0x1c,
- 0x43, 0xdb, 0x25, 0xcd, 0x52, 0x9f, 0x0c, 0x7e, 0xee, 0xc0, 0xe9, 0xd6, 0x95, 0x95, 0x92, 0x66,
- 0xaa, 0xed, 0x5a, 0x24, 0x33, 0x9e, 0xb9, 0x75, 0x7b, 0xb1, 0x4f, 0xc8, 0x6b, 0x38, 0xe2, 0xc2,
- 0x85, 0x5c, 0xd7, 0xac, 0xc4, 0xa4, 0x5a, 0x7d, 0x4c, 0xff, 0xa1, 0x10, 0x3b, 0x9c, 0x9c, 0x40,
- 0xa7, 0xe2, 0xb9, 0xc0, 0x2c, 0xd8, 0x75, 0x33, 0x9a, 0x8c, 0xbc, 0x84, 0xae, 0x90, 0x82, 0xe1,
- 0x37, 0xc5, 0x4b, 0x53, 0x1c, 0xba, 0x22, 0x18, 0xe8, 0xca, 0x23, 0x4b, 0x82, 0x79, 0x1d, 0x23,
- 0x29, 0x0b, 0xda, 0x2b, 0x42, 0xec, 0x11, 0xf2, 0x0a, 0x0e, 0xec, 0x2c, 0x2e, 0x72, 0x76, 0x8f,
- 0x35, 0x33, 0x2a, 0x3b, 0x4e, 0x43, 0xaf, 0x41, 0x3f, 0x61, 0x3d, 0xc9, 0xc8, 0x19, 0xf4, 0x52,
- 0x2c, 0x35, 0x4b, 0x13, 0xe6, 0x8e, 0xf1, 0xcc, 0x71, 0xc0, 0x62, 0xe3, 0xe4, 0xb3, 0x3d, 0xc9,
- 0x35, 0x10, 0xeb, 0x28, 0xb6, 0x61, 0x9f, 0xe0, 0xd8, 0xf0, 0xba, 0xff, 0x78, 0xe0, 0xf7, 0x32,
- 0xab, 0x3f, 0x3e, 0x89, 0xfb, 0xb6, 0x75, 0x03, 0xef, 0xad, 0xdf, 0x69, 0xf4, 0xa3, 0x05, 0xed,
- 0x4b, 0xeb, 0x23, 0xb3, 0xa6, 0x31, 0xe2, 0xf8, 0x72, 0x69, 0xc4, 0x13, 0xea, 0x7d, 0x4f, 0x97,
- 0xbe, 0xa7, 0x57, 0xd6, 0xf7, 0xe1, 0xe0, 0xff, 0x36, 0x24, 0x1a, 0x9e, 0x6f, 0xb9, 0x1c, 0xd9,
- 0xea, 0xe0, 0xbf, 0x9a, 0x2a, 0xa4, 0x8f, 0xa5, 0x7b, 0x43, 0x4c, 0x3b, 0x4e, 0xe9, 0xdb, 0x5f,
- 0x01, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x3b, 0x4f, 0xb9, 0x02, 0x04, 0x00, 0x00,
+ // 509 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x53, 0xc1, 0x6e, 0xd3, 0x40,
+ 0x10, 0x25, 0x29, 0x09, 0xed, 0x24, 0x6a, 0xd3, 0xa5, 0x2a, 0x96, 0x2b, 0x44, 0x14, 0x71, 0x88,
+ 0x84, 0xb2, 0x16, 0xe1, 0x48, 0x2e, 0x25, 0x14, 0x11, 0xa1, 0x70, 0xb0, 0x8a, 0xc4, 0x6d, 0xe5,
+ 0xd8, 0x53, 0x77, 0x15, 0x7b, 0x77, 0xb1, 0x37, 0x16, 0xfe, 0x1e, 0x4e, 0x7c, 0x15, 0xbf, 0x82,
+ 0xbc, 0x1b, 0xa7, 0x09, 0x04, 0xe8, 0x81, 0x8b, 0x3d, 0xf3, 0xe6, 0xcd, 0xcc, 0x5b, 0xef, 0x33,
+ 0x4c, 0x62, 0xae, 0x6f, 0x57, 0x0b, 0x1a, 0xca, 0xd4, 0x4b, 0x56, 0x21, 0x37, 0x8f, 0x51, 0x2c,
+ 0x3d, 0x2d, 0x97, 0x28, 0x72, 0xcc, 0x0a, 0xcc, 0xbc, 0x40, 0x71, 0x2f, 0x88, 0x52, 0x2e, 0xbc,
+ 0xe2, 0xa5, 0x0d, 0xa8, 0xca, 0xa4, 0x96, 0xe4, 0x74, 0x8b, 0x45, 0x4d, 0xc1, 0xbd, 0x88, 0xa5,
+ 0x8c, 0x13, 0xf4, 0x0c, 0x61, 0xb1, 0xba, 0xf1, 0x30, 0x55, 0xba, 0xb4, 0x7c, 0xf7, 0xf5, 0x7d,
+ 0xb7, 0xa5, 0x41, 0x78, 0xcb, 0x05, 0x32, 0x83, 0xdb, 0xe6, 0xc1, 0xf7, 0x06, 0x9c, 0xcc, 0x52,
+ 0x25, 0x33, 0x8d, 0xd1, 0x54, 0x8a, 0x1b, 0x1e, 0xe7, 0xe4, 0x33, 0xf4, 0xf8, 0x1a, 0x62, 0xa1,
+ 0xc5, 0x9c, 0x46, 0xff, 0x60, 0xd8, 0x19, 0x8f, 0xe8, 0x6f, 0xda, 0xe8, 0x2f, 0xdd, 0xd4, 0xbe,
+ 0xdf, 0xf1, 0x04, 0xfd, 0x13, 0xbe, 0x5b, 0x73, 0x27, 0x00, 0x77, 0x65, 0x42, 0xe0, 0xa1, 0x08,
+ 0x52, 0x74, 0x1a, 0xfd, 0xc6, 0xf0, 0xc8, 0x37, 0x31, 0x71, 0xe1, 0x30, 0xc3, 0x82, 0xe7, 0x5c,
+ 0x0a, 0xa7, 0x69, 0xf0, 0x4d, 0x3e, 0x50, 0xe0, 0xce, 0x44, 0xae, 0x30, 0xd4, 0x73, 0x7b, 0x92,
+ 0xeb, 0x4a, 0x8c, 0x8f, 0x5f, 0x56, 0x98, 0x6b, 0x32, 0x01, 0x30, 0xe2, 0x98, 0x2e, 0x95, 0x9d,
+ 0x79, 0x3c, 0x7e, 0xba, 0xa3, 0x77, 0xbb, 0xeb, 0xba, 0x54, 0xe8, 0x1f, 0xe9, 0x3a, 0x24, 0x67,
+ 0xd0, 0x32, 0xc9, 0x7a, 0xa9, 0x4d, 0x06, 0x3f, 0x9a, 0x70, 0xb1, 0x77, 0x65, 0xae, 0xa4, 0xc8,
+ 0x4d, 0x57, 0x11, 0x24, 0x3c, 0x32, 0xeb, 0x0e, 0x7d, 0x9b, 0x90, 0x17, 0x70, 0xca, 0x85, 0x09,
+ 0xb9, 0x2e, 0x59, 0x86, 0x41, 0xbe, 0x39, 0x4c, 0xef, 0xae, 0xe0, 0x1b, 0x9c, 0x9c, 0x43, 0x3b,
+ 0xe7, 0xb1, 0xc0, 0xc8, 0x39, 0x30, 0x33, 0xd6, 0x19, 0x79, 0x06, 0x1d, 0x21, 0x05, 0xc3, 0xaf,
+ 0x8a, 0x67, 0x18, 0x39, 0x23, 0x53, 0x04, 0x21, 0xc5, 0x95, 0x45, 0x6a, 0x42, 0x86, 0x85, 0x5c,
+ 0x62, 0xe4, 0xb4, 0x36, 0x04, 0xdf, 0x22, 0xe4, 0x39, 0x1c, 0x57, 0xb3, 0xb8, 0x88, 0xd9, 0x12,
+ 0x4b, 0xc6, 0x23, 0xa7, 0x6d, 0x34, 0x74, 0xd7, 0xe8, 0x07, 0x2c, 0x67, 0x11, 0xe9, 0x43, 0x37,
+ 0xc4, 0x4c, 0xb3, 0x30, 0x60, 0xe6, 0x32, 0x1e, 0x19, 0x0e, 0x54, 0xd8, 0x34, 0xf8, 0x58, 0x5d,
+ 0xc9, 0x1c, 0x48, 0xe5, 0x28, 0xb6, 0x63, 0x1f, 0xe7, 0xac, 0xdf, 0x18, 0x76, 0xfe, 0xf2, 0x81,
+ 0xdf, 0xc8, 0xa8, 0x7c, 0xff, 0xc0, 0xef, 0x55, 0xad, 0x3b, 0x78, 0x77, 0xfb, 0x9e, 0xc6, 0xdf,
+ 0x9a, 0xd0, 0xba, 0xac, 0x7c, 0x44, 0xe6, 0xb5, 0x11, 0xa7, 0x97, 0xb5, 0x11, 0xcf, 0xa9, 0xf5,
+ 0x3d, 0xad, 0x7d, 0x4f, 0xaf, 0x2a, 0xdf, 0xbb, 0x83, 0x7f, 0xdb, 0x90, 0x7c, 0x82, 0x27, 0x16,
+ 0x7a, 0x8b, 0x09, 0xc6, 0x81, 0xe6, 0x52, 0xfc, 0x8f, 0xb1, 0x1a, 0x1e, 0xef, 0x31, 0x04, 0xd9,
+ 0xfb, 0x63, 0xfc, 0xd1, 0xab, 0x2e, 0xbd, 0x2f, 0xdd, 0xfa, 0x6c, 0xd1, 0x36, 0x4a, 0x5f, 0xfd,
+ 0x0c, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x23, 0xa2, 0xeb, 0x59, 0x04, 0x00, 0x00,
}
« no previous file with comments | « tokenserver/api/admin/v1/admin.proto ('k') | tokenserver/api/admin/v1/adminserver_dec.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698