Add support for super admin

pull/5028/head
Michael Desa 2017-10-31 18:27:24 -04:00
parent e111038816
commit 391bd189c1
5 changed files with 146 additions and 83 deletions

View File

@ -425,11 +425,12 @@ func MarshalUser(u *chronograf.User) ([]byte, error) {
}
}
return MarshalUserPB(&User{
ID: u.ID,
Name: u.Name,
Provider: u.Provider,
Scheme: u.Scheme,
Roles: roles,
ID: u.ID,
Name: u.Name,
Provider: u.Provider,
Scheme: u.Scheme,
Roles: roles,
SuperAdmin: u.SuperAdmin,
})
}
@ -457,6 +458,7 @@ func UnmarshalUser(data []byte, u *chronograf.User) error {
u.Name = pb.Name
u.Provider = pb.Provider
u.Scheme = pb.Scheme
u.SuperAdmin = pb.SuperAdmin
u.Roles = roles
return nil

View File

@ -305,11 +305,12 @@ func (*AlertRule) ProtoMessage() {}
func (*AlertRule) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{12} }
type User struct {
ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
Provider string `protobuf:"bytes,3,opt,name=Provider,proto3" json:"Provider,omitempty"`
Scheme string `protobuf:"bytes,4,opt,name=Scheme,proto3" json:"Scheme,omitempty"`
Roles []*Role `protobuf:"bytes,5,rep,name=Roles" json:"Roles,omitempty"`
ID uint64 `protobuf:"varint,1,opt,name=ID,proto3" json:"ID,omitempty"`
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
Provider string `protobuf:"bytes,3,opt,name=Provider,proto3" json:"Provider,omitempty"`
Scheme string `protobuf:"bytes,4,opt,name=Scheme,proto3" json:"Scheme,omitempty"`
Roles []*Role `protobuf:"bytes,5,rep,name=Roles" json:"Roles,omitempty"`
SuperAdmin bool `protobuf:"varint,6,opt,name=SuperAdmin,proto3" json:"SuperAdmin,omitempty"`
}
func (m *User) Reset() { *m = User{} }
@ -317,6 +318,34 @@ func (m *User) String() string { return proto.CompactTextString(m) }
func (*User) ProtoMessage() {}
func (*User) Descriptor() ([]byte, []int) { return fileDescriptorInternal, []int{13} }
func (m *User) GetID() uint64 {
if m != nil {
return m.ID
}
return 0
}
func (m *User) GetName() string {
if m != nil {
return m.Name
}
return ""
}
func (m *User) GetProvider() string {
if m != nil {
return m.Provider
}
return ""
}
func (m *User) GetScheme() string {
if m != nil {
return m.Scheme
}
return ""
}
func (m *User) GetRoles() []*Role {
if m != nil {
return m.Roles
@ -324,6 +353,13 @@ func (m *User) GetRoles() []*Role {
return nil
}
func (m *User) GetSuperAdmin() bool {
if m != nil {
return m.SuperAdmin
}
return false
}
type Role struct {
Organization string `protobuf:"bytes,1,opt,name=Organization,proto3" json:"Organization,omitempty"`
Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
@ -380,75 +416,76 @@ func init() {
func init() { proto.RegisterFile("internal.proto", fileDescriptorInternal) }
var fileDescriptorInternal = []byte{
// 1109 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0xe3, 0xc4,
0x17, 0x97, 0x63, 0x3b, 0x89, 0x5f, 0xba, 0xfd, 0x7e, 0x35, 0x5a, 0xb1, 0x66, 0xb9, 0x04, 0x0b,
0xa4, 0x20, 0xb1, 0x05, 0x75, 0x85, 0x84, 0x38, 0x20, 0xa5, 0x0d, 0x5a, 0x95, 0x76, 0x77, 0xcb,
0xa4, 0x2d, 0x27, 0xb4, 0x9a, 0x38, 0x2f, 0x89, 0xb5, 0x4e, 0x6c, 0xc6, 0x76, 0x1b, 0x73, 0xe6,
0x1f, 0xe1, 0xca, 0x11, 0x71, 0x47, 0xe2, 0x84, 0xf6, 0xc8, 0x5f, 0x84, 0xde, 0xcc, 0xd8, 0x71,
0x48, 0x58, 0xf5, 0x02, 0xb7, 0xf9, 0xbc, 0x37, 0x7e, 0xf3, 0x7e, 0x7d, 0x3e, 0x32, 0x1c, 0x46,
0xab, 0x1c, 0xe5, 0x4a, 0xc4, 0x47, 0xa9, 0x4c, 0xf2, 0x84, 0x75, 0x2b, 0x1c, 0xfc, 0xd9, 0x82,
0xf6, 0x38, 0x29, 0x64, 0x88, 0xec, 0x10, 0x5a, 0x67, 0x23, 0xdf, 0xea, 0x5b, 0x03, 0x9b, 0xb7,
0xce, 0x46, 0x8c, 0x81, 0xf3, 0x42, 0x2c, 0xd1, 0x6f, 0xf5, 0xad, 0x81, 0xc7, 0xd5, 0x99, 0x6c,
0x57, 0x65, 0x8a, 0xbe, 0xad, 0x6d, 0x74, 0x66, 0x8f, 0xa1, 0x7b, 0x9d, 0x51, 0xb4, 0x25, 0xfa,
0x8e, 0xb2, 0xd7, 0x98, 0x7c, 0x97, 0x22, 0xcb, 0xee, 0x12, 0x39, 0xf5, 0x5d, 0xed, 0xab, 0x30,
0xfb, 0x3f, 0xd8, 0xd7, 0xfc, 0xc2, 0x6f, 0x2b, 0x33, 0x1d, 0x99, 0x0f, 0x9d, 0x11, 0xce, 0x44,
0x11, 0xe7, 0x7e, 0xa7, 0x6f, 0x0d, 0xba, 0xbc, 0x82, 0x14, 0xe7, 0x0a, 0x63, 0x9c, 0x4b, 0x31,
0xf3, 0xbb, 0x3a, 0x4e, 0x85, 0xd9, 0x11, 0xb0, 0xb3, 0x55, 0x86, 0x61, 0x21, 0x71, 0xfc, 0x3a,
0x4a, 0x6f, 0x50, 0x46, 0xb3, 0xd2, 0xf7, 0x54, 0x80, 0x3d, 0x1e, 0x7a, 0xe5, 0x39, 0xe6, 0x82,
0xde, 0x06, 0x15, 0xaa, 0x82, 0x2c, 0x80, 0x83, 0xf1, 0x42, 0x48, 0x9c, 0x8e, 0x31, 0x94, 0x98,
0xfb, 0x3d, 0xe5, 0xde, 0xb2, 0xd1, 0x9d, 0x97, 0x72, 0x2e, 0x56, 0xd1, 0x0f, 0x22, 0x8f, 0x92,
0x95, 0x7f, 0xa0, 0xef, 0x34, 0x6d, 0xc1, 0xaf, 0x16, 0x78, 0x23, 0x91, 0x2d, 0x26, 0x89, 0x90,
0xd3, 0x7b, 0xf5, 0xf5, 0x09, 0xb8, 0x21, 0xc6, 0x71, 0xe6, 0xdb, 0x7d, 0x7b, 0xd0, 0x3b, 0x7e,
0x74, 0x54, 0x0f, 0xac, 0x8e, 0x73, 0x8a, 0x71, 0xcc, 0xf5, 0x2d, 0xf6, 0x29, 0x78, 0x39, 0x2e,
0xd3, 0x58, 0xe4, 0x98, 0xf9, 0x8e, 0xfa, 0x84, 0x6d, 0x3e, 0xb9, 0x32, 0x2e, 0xbe, 0xb9, 0xb4,
0x93, 0xb6, 0xbb, 0x27, 0xed, 0x9f, 0x5b, 0xf0, 0x60, 0xeb, 0x39, 0x76, 0x00, 0xd6, 0x5a, 0x65,
0xee, 0x72, 0x6b, 0x4d, 0xa8, 0x54, 0x59, 0xbb, 0xdc, 0x2a, 0x09, 0xdd, 0xa9, 0x3d, 0x70, 0xb9,
0x75, 0x47, 0x68, 0xa1, 0xa6, 0xef, 0x72, 0x6b, 0xc1, 0x3e, 0x82, 0xce, 0xf7, 0x05, 0xca, 0x08,
0x33, 0xdf, 0x55, 0xd9, 0xfd, 0x6f, 0x93, 0xdd, 0x37, 0x05, 0xca, 0x92, 0x57, 0x7e, 0xea, 0x86,
0xda, 0x1c, 0xbd, 0x06, 0xea, 0x4c, 0xb6, 0x9c, 0xb6, 0xac, 0xa3, 0x6d, 0x74, 0x36, 0x5d, 0xd4,
0xb3, 0xa7, 0x2e, 0x7e, 0x06, 0x8e, 0x58, 0x63, 0xe6, 0x7b, 0x2a, 0xfe, 0xfb, 0xff, 0xd0, 0xb0,
0xa3, 0xe1, 0x1a, 0xb3, 0xaf, 0x56, 0xb9, 0x2c, 0xb9, 0xba, 0xfe, 0xf8, 0x19, 0x78, 0xb5, 0x89,
0x36, 0xf0, 0x35, 0x96, 0xaa, 0x40, 0x8f, 0xd3, 0x91, 0x7d, 0x00, 0xee, 0xad, 0x88, 0x0b, 0x3d,
0x9c, 0xde, 0xf1, 0xe1, 0x26, 0xec, 0x70, 0x1d, 0x65, 0x5c, 0x3b, 0xbf, 0x68, 0x7d, 0x6e, 0x05,
0xbf, 0x58, 0xe0, 0x90, 0x8d, 0x3a, 0x1b, 0xe3, 0x5c, 0x84, 0xe5, 0x49, 0x52, 0xac, 0xa6, 0x99,
0x6f, 0xf5, 0xed, 0x81, 0xcd, 0xb7, 0x6c, 0xec, 0x1d, 0x68, 0x4f, 0xb4, 0xb7, 0xd5, 0xb7, 0x07,
0x1e, 0x37, 0x88, 0x3d, 0x04, 0x37, 0x16, 0x13, 0x8c, 0x0d, 0x9f, 0x34, 0xa0, 0xdb, 0xa9, 0xc4,
0x59, 0xb4, 0x36, 0x74, 0x32, 0x88, 0xec, 0x59, 0x31, 0x23, 0xbb, 0x9e, 0x9e, 0x41, 0xd4, 0xae,
0x89, 0xc8, 0xea, 0x16, 0xd2, 0x99, 0x22, 0x67, 0xa1, 0x88, 0xab, 0x1e, 0x6a, 0x10, 0xfc, 0x66,
0x11, 0x8f, 0xf4, 0x4e, 0x34, 0xf6, 0x52, 0x77, 0xf4, 0x5d, 0xe8, 0xd2, 0xbe, 0xbc, 0xba, 0x15,
0xd2, 0xec, 0x66, 0x87, 0xf0, 0x8d, 0x90, 0xec, 0x13, 0x68, 0xab, 0xca, 0xf7, 0xec, 0x67, 0x15,
0xee, 0x86, 0xfc, 0xdc, 0x5c, 0xab, 0x27, 0xe8, 0x34, 0x26, 0x58, 0x17, 0xeb, 0x36, 0x8b, 0x7d,
0x02, 0x2e, 0xad, 0x42, 0xa9, 0xb2, 0xdf, 0x1b, 0x59, 0x2f, 0x8c, 0xbe, 0x15, 0x5c, 0xc3, 0x83,
0xad, 0x17, 0xeb, 0x97, 0xac, 0xed, 0x97, 0x36, 0x53, 0xf4, 0xcc, 0xd4, 0x48, 0x43, 0x32, 0x8c,
0x31, 0xcc, 0x71, 0xaa, 0xfa, 0xdd, 0xe5, 0x35, 0x0e, 0x7e, 0xb2, 0x36, 0x71, 0xd5, 0x7b, 0xa4,
0x12, 0x61, 0xb2, 0x5c, 0x8a, 0xd5, 0xd4, 0x84, 0xae, 0x20, 0xf5, 0x6d, 0x3a, 0x31, 0xa1, 0x5b,
0xd3, 0x09, 0x61, 0x99, 0x9a, 0x09, 0xb6, 0x64, 0xca, 0xfa, 0xd0, 0x5b, 0xa2, 0xc8, 0x0a, 0x89,
0x4b, 0x5c, 0xe5, 0xa6, 0x05, 0x4d, 0x13, 0x7b, 0x04, 0x9d, 0x5c, 0xcc, 0x5f, 0xd1, 0xee, 0x99,
0x49, 0xe6, 0x62, 0x7e, 0x8e, 0x25, 0x7b, 0x0f, 0xbc, 0x59, 0x84, 0xf1, 0x54, 0xb9, 0xf4, 0x38,
0xbb, 0xca, 0x70, 0x8e, 0x65, 0xf0, 0x87, 0x05, 0xed, 0x31, 0xca, 0x5b, 0x94, 0xf7, 0x92, 0x94,
0xa6, 0x2c, 0xdb, 0x6f, 0x91, 0x65, 0x67, 0xbf, 0x2c, 0xbb, 0x1b, 0x59, 0x7e, 0x08, 0xee, 0x58,
0x86, 0x67, 0x23, 0x95, 0x91, 0xcd, 0x35, 0xa0, 0x6d, 0x1c, 0x86, 0x79, 0x74, 0x8b, 0x46, 0xab,
0x0d, 0xda, 0x51, 0x9a, 0xee, 0x1e, 0xa5, 0xf9, 0xdd, 0x82, 0xf6, 0x85, 0x28, 0x93, 0x22, 0xdf,
0xd9, 0xc2, 0x3e, 0xf4, 0x86, 0x69, 0x1a, 0x47, 0xa1, 0xfe, 0x5a, 0x57, 0xd4, 0x34, 0xd1, 0x8d,
0xe7, 0x8d, 0xfe, 0xea, 0xda, 0x9a, 0x26, 0x62, 0xf1, 0xa9, 0x52, 0x53, 0x2d, 0x8d, 0x0d, 0x16,
0x6b, 0x11, 0x55, 0x4e, 0x6a, 0xc2, 0xb0, 0xc8, 0x93, 0x59, 0x9c, 0xdc, 0xa9, 0x6a, 0xbb, 0xbc,
0xc6, 0x3b, 0x45, 0xb4, 0xf7, 0x14, 0xf1, 0xa6, 0x05, 0xce, 0x7f, 0xa5, 0x92, 0x07, 0x60, 0x45,
0x26, 0x09, 0x2b, 0xaa, 0x35, 0xb3, 0xd3, 0xd0, 0x4c, 0x1f, 0x3a, 0xa5, 0x14, 0xab, 0x39, 0x66,
0x7e, 0x57, 0x29, 0x50, 0x05, 0x95, 0x47, 0x71, 0x4d, 0x8b, 0xa5, 0xc7, 0x2b, 0x58, 0x73, 0x07,
0x1a, 0xdc, 0xf9, 0xd8, 0xe8, 0x6a, 0x4f, 0x65, 0xe4, 0x6f, 0xb7, 0xee, 0xdf, 0x93, 0xd3, 0x37,
0x16, 0xb8, 0x35, 0xf1, 0x4e, 0xb7, 0x89, 0x77, 0xba, 0x21, 0xde, 0xe8, 0xa4, 0x22, 0xde, 0xe8,
0x84, 0x30, 0xbf, 0xac, 0x88, 0xc7, 0x2f, 0x69, 0xa0, 0xcf, 0x64, 0x52, 0xa4, 0x27, 0xa5, 0x9e,
0xbc, 0xc7, 0x6b, 0x4c, 0xdb, 0xfa, 0xed, 0x02, 0xa5, 0x69, 0xb5, 0xc7, 0x0d, 0xa2, 0xdd, 0xbe,
0x50, 0xa2, 0xa4, 0x9b, 0xab, 0x01, 0xfb, 0x10, 0x5c, 0x4e, 0xcd, 0x53, 0x1d, 0xde, 0x9a, 0x8b,
0x32, 0x73, 0xed, 0xa5, 0xa0, 0xfa, 0xdf, 0xc9, 0x2c, 0xb9, 0x41, 0xc1, 0x53, 0xf3, 0x39, 0x45,
0xbf, 0x4e, 0x53, 0x94, 0x86, 0xaa, 0x1a, 0xa8, 0x37, 0x93, 0x3b, 0xd4, 0x2a, 0x6b, 0x73, 0x0d,
0x82, 0xef, 0xc0, 0x1b, 0xc6, 0x28, 0x73, 0x5e, 0xc4, 0xbb, 0xda, 0xcc, 0xc0, 0xf9, 0x7a, 0xfc,
0xf2, 0x45, 0x45, 0x70, 0x3a, 0x6f, 0x68, 0x69, 0xff, 0x8d, 0x96, 0xe7, 0x22, 0x15, 0x67, 0x23,
0xb5, 0x67, 0x36, 0x37, 0x28, 0xf8, 0xd1, 0x02, 0x87, 0xf8, 0xdf, 0x08, 0xed, 0xbc, 0x4d, 0x3b,
0x2e, 0x65, 0x72, 0x1b, 0x4d, 0x51, 0x56, 0xda, 0x51, 0x61, 0x55, 0x74, 0xb8, 0xc0, 0xfa, 0x67,
0xcf, 0x20, 0x9a, 0x35, 0x4f, 0xe2, 0x7a, 0x97, 0x1b, 0xb3, 0x26, 0x33, 0xd7, 0xce, 0xe0, 0x4b,
0x70, 0xe8, 0xb0, 0x43, 0x30, 0x6b, 0x97, 0x60, 0xfb, 0x32, 0x0b, 0x8e, 0xb7, 0xbf, 0xbb, 0x4f,
0x35, 0x93, 0xb6, 0xfa, 0xe9, 0x7d, 0xfa, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xe0, 0x82,
0xca, 0x06, 0x0b, 0x00, 0x00,
// 1123 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x8f, 0xdb, 0x44,
0x14, 0x96, 0x63, 0x3b, 0x89, 0x5f, 0xb6, 0x05, 0x8d, 0x2a, 0x6a, 0x8a, 0x84, 0x82, 0x05, 0x52,
0x90, 0xe8, 0x82, 0xb6, 0x42, 0x42, 0x1c, 0x90, 0xb2, 0x1b, 0x54, 0x2d, 0xbb, 0x6d, 0x97, 0xc9,
0xee, 0x72, 0x42, 0xd5, 0xc4, 0x79, 0x49, 0xac, 0x3a, 0xb1, 0x19, 0xdb, 0xbb, 0x31, 0xff, 0x0d,
0x12, 0x27, 0x8e, 0x88, 0x3b, 0x12, 0x27, 0xd4, 0x23, 0x7f, 0x11, 0x7a, 0x33, 0x63, 0xc7, 0x21,
0xa1, 0xda, 0x0b, 0xdc, 0xe6, 0x7b, 0x6f, 0xfc, 0xe6, 0xfd, 0xfa, 0x3e, 0x19, 0xee, 0x47, 0xab,
0x1c, 0xe5, 0x4a, 0xc4, 0x87, 0xa9, 0x4c, 0xf2, 0x84, 0x75, 0x2b, 0x1c, 0xfc, 0xd5, 0x82, 0xf6,
0x38, 0x29, 0x64, 0x88, 0xec, 0x3e, 0xb4, 0x4e, 0x47, 0xbe, 0xd5, 0xb7, 0x06, 0x36, 0x6f, 0x9d,
0x8e, 0x18, 0x03, 0xe7, 0xb9, 0x58, 0xa2, 0xdf, 0xea, 0x5b, 0x03, 0x8f, 0xab, 0x33, 0xd9, 0x2e,
0xcb, 0x14, 0x7d, 0x5b, 0xdb, 0xe8, 0xcc, 0x1e, 0x41, 0xf7, 0x2a, 0xa3, 0x68, 0x4b, 0xf4, 0x1d,
0x65, 0xaf, 0x31, 0xf9, 0x2e, 0x44, 0x96, 0xdd, 0x26, 0x72, 0xea, 0xbb, 0xda, 0x57, 0x61, 0xf6,
0x36, 0xd8, 0x57, 0xfc, 0xdc, 0x6f, 0x2b, 0x33, 0x1d, 0x99, 0x0f, 0x9d, 0x11, 0xce, 0x44, 0x11,
0xe7, 0x7e, 0xa7, 0x6f, 0x0d, 0xba, 0xbc, 0x82, 0x14, 0xe7, 0x12, 0x63, 0x9c, 0x4b, 0x31, 0xf3,
0xbb, 0x3a, 0x4e, 0x85, 0xd9, 0x21, 0xb0, 0xd3, 0x55, 0x86, 0x61, 0x21, 0x71, 0xfc, 0x2a, 0x4a,
0xaf, 0x51, 0x46, 0xb3, 0xd2, 0xf7, 0x54, 0x80, 0x3d, 0x1e, 0x7a, 0xe5, 0x19, 0xe6, 0x82, 0xde,
0x06, 0x15, 0xaa, 0x82, 0x2c, 0x80, 0x83, 0xf1, 0x42, 0x48, 0x9c, 0x8e, 0x31, 0x94, 0x98, 0xfb,
0x3d, 0xe5, 0xde, 0xb2, 0xd1, 0x9d, 0x17, 0x72, 0x2e, 0x56, 0xd1, 0x8f, 0x22, 0x8f, 0x92, 0x95,
0x7f, 0xa0, 0xef, 0x34, 0x6d, 0xc1, 0x6f, 0x16, 0x78, 0x23, 0x91, 0x2d, 0x26, 0x89, 0x90, 0xd3,
0x3b, 0xf5, 0xf5, 0x31, 0xb8, 0x21, 0xc6, 0x71, 0xe6, 0xdb, 0x7d, 0x7b, 0xd0, 0x3b, 0x7a, 0x78,
0x58, 0x0f, 0xac, 0x8e, 0x73, 0x82, 0x71, 0xcc, 0xf5, 0x2d, 0xf6, 0x19, 0x78, 0x39, 0x2e, 0xd3,
0x58, 0xe4, 0x98, 0xf9, 0x8e, 0xfa, 0x84, 0x6d, 0x3e, 0xb9, 0x34, 0x2e, 0xbe, 0xb9, 0xb4, 0x93,
0xb6, 0xbb, 0x27, 0xed, 0x5f, 0x5a, 0x70, 0x6f, 0xeb, 0x39, 0x76, 0x00, 0xd6, 0x5a, 0x65, 0xee,
0x72, 0x6b, 0x4d, 0xa8, 0x54, 0x59, 0xbb, 0xdc, 0x2a, 0x09, 0xdd, 0xaa, 0x3d, 0x70, 0xb9, 0x75,
0x4b, 0x68, 0xa1, 0xa6, 0xef, 0x72, 0x6b, 0xc1, 0x3e, 0x86, 0xce, 0x0f, 0x05, 0xca, 0x08, 0x33,
0xdf, 0x55, 0xd9, 0xbd, 0xb5, 0xc9, 0xee, 0xdb, 0x02, 0x65, 0xc9, 0x2b, 0x3f, 0x75, 0x43, 0x6d,
0x8e, 0x5e, 0x03, 0x75, 0x26, 0x5b, 0x4e, 0x5b, 0xd6, 0xd1, 0x36, 0x3a, 0x9b, 0x2e, 0xea, 0xd9,
0x53, 0x17, 0x3f, 0x07, 0x47, 0xac, 0x31, 0xf3, 0x3d, 0x15, 0xff, 0x83, 0x7f, 0x69, 0xd8, 0xe1,
0x70, 0x8d, 0xd9, 0xd7, 0xab, 0x5c, 0x96, 0x5c, 0x5d, 0x7f, 0xf4, 0x14, 0xbc, 0xda, 0x44, 0x1b,
0xf8, 0x0a, 0x4b, 0x55, 0xa0, 0xc7, 0xe9, 0xc8, 0x3e, 0x04, 0xf7, 0x46, 0xc4, 0x85, 0x1e, 0x4e,
0xef, 0xe8, 0xfe, 0x26, 0xec, 0x70, 0x1d, 0x65, 0x5c, 0x3b, 0xbf, 0x6c, 0x7d, 0x61, 0x05, 0xbf,
0x5a, 0xe0, 0x90, 0x8d, 0x3a, 0x1b, 0xe3, 0x5c, 0x84, 0xe5, 0x71, 0x52, 0xac, 0xa6, 0x99, 0x6f,
0xf5, 0xed, 0x81, 0xcd, 0xb7, 0x6c, 0xec, 0x1d, 0x68, 0x4f, 0xb4, 0xb7, 0xd5, 0xb7, 0x07, 0x1e,
0x37, 0x88, 0x3d, 0x00, 0x37, 0x16, 0x13, 0x8c, 0x0d, 0x9f, 0x34, 0xa0, 0xdb, 0xa9, 0xc4, 0x59,
0xb4, 0x36, 0x74, 0x32, 0x88, 0xec, 0x59, 0x31, 0x23, 0xbb, 0x9e, 0x9e, 0x41, 0xd4, 0xae, 0x89,
0xc8, 0xea, 0x16, 0xd2, 0x99, 0x22, 0x67, 0xa1, 0x88, 0xab, 0x1e, 0x6a, 0x10, 0xfc, 0x6e, 0x11,
0x8f, 0xf4, 0x4e, 0x34, 0xf6, 0x52, 0x77, 0xf4, 0x5d, 0xe8, 0xd2, 0xbe, 0xbc, 0xbc, 0x11, 0xd2,
0xec, 0x66, 0x87, 0xf0, 0xb5, 0x90, 0xec, 0x53, 0x68, 0xab, 0xca, 0xf7, 0xec, 0x67, 0x15, 0xee,
0x9a, 0xfc, 0xdc, 0x5c, 0xab, 0x27, 0xe8, 0x34, 0x26, 0x58, 0x17, 0xeb, 0x36, 0x8b, 0x7d, 0x0c,
0x2e, 0xad, 0x42, 0xa9, 0xb2, 0xdf, 0x1b, 0x59, 0x2f, 0x8c, 0xbe, 0x15, 0x5c, 0xc1, 0xbd, 0xad,
0x17, 0xeb, 0x97, 0xac, 0xed, 0x97, 0x36, 0x53, 0xf4, 0xcc, 0xd4, 0x48, 0x43, 0x32, 0x8c, 0x31,
0xcc, 0x71, 0xaa, 0xfa, 0xdd, 0xe5, 0x35, 0x0e, 0x7e, 0xb2, 0x36, 0x71, 0xd5, 0x7b, 0xa4, 0x12,
0x61, 0xb2, 0x5c, 0x8a, 0xd5, 0xd4, 0x84, 0xae, 0x20, 0xf5, 0x6d, 0x3a, 0x31, 0xa1, 0x5b, 0xd3,
0x09, 0x61, 0x99, 0x9a, 0x09, 0xb6, 0x64, 0xca, 0xfa, 0xd0, 0x5b, 0xa2, 0xc8, 0x0a, 0x89, 0x4b,
0x5c, 0xe5, 0xa6, 0x05, 0x4d, 0x13, 0x7b, 0x08, 0x9d, 0x5c, 0xcc, 0x5f, 0xd2, 0xee, 0x99, 0x49,
0xe6, 0x62, 0x7e, 0x86, 0x25, 0x7b, 0x0f, 0xbc, 0x59, 0x84, 0xf1, 0x54, 0xb9, 0xf4, 0x38, 0xbb,
0xca, 0x70, 0x86, 0x65, 0xf0, 0xa7, 0x05, 0xed, 0x31, 0xca, 0x1b, 0x94, 0x77, 0x92, 0x94, 0xa6,
0x2c, 0xdb, 0x6f, 0x90, 0x65, 0x67, 0xbf, 0x2c, 0xbb, 0x1b, 0x59, 0x7e, 0x00, 0xee, 0x58, 0x86,
0xa7, 0x23, 0x95, 0x91, 0xcd, 0x35, 0xa0, 0x6d, 0x1c, 0x86, 0x79, 0x74, 0x83, 0x46, 0xab, 0x0d,
0xda, 0x51, 0x9a, 0xee, 0x1e, 0xa5, 0xf9, 0xc3, 0x82, 0xf6, 0xb9, 0x28, 0x93, 0x22, 0xdf, 0xd9,
0xc2, 0x3e, 0xf4, 0x86, 0x69, 0x1a, 0x47, 0xa1, 0xfe, 0x5a, 0x57, 0xd4, 0x34, 0xd1, 0x8d, 0x67,
0x8d, 0xfe, 0xea, 0xda, 0x9a, 0x26, 0x62, 0xf1, 0x89, 0x52, 0x53, 0x2d, 0x8d, 0x0d, 0x16, 0x6b,
0x11, 0x55, 0x4e, 0x6a, 0xc2, 0xb0, 0xc8, 0x93, 0x59, 0x9c, 0xdc, 0xaa, 0x6a, 0xbb, 0xbc, 0xc6,
0x3b, 0x45, 0xb4, 0xf7, 0x14, 0xf1, 0xba, 0x05, 0xce, 0xff, 0xa5, 0x92, 0x07, 0x60, 0x45, 0x26,
0x09, 0x2b, 0xaa, 0x35, 0xb3, 0xd3, 0xd0, 0x4c, 0x1f, 0x3a, 0xa5, 0x14, 0xab, 0x39, 0x66, 0x7e,
0x57, 0x29, 0x50, 0x05, 0x95, 0x47, 0x71, 0x4d, 0x8b, 0xa5, 0xc7, 0x2b, 0x58, 0x73, 0x07, 0x1a,
0xdc, 0xf9, 0xc4, 0xe8, 0x6a, 0x4f, 0x65, 0xe4, 0x6f, 0xb7, 0xee, 0xbf, 0x93, 0xd3, 0xd7, 0x16,
0xb8, 0x35, 0xf1, 0x4e, 0xb6, 0x89, 0x77, 0xb2, 0x21, 0xde, 0xe8, 0xb8, 0x22, 0xde, 0xe8, 0x98,
0x30, 0xbf, 0xa8, 0x88, 0xc7, 0x2f, 0x68, 0xa0, 0x4f, 0x65, 0x52, 0xa4, 0xc7, 0xa5, 0x9e, 0xbc,
0xc7, 0x6b, 0x4c, 0xdb, 0xfa, 0xdd, 0x02, 0xa5, 0x69, 0xb5, 0xc7, 0x0d, 0xa2, 0xdd, 0x3e, 0x57,
0xa2, 0xa4, 0x9b, 0xab, 0x01, 0xfb, 0x08, 0x5c, 0x4e, 0xcd, 0x53, 0x1d, 0xde, 0x9a, 0x8b, 0x32,
0x73, 0xed, 0xa5, 0xa0, 0xfa, 0xdf, 0xc9, 0x2c, 0xb9, 0x41, 0xc1, 0x13, 0xf3, 0x39, 0x45, 0xbf,
0x4a, 0x53, 0x94, 0x86, 0xaa, 0x1a, 0xa8, 0x37, 0x93, 0x5b, 0xd4, 0x2a, 0x6b, 0x73, 0x0d, 0x82,
0xef, 0xc1, 0x1b, 0xc6, 0x28, 0x73, 0x5e, 0xc4, 0xbb, 0xda, 0xcc, 0xc0, 0xf9, 0x66, 0xfc, 0xe2,
0x79, 0x45, 0x70, 0x3a, 0x6f, 0x68, 0x69, 0xff, 0x83, 0x96, 0x67, 0x22, 0x15, 0xa7, 0x23, 0xb5,
0x67, 0x36, 0x37, 0x28, 0xf8, 0xd9, 0x02, 0x87, 0xf8, 0xdf, 0x08, 0xed, 0xbc, 0x49, 0x3b, 0x2e,
0x64, 0x72, 0x13, 0x4d, 0x51, 0x56, 0xda, 0x51, 0x61, 0x55, 0x74, 0xb8, 0xc0, 0xfa, 0x67, 0xcf,
0x20, 0x9a, 0x35, 0x4f, 0xe2, 0x7a, 0x97, 0x1b, 0xb3, 0x26, 0x33, 0xd7, 0x4e, 0xf6, 0x3e, 0xc0,
0xb8, 0x48, 0x51, 0x0e, 0xa7, 0xcb, 0x48, 0xd3, 0xaa, 0xcb, 0x1b, 0x96, 0xe0, 0x2b, 0x70, 0xe8,
0xe2, 0x0e, 0x01, 0xad, 0x5d, 0x02, 0xee, 0xcb, 0x3c, 0x38, 0xda, 0xfe, 0xee, 0x2e, 0xd5, 0x4e,
0xda, 0xea, 0xa7, 0xf8, 0xc9, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x31, 0x7a, 0x41, 0x26,
0x0b, 0x00, 0x00,
}

View File

@ -133,11 +133,12 @@ message User {
string Provider = 3; // Provider is the provider that certifies and issues this user's authentication, e.g. GitHub
string Scheme = 4; // Scheme is the scheme used to perform this user's authentication, e.g. OAuth2 or LDAP
repeated Role Roles = 5; // Roles is set of roles a user has
bool SuperAdmin = 6; // SuperAdmin is bool that specifies whether a user is a super admin
}
message Role {
string Organization = 1; // Organization is the ID of the organization that this user has a role in
string Name = 2; // Name is the name of the role of this user in the respective organization
string Name = 2; // Name is the name of the role of this user in the respective organization
}
message Organization {

View File

@ -626,6 +626,7 @@ type User struct {
Provider string `json:"provider,omitempty"`
Scheme string `json:"scheme,omitempty"`
CurrentOrganization string `json:"currentOrganization,omitempty"`
SuperAdmin bool `json:"superAdmin,omitempty"`
}
// UserQuery represents the attributes that a user may be retrieved by.

View File

@ -105,7 +105,29 @@ func AuthorizedUser(
}
ctx = context.WithValue(ctx, "organizationID", p.Organization)
u, err := store.Users(ctx).Get(ctx, chronograf.UserQuery{
// TODO: add real implementation
serverCtx := context.WithValue(ctx, "superadmin", true)
// TODO: seems silly to look up a user twice
u, err := store.Users(serverCtx).Get(serverCtx, chronograf.UserQuery{
Name: &p.Subject,
Provider: &p.Issuer,
Scheme: &scheme,
})
if err != nil {
log.Error("Failed to retrieve user")
Error(w, http.StatusUnauthorized, "User is not authorized", logger)
return
}
if u.SuperAdmin {
// This context is where superadmin gets set for all things
r = r.WithContext(serverCtx)
next(w, r)
return
}
u, err = store.Users(ctx).Get(ctx, chronograf.UserQuery{
Name: &p.Subject,
Provider: &p.Issuer,
Scheme: &scheme,