diff --git a/command/event.go b/command/event.go index 5bbff253..ff2364cc 100644 --- a/command/event.go +++ b/command/event.go @@ -39,6 +39,36 @@ func MarshalEvent(e *Event) ([]byte, error) { } } switch e.Payload.Command.RequestType { + case "ScheduleOSUpdateScan": + payload.Command.ScheduleOsUpdateScan = &commandproto.ScheduleOSUpdateScan{ + Force: e.Payload.Command.ScheduleOSUpdateScan.Force, + } + case "ScheduleOSUpdate": + p := e.Payload.Command.ScheduleOSUpdate + var updates []*commandproto.OSUpdate + for _, update := range p.Updates { + updates = append(updates, &commandproto.OSUpdate{ + ProductKey: update.ProductKey, + }) + } + payload.Command.ScheduleOsUpdate = &commandproto.ScheduleOSUpdate{ + Updates: updates, + } + case "AccountConfiguration": + p := e.Payload.Command.AccountConfiguration + payload.Command.AccountConfiguration = &commandproto.AccountConfiguration{ + SkipPrimarySetupAccountCreation: p.SkipPrimarySetupAccountCreation, + SetPrimarySetupAccountAsRegularUser: p.SetPrimarySetupAccountAsRegularUser, + } + for _, account := range p.AutoSetupAdminAccounts { + payload.Command.AccountConfiguration.AutoSetupAdminAccounts = append( + payload.Command.AccountConfiguration.AutoSetupAdminAccounts, &commandproto.AutoSetupAdminAccounts{ + ShortName: account.ShortName, + FullName: account.FullName, + PasswordHash: account.PasswordHash, + Hidden: account.Hidden, + }) + } case "DeviceInformation": payload.Command.DeviceInformation = &commandproto.DeviceInformation{ Queries: e.Payload.Command.DeviceInformation.Queries, @@ -90,6 +120,37 @@ func UnmarshalEvent(data []byte, e *Event) error { RequestType: pb.Payload.Command.RequestType, } switch pb.Payload.Command.RequestType { + case "ScheduleOSUpdateScan": + cmd := pb.Payload.Command.GetScheduleOsUpdateScan() + e.Payload.Command.ScheduleOSUpdateScan = mdm.ScheduleOSUpdateScan{ + Force: cmd.GetForce(), + } + case "ScheduleOSUpdate": + cmd := pb.Payload.Command.GetScheduleOsUpdate() + var updates []mdm.OSUpdate + for _, update := range cmd.GetUpdates() { + updates = append(updates, mdm.OSUpdate{ + ProductKey: update.GetProductKey(), + InstallAction: update.GetInstallAction(), + }) + } + e.Payload.Command.ScheduleOSUpdate = mdm.ScheduleOSUpdate{ + Updates: updates, + } + case "AccountConfiguration": + cmd := pb.Payload.Command.GetAccountConfiguration() + e.Payload.Command.AccountConfiguration = mdm.AccountConfiguration{ + SkipPrimarySetupAccountCreation: cmd.GetSkipPrimarySetupAccountCreation(), + SetPrimarySetupAccountAsRegularUser: cmd.GetSetPrimarySetupAccountAsRegularUser(), + } + for _, account := range cmd.GetAutoSetupAdminAccounts() { + e.Payload.Command.AccountConfiguration.AutoSetupAdminAccounts = append(e.Payload.Command.AutoSetupAdminAccounts, mdm.AdminAccount{ + ShortName: account.GetShortName(), + FullName: account.GetFullName(), + PasswordHash: account.GetPasswordHash(), + Hidden: account.GetHidden(), + }) + } case "DeviceInformation": e.Payload.Command.DeviceInformation = mdm.DeviceInformation{ Queries: pb.Payload.Command.DeviceInformation.Queries, diff --git a/command/internal/commandproto/command.pb.go b/command/internal/commandproto/command.pb.go index 9487423a..36c7f6c9 100644 --- a/command/internal/commandproto/command.pb.go +++ b/command/internal/commandproto/command.pb.go @@ -12,6 +12,11 @@ It has these top-level messages: Event Payload Command + ScheduleOSUpdate + OSUpdate + ScheduleOSUpdateScan + AccountConfiguration + AutoSetupAdminAccounts DeviceInformation InstallProfile InstallApplication @@ -98,10 +103,13 @@ func (m *Payload) GetCommand() *Command { } type Command struct { - RequestType string `protobuf:"bytes,1,opt,name=request_type,json=requestType" json:"request_type,omitempty"` - DeviceInformation *DeviceInformation `protobuf:"bytes,2,opt,name=device_information,json=deviceInformation" json:"device_information,omitempty"` - InstallProfile *InstallProfile `protobuf:"bytes,3,opt,name=install_profile,json=installProfile" json:"install_profile,omitempty"` - InstallApplication *InstallApplication `protobuf:"bytes,4,opt,name=install_application,json=installApplication" json:"install_application,omitempty"` + RequestType string `protobuf:"bytes,1,opt,name=request_type,json=requestType" json:"request_type,omitempty"` + DeviceInformation *DeviceInformation `protobuf:"bytes,2,opt,name=device_information,json=deviceInformation" json:"device_information,omitempty"` + InstallProfile *InstallProfile `protobuf:"bytes,3,opt,name=install_profile,json=installProfile" json:"install_profile,omitempty"` + InstallApplication *InstallApplication `protobuf:"bytes,4,opt,name=install_application,json=installApplication" json:"install_application,omitempty"` + AccountConfiguration *AccountConfiguration `protobuf:"bytes,5,opt,name=account_configuration,json=accountConfiguration" json:"account_configuration,omitempty"` + ScheduleOsUpdate *ScheduleOSUpdate `protobuf:"bytes,6,opt,name=schedule_os_update,json=scheduleOsUpdate" json:"schedule_os_update,omitempty"` + ScheduleOsUpdateScan *ScheduleOSUpdateScan `protobuf:"bytes,7,opt,name=schedule_os_update_scan,json=scheduleOsUpdateScan" json:"schedule_os_update_scan,omitempty"` } func (m *Command) Reset() { *m = Command{} } @@ -137,6 +145,155 @@ func (m *Command) GetInstallApplication() *InstallApplication { return nil } +func (m *Command) GetAccountConfiguration() *AccountConfiguration { + if m != nil { + return m.AccountConfiguration + } + return nil +} + +func (m *Command) GetScheduleOsUpdate() *ScheduleOSUpdate { + if m != nil { + return m.ScheduleOsUpdate + } + return nil +} + +func (m *Command) GetScheduleOsUpdateScan() *ScheduleOSUpdateScan { + if m != nil { + return m.ScheduleOsUpdateScan + } + return nil +} + +type ScheduleOSUpdate struct { + Updates []*OSUpdate `protobuf:"bytes,1,rep,name=updates" json:"updates,omitempty"` +} + +func (m *ScheduleOSUpdate) Reset() { *m = ScheduleOSUpdate{} } +func (m *ScheduleOSUpdate) String() string { return proto.CompactTextString(m) } +func (*ScheduleOSUpdate) ProtoMessage() {} +func (*ScheduleOSUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } + +func (m *ScheduleOSUpdate) GetUpdates() []*OSUpdate { + if m != nil { + return m.Updates + } + return nil +} + +type OSUpdate struct { + ProductKey string `protobuf:"bytes,1,opt,name=product_key,json=productKey" json:"product_key,omitempty"` + InstallAction string `protobuf:"bytes,2,opt,name=install_action,json=installAction" json:"install_action,omitempty"` +} + +func (m *OSUpdate) Reset() { *m = OSUpdate{} } +func (m *OSUpdate) String() string { return proto.CompactTextString(m) } +func (*OSUpdate) ProtoMessage() {} +func (*OSUpdate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } + +func (m *OSUpdate) GetProductKey() string { + if m != nil { + return m.ProductKey + } + return "" +} + +func (m *OSUpdate) GetInstallAction() string { + if m != nil { + return m.InstallAction + } + return "" +} + +type ScheduleOSUpdateScan struct { + Force bool `protobuf:"varint,1,opt,name=force" json:"force,omitempty"` +} + +func (m *ScheduleOSUpdateScan) Reset() { *m = ScheduleOSUpdateScan{} } +func (m *ScheduleOSUpdateScan) String() string { return proto.CompactTextString(m) } +func (*ScheduleOSUpdateScan) ProtoMessage() {} +func (*ScheduleOSUpdateScan) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } + +func (m *ScheduleOSUpdateScan) GetForce() bool { + if m != nil { + return m.Force + } + return false +} + +type AccountConfiguration struct { + SkipPrimarySetupAccountCreation bool `protobuf:"varint,1,opt,name=skip_primary_setup_account_creation,json=skipPrimarySetupAccountCreation" json:"skip_primary_setup_account_creation,omitempty"` + SetPrimarySetupAccountAsRegularUser bool `protobuf:"varint,2,opt,name=set_primary_setup_account_as_regular_user,json=setPrimarySetupAccountAsRegularUser" json:"set_primary_setup_account_as_regular_user,omitempty"` + AutoSetupAdminAccounts []*AutoSetupAdminAccounts `protobuf:"bytes,3,rep,name=auto_setup_admin_accounts,json=autoSetupAdminAccounts" json:"auto_setup_admin_accounts,omitempty"` +} + +func (m *AccountConfiguration) Reset() { *m = AccountConfiguration{} } +func (m *AccountConfiguration) String() string { return proto.CompactTextString(m) } +func (*AccountConfiguration) ProtoMessage() {} +func (*AccountConfiguration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } + +func (m *AccountConfiguration) GetSkipPrimarySetupAccountCreation() bool { + if m != nil { + return m.SkipPrimarySetupAccountCreation + } + return false +} + +func (m *AccountConfiguration) GetSetPrimarySetupAccountAsRegularUser() bool { + if m != nil { + return m.SetPrimarySetupAccountAsRegularUser + } + return false +} + +func (m *AccountConfiguration) GetAutoSetupAdminAccounts() []*AutoSetupAdminAccounts { + if m != nil { + return m.AutoSetupAdminAccounts + } + return nil +} + +type AutoSetupAdminAccounts struct { + ShortName string `protobuf:"bytes,1,opt,name=short_name,json=shortName" json:"short_name,omitempty"` + FullName string `protobuf:"bytes,2,opt,name=full_name,json=fullName" json:"full_name,omitempty"` + PasswordHash []byte `protobuf:"bytes,3,opt,name=password_hash,json=passwordHash,proto3" json:"password_hash,omitempty"` + Hidden bool `protobuf:"varint,4,opt,name=hidden" json:"hidden,omitempty"` +} + +func (m *AutoSetupAdminAccounts) Reset() { *m = AutoSetupAdminAccounts{} } +func (m *AutoSetupAdminAccounts) String() string { return proto.CompactTextString(m) } +func (*AutoSetupAdminAccounts) ProtoMessage() {} +func (*AutoSetupAdminAccounts) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } + +func (m *AutoSetupAdminAccounts) GetShortName() string { + if m != nil { + return m.ShortName + } + return "" +} + +func (m *AutoSetupAdminAccounts) GetFullName() string { + if m != nil { + return m.FullName + } + return "" +} + +func (m *AutoSetupAdminAccounts) GetPasswordHash() []byte { + if m != nil { + return m.PasswordHash + } + return nil +} + +func (m *AutoSetupAdminAccounts) GetHidden() bool { + if m != nil { + return m.Hidden + } + return false +} + type DeviceInformation struct { Queries []string `protobuf:"bytes,1,rep,name=queries" json:"queries,omitempty"` } @@ -144,7 +301,7 @@ type DeviceInformation struct { func (m *DeviceInformation) Reset() { *m = DeviceInformation{} } func (m *DeviceInformation) String() string { return proto.CompactTextString(m) } func (*DeviceInformation) ProtoMessage() {} -func (*DeviceInformation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } +func (*DeviceInformation) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *DeviceInformation) GetQueries() []string { if m != nil { @@ -160,7 +317,7 @@ type InstallProfile struct { func (m *InstallProfile) Reset() { *m = InstallProfile{} } func (m *InstallProfile) String() string { return proto.CompactTextString(m) } func (*InstallProfile) ProtoMessage() {} -func (*InstallProfile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } +func (*InstallProfile) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } func (m *InstallProfile) GetPayload() []byte { if m != nil { @@ -181,7 +338,7 @@ type InstallApplication struct { func (m *InstallApplication) Reset() { *m = InstallApplication{} } func (m *InstallApplication) String() string { return proto.CompactTextString(m) } func (*InstallApplication) ProtoMessage() {} -func (*InstallApplication) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } +func (*InstallApplication) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } func (m *InstallApplication) GetItunesStoreId() int64 { if m != nil { @@ -229,6 +386,11 @@ func init() { proto.RegisterType((*Event)(nil), "commandproto.Event") proto.RegisterType((*Payload)(nil), "commandproto.Payload") proto.RegisterType((*Command)(nil), "commandproto.Command") + proto.RegisterType((*ScheduleOSUpdate)(nil), "commandproto.ScheduleOSUpdate") + proto.RegisterType((*OSUpdate)(nil), "commandproto.OSUpdate") + proto.RegisterType((*ScheduleOSUpdateScan)(nil), "commandproto.ScheduleOSUpdateScan") + proto.RegisterType((*AccountConfiguration)(nil), "commandproto.AccountConfiguration") + proto.RegisterType((*AutoSetupAdminAccounts)(nil), "commandproto.AutoSetupAdminAccounts") proto.RegisterType((*DeviceInformation)(nil), "commandproto.DeviceInformation") proto.RegisterType((*InstallProfile)(nil), "commandproto.InstallProfile") proto.RegisterType((*InstallApplication)(nil), "commandproto.InstallApplication") @@ -237,35 +399,56 @@ func init() { func init() { proto.RegisterFile("command.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 468 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x4f, 0x6f, 0xd3, 0x40, - 0x10, 0xc5, 0x65, 0x3b, 0x6d, 0xc8, 0xa4, 0x4d, 0xe8, 0xa2, 0x0a, 0x1f, 0x10, 0x35, 0x3e, 0x20, - 0x83, 0x44, 0x90, 0x40, 0xe2, 0x8e, 0xa0, 0x48, 0x39, 0x14, 0x95, 0x2d, 0x39, 0x22, 0x6b, 0xc9, - 0xae, 0xc3, 0x48, 0xf6, 0xae, 0x6b, 0xaf, 0x23, 0xe5, 0xc0, 0x89, 0xef, 0xc0, 0xe7, 0x45, 0xfb, - 0xc7, 0xf9, 0x43, 0x7a, 0xcb, 0xfc, 0xe6, 0xe5, 0xcd, 0xf3, 0xcc, 0xc2, 0xf9, 0x52, 0x55, 0x15, - 0x93, 0x7c, 0x56, 0x37, 0x4a, 0x2b, 0x72, 0xe6, 0x4b, 0x5b, 0xa5, 0xbf, 0xe1, 0xe4, 0x7a, 0x2d, - 0xa4, 0x26, 0x13, 0x08, 0x91, 0xc7, 0x41, 0x12, 0x64, 0x23, 0x1a, 0x22, 0x27, 0x04, 0x06, 0x1a, - 0x2b, 0x11, 0x87, 0x49, 0x90, 0x45, 0xd4, 0xfe, 0x26, 0x6f, 0x61, 0x58, 0xb3, 0x4d, 0xa9, 0x18, - 0x8f, 0xa3, 0x24, 0xc8, 0xc6, 0xef, 0x2e, 0x67, 0xfb, 0x66, 0xb3, 0x5b, 0xd7, 0xa4, 0xbd, 0x8a, - 0x5c, 0xc1, 0x98, 0x8b, 0x35, 0x2e, 0x45, 0xde, 0x71, 0xe4, 0xf1, 0xc0, 0xba, 0x83, 0x43, 0x0b, - 0x8e, 0x3c, 0xfd, 0x01, 0x43, 0xff, 0x27, 0xf2, 0x02, 0xfa, 0x64, 0x79, 0xd7, 0x6d, 0xa3, 0x8c, - 0x3d, 0x5b, 0x74, 0xc8, 0xcd, 0x7c, 0x5f, 0xda, 0x58, 0x47, 0xf3, 0x3f, 0xb9, 0x82, 0xf6, 0xaa, - 0xf4, 0x6f, 0x08, 0x43, 0x0f, 0x8d, 0x7f, 0x23, 0xee, 0x3b, 0xd1, 0xea, 0x5c, 0x6f, 0x6a, 0xd1, - 0xfb, 0x7b, 0xf6, 0x7d, 0x53, 0x0b, 0xf2, 0x15, 0x88, 0x8f, 0x8b, 0xb2, 0x50, 0x4d, 0xc5, 0x34, - 0x2a, 0xe9, 0x47, 0x5d, 0x1d, 0x8e, 0xfa, 0x6c, 0x75, 0xf3, 0x9d, 0x8c, 0x5e, 0xf0, 0xff, 0x11, - 0xb9, 0x86, 0x29, 0xca, 0x56, 0xb3, 0xb2, 0xcc, 0xeb, 0x46, 0x15, 0x58, 0x0a, 0xbf, 0xb7, 0x67, - 0x87, 0x66, 0x73, 0x27, 0xba, 0x75, 0x1a, 0x3a, 0xc1, 0x83, 0x9a, 0x7c, 0x83, 0x27, 0xbd, 0x0d, - 0xab, 0xeb, 0x12, 0x97, 0x2e, 0xd7, 0xc0, 0x5a, 0x25, 0x0f, 0x5a, 0x7d, 0xdc, 0xe9, 0x28, 0xc1, - 0x23, 0x96, 0xbe, 0x81, 0x8b, 0xa3, 0x2f, 0x20, 0x31, 0x0c, 0xef, 0x3b, 0xd1, 0xa0, 0x68, 0xe3, - 0x20, 0x89, 0xb2, 0x11, 0xed, 0xcb, 0xf4, 0x35, 0x4c, 0x0e, 0x33, 0x1a, 0x6d, 0xff, 0x14, 0xcc, - 0x22, 0xcf, 0xb6, 0x37, 0x4f, 0xff, 0x84, 0x40, 0x8e, 0x53, 0x90, 0x97, 0x30, 0x45, 0xdd, 0x49, - 0xd1, 0xe6, 0xad, 0x56, 0x8d, 0xc8, 0xfd, 0x85, 0x23, 0x7a, 0xee, 0xf0, 0x9d, 0xa1, 0x73, 0x4e, - 0x9e, 0x03, 0x20, 0x17, 0x52, 0x63, 0x81, 0xa2, 0xb1, 0xbb, 0x1f, 0xd1, 0x3d, 0x62, 0xce, 0x58, - 0x31, 0x89, 0x85, 0xb9, 0x63, 0xd7, 0x94, 0x76, 0xa1, 0x23, 0x3a, 0xee, 0xd9, 0xa2, 0x29, 0xc9, - 0x2b, 0x78, 0x5c, 0x31, 0xc9, 0x56, 0xa2, 0x12, 0x52, 0xe7, 0x45, 0xc9, 0x56, 0xad, 0x5d, 0x56, - 0x44, 0xa7, 0x3b, 0xfe, 0xc5, 0x60, 0xf3, 0x40, 0xa5, 0xd2, 0xb9, 0xc3, 0x3c, 0x3e, 0x49, 0x82, - 0xec, 0x11, 0x05, 0xa9, 0xf4, 0x8d, 0x23, 0xe4, 0x03, 0x3c, 0x5d, 0xfe, 0x62, 0x72, 0x25, 0xf2, - 0x3d, 0xcb, 0x56, 0x33, 0x2d, 0xe2, 0x53, 0x3b, 0xf9, 0xd2, 0xb5, 0x6f, 0xb6, 0xdd, 0x3b, 0xd3, - 0xfc, 0x79, 0x6a, 0xcf, 0xf1, 0xfe, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xe7, 0xa3, 0x8e, - 0x7d, 0x03, 0x00, 0x00, + // 813 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x94, 0x5b, 0x6f, 0x1b, 0x45, + 0x14, 0xc7, 0x65, 0x3b, 0x89, 0xed, 0xe3, 0xdc, 0x3a, 0x38, 0xe9, 0x22, 0xa0, 0x31, 0x1b, 0x40, + 0x29, 0x82, 0x80, 0x8a, 0xc4, 0x7b, 0xd4, 0x16, 0x11, 0x41, 0xdb, 0x30, 0xc6, 0x20, 0x1e, 0xd0, + 0x68, 0xd8, 0x19, 0xdb, 0xa3, 0xee, 0xce, 0x6c, 0xe7, 0x52, 0xe4, 0x07, 0x9e, 0xf8, 0x04, 0xbc, + 0xf1, 0xc2, 0x77, 0x45, 0x3b, 0x17, 0xc7, 0xb7, 0xbe, 0xf9, 0xfc, 0xe7, 0x3f, 0xbf, 0x73, 0xc6, + 0xe7, 0xec, 0x81, 0xa3, 0x42, 0x55, 0x15, 0x95, 0xec, 0xba, 0xd6, 0xca, 0x2a, 0x74, 0x18, 0x43, + 0x1f, 0xe5, 0x7f, 0xc1, 0xfe, 0xf3, 0xb7, 0x5c, 0x5a, 0x74, 0x0c, 0x6d, 0xc1, 0xb2, 0xd6, 0xa8, + 0x75, 0xd5, 0xc7, 0x6d, 0xc1, 0x10, 0x82, 0x3d, 0x2b, 0x2a, 0x9e, 0xb5, 0x47, 0xad, 0xab, 0x0e, + 0xf6, 0xbf, 0xd1, 0x57, 0xd0, 0xad, 0xe9, 0xa2, 0x54, 0x94, 0x65, 0x9d, 0x51, 0xeb, 0x6a, 0xf0, + 0xe4, 0xec, 0x7a, 0x15, 0x76, 0x7d, 0x17, 0x0e, 0x71, 0x72, 0xa1, 0x0b, 0x18, 0x30, 0xfe, 0x56, + 0x14, 0x9c, 0x38, 0x26, 0x58, 0xb6, 0xe7, 0xe9, 0x10, 0xa4, 0x09, 0x13, 0x2c, 0xff, 0x1d, 0xba, + 0xf1, 0x12, 0xfa, 0x18, 0x52, 0x65, 0xc4, 0xb9, 0x65, 0x29, 0x83, 0xa8, 0x4d, 0x9c, 0x60, 0x4d, + 0xfe, 0x18, 0xfa, 0xb2, 0xb6, 0xf2, 0x3f, 0x0d, 0x01, 0x4e, 0xae, 0xfc, 0xdf, 0x3d, 0xe8, 0x46, + 0xb1, 0xe1, 0x6b, 0xfe, 0xc6, 0x71, 0x63, 0x89, 0x5d, 0xd4, 0x3c, 0xf1, 0xa3, 0xf6, 0xf3, 0xa2, + 0xe6, 0xe8, 0x25, 0xa0, 0x58, 0xae, 0x90, 0x53, 0xa5, 0x2b, 0x6a, 0x85, 0x92, 0x31, 0xd5, 0xc5, + 0x7a, 0xaa, 0x67, 0xde, 0x77, 0x7b, 0x6f, 0xc3, 0x0f, 0xd8, 0xa6, 0x84, 0x9e, 0xc3, 0x89, 0x90, + 0xc6, 0xd2, 0xb2, 0x24, 0xb5, 0x56, 0x53, 0x51, 0xf2, 0xf8, 0xbf, 0x7d, 0xb8, 0x0e, 0xbb, 0x0d, + 0xa6, 0xbb, 0xe0, 0xc1, 0xc7, 0x62, 0x2d, 0x46, 0x3f, 0xc1, 0x7b, 0x09, 0x43, 0xeb, 0xba, 0x14, + 0x45, 0xa8, 0x6b, 0xcf, 0xa3, 0x46, 0x3b, 0x51, 0x37, 0xf7, 0x3e, 0x8c, 0xc4, 0x96, 0x86, 0x7e, + 0x85, 0x33, 0x5a, 0x14, 0xca, 0x49, 0x4b, 0x0a, 0x25, 0xa7, 0x62, 0xe6, 0x74, 0x80, 0xee, 0x7b, + 0x68, 0xbe, 0x0e, 0xbd, 0x09, 0xd6, 0xa7, 0xab, 0x4e, 0x3c, 0xa4, 0x3b, 0x54, 0xf4, 0x23, 0x20, + 0x53, 0xcc, 0x39, 0x73, 0x25, 0x27, 0xca, 0x10, 0x57, 0x33, 0x6a, 0x79, 0x76, 0xe0, 0xa9, 0x8f, + 0xd6, 0xa9, 0xe3, 0xe8, 0x7b, 0x35, 0x9e, 0x78, 0x17, 0x3e, 0x4d, 0x37, 0x5f, 0x99, 0xa0, 0xa0, + 0xdf, 0xe0, 0xe1, 0x36, 0x8d, 0x98, 0x82, 0xca, 0xac, 0xbb, 0xab, 0xd0, 0x4d, 0xe4, 0xb8, 0xa0, + 0x12, 0x0f, 0x37, 0xb1, 0x8d, 0x9a, 0x3f, 0x83, 0xd3, 0x4d, 0x37, 0xfa, 0x1a, 0xba, 0x21, 0x85, + 0xc9, 0x5a, 0xa3, 0xce, 0xd5, 0xe0, 0xc9, 0xf9, 0x3a, 0x7e, 0x59, 0x69, 0xb2, 0xe5, 0x18, 0x7a, + 0xcb, 0xdb, 0x17, 0x30, 0xa8, 0xb5, 0x62, 0xae, 0xb0, 0xe4, 0x35, 0x5f, 0xc4, 0xf9, 0x82, 0x28, + 0xfd, 0xc0, 0x17, 0xe8, 0x53, 0x38, 0x5e, 0xf6, 0xb1, 0x58, 0x8e, 0x56, 0x1f, 0x1f, 0xa5, 0x06, + 0x79, 0x31, 0xff, 0x02, 0x86, 0xbb, 0xde, 0x81, 0x86, 0xb0, 0x3f, 0x55, 0xba, 0x08, 0x93, 0xdb, + 0xc3, 0x21, 0xc8, 0xff, 0x6b, 0xc3, 0xf0, 0x66, 0x77, 0x27, 0x2e, 0xcd, 0x6b, 0x51, 0x93, 0x5a, + 0x8b, 0x8a, 0xea, 0x05, 0x31, 0xdc, 0xba, 0x9a, 0x2c, 0xbb, 0xae, 0x79, 0x68, 0x78, 0x80, 0x5d, + 0x34, 0xd6, 0xbb, 0xe0, 0x1c, 0x37, 0xc6, 0x84, 0x8c, 0x36, 0xf4, 0x0b, 0x3c, 0x36, 0xdc, 0xbe, + 0x03, 0x46, 0x0d, 0xd1, 0x7c, 0xe6, 0x4a, 0xaa, 0x89, 0x33, 0x5c, 0xfb, 0x67, 0xf5, 0xf0, 0xa5, + 0xe1, 0x76, 0x07, 0xf2, 0xc6, 0xe0, 0xe0, 0x9d, 0x18, 0xae, 0x11, 0x81, 0xf7, 0xa9, 0xb3, 0x2a, + 0x01, 0x59, 0x25, 0x64, 0xc2, 0x9a, 0xac, 0xe3, 0x9b, 0xf0, 0xc9, 0xc6, 0x30, 0x3a, 0xab, 0x02, + 0xaf, 0x31, 0x47, 0xa8, 0xc1, 0xe7, 0x74, 0xa7, 0x9e, 0xff, 0xd3, 0x82, 0xf3, 0xdd, 0x57, 0xd0, + 0x47, 0x00, 0x66, 0xae, 0xb4, 0x25, 0x92, 0x56, 0x69, 0x1f, 0xf4, 0xbd, 0xf2, 0x92, 0x56, 0x1c, + 0x7d, 0x00, 0xfd, 0xa9, 0x2b, 0xcb, 0x70, 0x1a, 0x3a, 0xd5, 0x6b, 0x04, 0x7f, 0x78, 0x09, 0x47, + 0x35, 0x35, 0xe6, 0x4f, 0xa5, 0x19, 0x99, 0x53, 0x33, 0xf7, 0x1f, 0xf6, 0x21, 0x3e, 0x4c, 0xe2, + 0xf7, 0xd4, 0xcc, 0xd1, 0x39, 0x1c, 0xcc, 0x05, 0x63, 0x3c, 0x7c, 0xab, 0x3d, 0x1c, 0xa3, 0xfc, + 0x4b, 0x78, 0xb0, 0xb5, 0x3f, 0x50, 0x06, 0xdd, 0x37, 0x8e, 0x6b, 0x11, 0x87, 0xaf, 0x8f, 0x53, + 0x98, 0x7f, 0x0e, 0xc7, 0xeb, 0x1b, 0xa2, 0xf1, 0xa6, 0x45, 0xdc, 0xf2, 0x79, 0x53, 0x98, 0xff, + 0xdd, 0x06, 0xb4, 0xbd, 0x03, 0xd0, 0x67, 0x70, 0x22, 0xac, 0x93, 0xdc, 0x10, 0x63, 0x95, 0xe6, + 0x24, 0xee, 0xd7, 0x0e, 0x3e, 0x0a, 0xf2, 0xb8, 0x51, 0x6f, 0x19, 0x7a, 0x04, 0x20, 0x18, 0x97, + 0x56, 0x4c, 0x45, 0xec, 0x63, 0x1f, 0xaf, 0x28, 0xcd, 0x12, 0xad, 0xa8, 0x14, 0xd3, 0x66, 0x8b, + 0x3a, 0x5d, 0xfa, 0x57, 0xf7, 0xf1, 0x20, 0x69, 0x13, 0x5d, 0xa2, 0xc7, 0x70, 0x5a, 0x51, 0x49, + 0x67, 0xbc, 0xe2, 0xd2, 0x92, 0x69, 0x49, 0x67, 0xc6, 0x3f, 0xbf, 0x83, 0x4f, 0xee, 0xf5, 0xef, + 0x1a, 0xb9, 0xf9, 0x62, 0xa4, 0xb2, 0x24, 0xc8, 0xcc, 0xef, 0x9e, 0x1e, 0x06, 0xa9, 0xec, 0x8b, + 0xa0, 0xa0, 0x6f, 0xe1, 0x61, 0x31, 0xa7, 0x72, 0xc6, 0xc9, 0x0a, 0xd2, 0xd8, 0xb4, 0x52, 0xfa, + 0xf8, 0x2c, 0x1c, 0xbf, 0x58, 0x9e, 0x8e, 0x9b, 0xc3, 0x3f, 0x0e, 0xfc, 0xa8, 0x7c, 0xf3, 0x7f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x5a, 0x6f, 0x19, 0xfb, 0x06, 0x00, 0x00, } diff --git a/command/internal/commandproto/command.proto b/command/internal/commandproto/command.proto index 185e5d53..48a7c098 100644 --- a/command/internal/commandproto/command.proto +++ b/command/internal/commandproto/command.proto @@ -19,6 +19,35 @@ message Command { DeviceInformation device_information = 2; InstallProfile install_profile = 3; InstallApplication install_application = 4; + AccountConfiguration account_configuration = 5; + ScheduleOSUpdate schedule_os_update = 6; + ScheduleOSUpdateScan schedule_os_update_scan = 7; +} + +message ScheduleOSUpdate { + repeated OSUpdate updates = 1; +} + +message OSUpdate { + string product_key = 1; + string install_action = 2; +} + +message ScheduleOSUpdateScan { + bool force = 1; +} + +message AccountConfiguration { + bool skip_primary_setup_account_creation = 1; + bool set_primary_setup_account_as_regular_user = 2; + repeated AutoSetupAdminAccounts auto_setup_admin_accounts = 3; +} + +message AutoSetupAdminAccounts { + string short_name = 1; + string full_name = 2; + bytes password_hash = 3; + bool hidden = 4; } message DeviceInformation { diff --git a/command/testdata/DeviceInformation.plist b/command/testdata/DeviceInformation.plist index f5f78e9e..3c0a9496 100755 --- a/command/testdata/DeviceInformation.plist +++ b/command/testdata/DeviceInformation.plist @@ -1,3 +1,3 @@ -CommandOptionsQueriesfoobarRequestTypeDeviceInformationCommandUUID7564fecc-f1b5-4d2d-af17-986fdd68a252 +CommandQueriesfoobarRequestTypeDeviceInformationCommandUUID7564fecc-f1b5-4d2d-af17-986fdd68a252 diff --git a/command/testdata/DeviceInformation_empty_queries.plist b/command/testdata/DeviceInformation_empty_queries.plist index 5ae4c530..8eead684 100755 --- a/command/testdata/DeviceInformation_empty_queries.plist +++ b/command/testdata/DeviceInformation_empty_queries.plist @@ -1,3 +1,3 @@ -CommandOptionsRequestTypeDeviceInformationCommandUUID1ad24ed8-0405-47e5-a230-6966207b6e14 +CommandRequestTypeDeviceInformationCommandUUID1ad24ed8-0405-47e5-a230-6966207b6e14 diff --git a/command/testdata/InstallProfile.plist b/command/testdata/InstallProfile.plist index aba11f26..c0095778 100755 --- a/command/testdata/InstallProfile.plist +++ b/command/testdata/InstallProfile.plist @@ -1,3 +1,3 @@ -CommandOptionsPayloadZm9vYmFyYmF6RequestTypeInstallProfileCommandUUID7e761ec5-9e20-42d1-9072-3d5a611e3ac5 +CommandPayloadZm9vYmFyYmF6RequestTypeInstallProfileCommandUUID7e761ec5-9e20-42d1-9072-3d5a611e3ac5 diff --git a/lock.json b/lock.json index 473c5b60..08bcd12a 100644 --- a/lock.json +++ b/lock.json @@ -129,7 +129,7 @@ { "name": "github.com/micromdm/mdm", "branch": "master", - "revision": "a4bd2f729ac6b8ea2acb8940ab1ca783e173b348", + "revision": "255824c8b22417622b1fee883b5508dec9587b34", "packages": [ "." ]