ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-09 11:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use []byte instead of string for BootstrapToken protobuf (#782)

Browse Source
This commit is contained in:
Kory Prince
2021-10-06 15:02:26 -05:00
committed by GitHub
parent fcf1d185fc
commit 804b4391ab
6 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/device/builtin/db.go
View File

@@ -52,7 +52,7 @@ func (db *DB) GetBootstrapToken(ctx context.Context, udid string) ([]byte, error
if err != nil {
return nil, errors.Wrap(err, "lookup device by uuid")
}
return []byte(d.BootstrapToken), nil
return d.BootstrapToken, nil
}
func (db *DB) List(ctx context.Context, opt device.ListDevicesOption) ([]device.Device, error) {

5
platform/device/builtin/db_test.go
View File

@@ -1,6 +1,7 @@
package builtin
import (
"bytes"
"context"
"io/ioutil"
"os"
@@ -71,7 +72,7 @@ func TestGetBootstrapToken(t *testing.T) {
dev := &device.Device{
UUID: "a-b-c-d",
UDID: "UDID-FOO-BAR-BAZ",
BootstrapToken: "bootstrap",
BootstrapToken: []byte("bootstrap"),
}
ctx := context.Background()
@@ -84,7 +85,7 @@ func TestGetBootstrapToken(t *testing.T) {
t.Fatalf("getting device by UDID: %s", err)
}
if have, want := haveDev.BootstrapToken, dev.BootstrapToken; have != want {
if have, want := haveDev.BootstrapToken, dev.BootstrapToken; bytes.Compare(have, want) != 0 {
t.Errorf("have %s, want %s", have, want)
}
}

2
platform/device/device.go
View File

@@ -38,7 +38,7 @@ type Device struct {
DEPProfileAssignedDate time.Time `db:"dep_profile_assigned_date"`
DEPProfileAssignedBy string `db:"dep_profile_assigned_by"`
LastSeen time.Time `db:"last_seen"`
BootstrapToken string `db:"bootstrap_token"`
BootstrapToken []byte `db:"bootstrap_token"`
}
// DEPProfileStatus is the status of the DEP Profile

80
platform/device/internal/deviceproto/device.pb.go
View File

@@ -57,7 +57,7 @@ type Device struct {
DepProfileAssignedBy string `protobuf:"bytes,27,opt,name=dep_profile_assigned_by,json=depProfileAssignedBy" json:"dep_profile_assigned_by,omitempty"`
LastSeen int64 `protobuf:"varint,28,opt,name=last_seen,json=lastSeen" json:"last_seen,omitempty"`
LastQueryResponse []byte `protobuf:"bytes,29,opt,name=last_query_response,json=lastQueryResponse,proto3" json:"last_query_response,omitempty"`
BootstrapToken string `protobuf:"bytes,30,opt,name=bootstrap_token,json=bootstrapToken" json:"bootstrap_token,omitempty"`
BootstrapToken []byte `protobuf:"bytes,30,opt,name=bootstrap_token,json=bootstrapToken,proto3" json:"bootstrap_token,omitempty"`
}
func (m *Device) Reset() { *m = Device{} }
@@ -268,11 +268,11 @@ func (m *Device) GetLastQueryResponse() []byte {
return nil
}
func (m *Device) GetBootstrapToken() string {
func (m *Device) GetBootstrapToken() []byte {
if m != nil {
return m.BootstrapToken
}
return ""
return nil
}
func init() {
@@ -282,41 +282,41 @@ func init() {
func init() { proto.RegisterFile("device.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 575 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x94, 0x4b, 0x6f, 0x13, 0x31,
0x10, 0xc7, 0x15, 0xfa, 0x60, 0xe3, 0xa6, 0x6d, 0xea, 0x26, 0xa9, 0xdb, 0x52, 0x08, 0x70, 0x20,
0x07, 0x54, 0x09, 0xa1, 0x1e, 0x38, 0x02, 0xbd, 0x52, 0x95, 0x34, 0x70, 0xb5, 0x9c, 0xf5, 0x74,
0x6b, 0x75, 0x6d, 0x2f, 0x7e, 0x14, 0xe5, 0xdb, 0xf0, 0x51, 0x91, 0xc7, 0xdb, 0x24, 0xa2, 0xdc,
0x3c, 0xbf, 0xff, 0xbc, 0x77, 0xb4, 0xa4, 0x27, 0xe1, 0x41, 0x95, 0x70, 0xde, 0x38, 0x1b, 0x2c,
0xdd, 0xc9, 0x16, 0x1a, 0x6f, 0xfe, 0x14, 0x64, 0xfb, 0x12, 0x6d, 0x4a, 0xc9, 0x66, 0x8c, 0x4a,
0xb2, 0xce, 0xb8, 0x33, 0xe9, 0x4e, 0xf1, 0x8d, 0x4c, 0x2a, 0xc9, 0x9e, 0xb5, 0x4c, 0x2a, 0x49,
0xdf, 0x92, 0x5d, 0x0f, 0x4e, 0x89, 0x9a, 0x9b, 0xa8, 0xe7, 0xe0, 0xd8, 0x06, 0x8a, 0xbd, 0x0c,
0xaf, 0x90, 0xd1, 0x33, 0x42, 0xac, 0xe7, 0x0f, 0xe0, 0xbc, 0xb2, 0x86, 0x6d, 0xa2, 0x47, 0xd7,
0xfa, 0x9f, 0x19, 0xa4, 0x1c, 0xf3, 0xa8, 0x6a, 0xb9, 0xf4, 0xd8, 0xca, 0x39, 0x10, 0x3e, 0x3a,
0xbd, 0x26, 0xbd, 0xc6, 0x59, 0x19, 0xcb, 0xc0, 0x8d, 0xd0, 0xc0, 0xb6, 0xd1, 0x67, 0xa7, 0x65,
0x57, 0x42, 0x63, 0xcf, 0x4a, 0x83, 0x62, 0xcf, 0x73, 0x7f, 0xe9, 0x9d, 0x98, 0x06, 0x25, 0x59,
0x91, 0x59, 0x7a, 0xd3, 0x01, 0xd9, 0x0a, 0xf6, 0x1e, 0x0c, 0xeb, 0x22, 0xcc, 0x46, 0x6a, 0xb2,
0x89, 0xfe, 0x8e, 0x6b, 0x51, 0xa9, 0x92, 0x91, 0xdc, 0x64, 0x22, 0xdf, 0x12, 0xa0, 0xa7, 0xa4,
0xab, 0xa5, 0xe6, 0xc1, 0x36, 0xaa, 0x64, 0x3b, 0xa8, 0x16, 0x5a, 0xea, 0x59, 0xb2, 0x53, 0x73,
0xd1, 0xd4, 0xb6, 0xbc, 0xe7, 0x39, 0x71, 0x2f, 0x37, 0x97, 0xd9, 0x0c, 0xd3, 0x9f, 0x90, 0x02,
0x8c, 0xb3, 0x75, 0x0d, 0x92, 0xed, 0x8e, 0x3b, 0x93, 0x62, 0xba, 0xb4, 0xe9, 0x05, 0x19, 0x89,
0xdf, 0x42, 0x05, 0x65, 0x2a, 0x5e, 0x5a, 0x73, 0xab, 0xaa, 0xe8, 0x44, 0x48, 0x9b, 0xd8, 0x43,
0xcf, 0xe1, 0xa3, 0xfa, 0x75, 0x5d, 0xa4, 0xaf, 0x48, 0xfb, 0xf5, 0xf2, 0x46, 0xf6, 0xb1, 0x28,
0xc9, 0x08, 0x17, 0x32, 0x20, 0x5b, 0xda, 0x4a, 0xa8, 0x59, 0x3f, 0x0f, 0x8a, 0x46, 0x1a, 0x14,
0x1f, 0x39, 0xea, 0x20, 0x0f, 0x8a, 0x04, 0x83, 0xc6, 0x29, 0xab, 0x2f, 0x9d, 0x6a, 0xb0, 0x03,
0x9a, 0x47, 0x59, 0x43, 0x29, 0x6d, 0x69, 0x6b, 0xeb, 0xd8, 0x61, 0x4e, 0x8b, 0x46, 0x5a, 0x90,
0xf0, 0x1e, 0x02, 0x0f, 0xa2, 0x62, 0x83, 0xbc, 0x20, 0x04, 0x33, 0x51, 0xa5, 0x9a, 0x12, 0x1a,
0x9e, 0x7b, 0x63, 0x43, 0x9c, 0xaa, 0x2b, 0xa1, 0x69, 0xaf, 0xed, 0x3d, 0xa1, 0x49, 0x6e, 0x9c,
0xbd, 0x55, 0x35, 0x70, 0x1f, 0x44, 0x88, 0x9e, 0x8d, 0x30, 0x49, 0x5f, 0x42, 0x73, 0x9d, 0x85,
0x1b, 0xe4, 0x74, 0x42, 0xfa, 0xeb, 0xde, 0x78, 0xa7, 0x47, 0xe8, 0xbb, 0xb7, 0xf2, 0xfd, 0x91,
0x2e, 0xf6, 0x82, 0x1c, 0xad, 0x7b, 0x0a, 0xef, 0x55, 0x65, 0x78, 0x50, 0x1a, 0x18, 0x1b, 0x77,
0x26, 0x1b, 0xd3, 0xc1, 0x2a, 0xe0, 0x33, 0x8a, 0x33, 0xa5, 0x81, 0x7e, 0x20, 0xc3, 0xf5, 0x30,
0x3c, 0x0b, 0x0c, 0x3a, 0xc6, 0x20, 0xba, 0x0a, 0xba, 0x8e, 0xfe, 0x0e, 0x43, 0x3e, 0x91, 0xe3,
0xa7, 0x95, 0x40, 0x72, 0x29, 0x02, 0xb0, 0x13, 0x0c, 0x1b, 0xfd, 0x5b, 0x0b, 0xe4, 0xa5, 0x08,
0xf0, 0xff, 0x26, 0x41, 0xf2, 0xf9, 0x82, 0x9d, 0xe2, 0x54, 0x83, 0xa7, 0x81, 0x5f, 0x16, 0x69,
0xdf, 0xb5, 0xf0, 0x81, 0x7b, 0x00, 0xc3, 0x5e, 0x60, 0x85, 0x22, 0x81, 0x1b, 0x00, 0x43, 0xcf,
0xc9, 0x21, 0x8a, 0xbf, 0x22, 0xb8, 0x05, 0x77, 0xe0, 0x1b, 0x6b, 0x3c, 0xb0, 0xb3, 0x71, 0x67,
0xd2, 0x9b, 0x1e, 0x24, 0xe9, 0x7b, 0x52, 0xa6, 0xad, 0x40, 0xdf, 0x91, 0xfd, 0xb9, 0xb5, 0xc1,
0x07, 0x27, 0x9a, 0xf6, 0x86, 0x5f, 0xe6, 0x8d, 0x2e, 0x31, 0x9e, 0xf1, 0x7c, 0x1b, 0xff, 0x14,
0x1f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x95, 0x24, 0x1c, 0x5e, 0x46, 0x04, 0x00, 0x00,
// 576 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x94, 0xcf, 0x53, 0x13, 0x31,
0x14, 0xc7, 0xa7, 0x42, 0xeb, 0x36, 0x2d, 0xa5, 0x84, 0xb6, 0x04, 0x10, 0xad, 0x7a, 0xb0, 0x07,
0x87, 0x19, 0xc7, 0xe1, 0xe0, 0x51, 0xe5, 0x2a, 0x83, 0xa5, 0x7a, 0xcd, 0xa4, 0x9b, 0xc7, 0x92,
0x61, 0x93, 0xac, 0x49, 0x16, 0xa7, 0xff, 0x8d, 0x7f, 0xaa, 0x93, 0x97, 0xa5, 0xed, 0x88, 0xb7,
0xbc, 0xcf, 0xf7, 0xfd, 0xde, 0x37, 0x4b, 0xfa, 0x12, 0x1e, 0x54, 0x0e, 0xe7, 0x95, 0xb3, 0xc1,
0xd2, 0x5e, 0xb2, 0xd0, 0x78, 0xf3, 0x27, 0x23, 0x9d, 0x4b, 0xb4, 0x29, 0x25, 0xbb, 0x75, 0xad,
0x24, 0x6b, 0x4d, 0x5b, 0xb3, 0xee, 0x1c, 0xdf, 0xc8, 0xa4, 0x92, 0xec, 0x59, 0xc3, 0xa4, 0x92,
0xf4, 0x2d, 0xd9, 0xf3, 0xe0, 0x94, 0x28, 0xb9, 0xa9, 0xf5, 0x12, 0x1c, 0xdb, 0x41, 0xb1, 0x9f,
0xe0, 0x15, 0x32, 0x7a, 0x46, 0x88, 0xf5, 0xfc, 0x01, 0x9c, 0x57, 0xd6, 0xb0, 0x5d, 0xf4, 0xe8,
0x5a, 0xff, 0x33, 0x81, 0x98, 0x63, 0x59, 0xab, 0x52, 0xae, 0x3d, 0xda, 0x29, 0x07, 0xc2, 0x47,
0xa7, 0xd7, 0xa4, 0x5f, 0x39, 0x2b, 0xeb, 0x3c, 0x70, 0x23, 0x34, 0xb0, 0x0e, 0xfa, 0xf4, 0x1a,
0x76, 0x25, 0x34, 0xf6, 0xac, 0x34, 0x28, 0xf6, 0x3c, 0xf5, 0x17, 0xdf, 0x91, 0x69, 0x50, 0x92,
0x65, 0x89, 0xc5, 0x37, 0x1d, 0x91, 0x76, 0xb0, 0xf7, 0x60, 0x58, 0x17, 0x61, 0x32, 0x62, 0x93,
0x55, 0xed, 0xef, 0xb8, 0x16, 0x85, 0xca, 0x19, 0x49, 0x4d, 0x46, 0xf2, 0x2d, 0x02, 0x7a, 0x4a,
0xba, 0x5a, 0x6a, 0x1e, 0x6c, 0xa5, 0x72, 0xd6, 0x43, 0x35, 0xd3, 0x52, 0x2f, 0xa2, 0x1d, 0x9b,
0xab, 0x4d, 0x69, 0xf3, 0x7b, 0x9e, 0x12, 0xf7, 0x53, 0x73, 0x89, 0x2d, 0x30, 0xfd, 0x09, 0xc9,
0xc0, 0x38, 0x5b, 0x96, 0x20, 0xd9, 0xde, 0xb4, 0x35, 0xcb, 0xe6, 0x6b, 0x9b, 0x5e, 0x90, 0x89,
0xf8, 0x2d, 0x54, 0x50, 0xa6, 0xe0, 0xb9, 0x35, 0xb7, 0xaa, 0xa8, 0x9d, 0x08, 0x71, 0x13, 0x03,
0xf4, 0x1c, 0x3f, 0xaa, 0x5f, 0xb7, 0x45, 0xfa, 0x8a, 0x34, 0x5f, 0x2f, 0x6d, 0x64, 0x1f, 0x8b,
0x92, 0x84, 0x70, 0x21, 0x23, 0xd2, 0xd6, 0x56, 0x42, 0xc9, 0x86, 0x69, 0x50, 0x34, 0xe2, 0xa0,
0xf8, 0x48, 0x51, 0x07, 0x69, 0x50, 0x24, 0x18, 0x34, 0x8d, 0x59, 0x7d, 0xee, 0x54, 0x85, 0x1d,
0xd0, 0x34, 0xca, 0x16, 0x8a, 0x69, 0x73, 0x5b, 0x5a, 0xc7, 0x0e, 0x53, 0x5a, 0x34, 0xe2, 0x82,
0x84, 0xf7, 0x10, 0x78, 0x10, 0x05, 0x1b, 0xa5, 0x05, 0x21, 0x58, 0x88, 0x22, 0xd6, 0x94, 0x50,
0xf1, 0xd4, 0x1b, 0x1b, 0xe3, 0x54, 0x5d, 0x09, 0x55, 0x73, 0x6d, 0xef, 0x09, 0x8d, 0x72, 0xe5,
0xec, 0xad, 0x2a, 0x81, 0xfb, 0x20, 0x42, 0xed, 0xd9, 0x04, 0x93, 0x0c, 0x25, 0x54, 0xd7, 0x49,
0xb8, 0x41, 0x4e, 0x67, 0x64, 0xb8, 0xed, 0x8d, 0x77, 0x7a, 0x84, 0xbe, 0x83, 0x8d, 0xef, 0x8f,
0x78, 0xb1, 0x17, 0xe4, 0x68, 0xdb, 0x53, 0x78, 0xaf, 0x0a, 0xc3, 0x83, 0xd2, 0xc0, 0xd8, 0xb4,
0x35, 0xdb, 0x99, 0x8f, 0x36, 0x01, 0x9f, 0x51, 0x5c, 0x28, 0x0d, 0xf4, 0x03, 0x19, 0x6f, 0x87,
0xe1, 0x59, 0x60, 0xd0, 0x31, 0x06, 0xd1, 0x4d, 0xd0, 0x75, 0xed, 0xef, 0x30, 0xe4, 0x13, 0x39,
0x7e, 0x5a, 0x09, 0x24, 0x97, 0x22, 0x00, 0x3b, 0xc1, 0xb0, 0xc9, 0xbf, 0xb5, 0x40, 0x5e, 0x8a,
0x00, 0xff, 0x6f, 0x12, 0x24, 0x5f, 0xae, 0xd8, 0x29, 0x4e, 0x35, 0x7a, 0x1a, 0xf8, 0x65, 0x15,
0xf7, 0x5d, 0x0a, 0x1f, 0xb8, 0x07, 0x30, 0xec, 0x05, 0x56, 0xc8, 0x22, 0xb8, 0x01, 0x30, 0xf4,
0x9c, 0x1c, 0xa2, 0xf8, 0xab, 0x06, 0xb7, 0xe2, 0x0e, 0x7c, 0x65, 0x8d, 0x07, 0x76, 0x36, 0x6d,
0xcd, 0xfa, 0xf3, 0x83, 0x28, 0x7d, 0x8f, 0xca, 0xbc, 0x11, 0xe8, 0x3b, 0xb2, 0xbf, 0xb4, 0x36,
0xf8, 0xe0, 0x44, 0xd5, 0xdc, 0xf0, 0x4b, 0xf4, 0x1d, 0xac, 0x31, 0x9e, 0xf1, 0xb2, 0x83, 0x7f,
0x8a, 0x8f, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x60, 0xfe, 0x2a, 0x00, 0x46, 0x04, 0x00, 0x00,
}

3
platform/device/internal/deviceproto/device.proto
View File

@@ -33,6 +33,5 @@ message Device {
string dep_profile_assigned_by =27;
int64 last_seen =28;
bytes last_query_response =29;
string bootstrap_token =30;
bytes bootstrap_token =30;
}

2
platform/device/worker.go
View File

@@ -221,7 +221,7 @@ func (w *Worker) updateFromSetBootstrapToken(ctx context.Context, message []byte
return errors.Wrapf(err, "retrieve device with udid %s", ev.Command.UDID)
}
dev.BootstrapToken = string(ev.Command.BootstrapToken)
dev.BootstrapToken = ev.Command.BootstrapToken
dev.AwaitingConfiguration = ev.Command.AwaitingConfiguration
dev.LastSeen = time.Now()