ogb912/micromdm
1
0
Fork 0
mirror of https://github.com/micromdm/micromdm/ synced 2026-08-12 04:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Empty consent text in enroll profile was generating an invalid plist key. (#39)

Browse Source 
Enrollment service now takes the TLS certificate path and provides a PKCS1 payload with the servers TLS certificate in order to trust it at enroll time.
This commit is contained in:
mosen
2016-10-25 14:08:45 +11:00
committed by GitHub
parent d698a96259
commit 8072ae8c9d
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
profile.go
View File

@@ -31,7 +31,7 @@ type Profile struct {
PayloadScope string `json:"scope" db:"scope" plist:",omitempty"`
RemovalDate *time.Time `json:"removal_date" db:"removal_date" plist:"-" plist:",omitempty"`
DurationUntilRemoval float32 `json:"duration_until_removal" db:"duration_until_removal" plist:",omitempty"`
ConsentText map[string]string `json:"consent_text" db:"consent_text" plist:"omitempty"`
ConsentText map[string]string `json:"consent_text" db:"consent_text" plist:",omitempty"`
}
func NewProfile() *Profile {

33
service.go
View File

@@ -9,13 +9,13 @@ type Service interface {
Enroll(ctx context.Context) (Profile, error)
}
func NewService(pushCertPath string, pushCertPass string, caCertPath string, scepURL string, scepChallenge string, url string) (Service, error) {
func NewService(pushCertPath string, pushCertPass string, caCertPath string, scepURL string, scepChallenge string, url string, tlsCertPath string) (Service, error) {
pushTopic, err := GetPushTopicFromPKCS12(pushCertPath, pushCertPass)
if err != nil {
return nil, err
}
var caCert []byte
var caCert, tlsCert []byte
if caCertPath != "" {
caCert, err = ioutil.ReadFile(caCertPath)
@@ -25,6 +25,14 @@ func NewService(pushCertPath string, pushCertPass string, caCertPath string, sce
}
}
if tlsCertPath != "" {
tlsCert, err = ioutil.ReadFile(tlsCertPath)
if err != nil {
return nil, err
}
}
scepSubject := [][][]string{
[][]string{
[]string{"O", "MicroMDM"},
@@ -39,6 +47,7 @@ func NewService(pushCertPath string, pushCertPass string, caCertPath string, sce
SCEPChallenge: scepChallenge,
Topic: pushTopic,
CACert: caCert,
TLSCert: tlsCert,
}, nil
}
@@ -49,6 +58,7 @@ type service struct {
SCEPSubject [][][]string
Topic string // APNS Topic for MDM notifications
CACert []byte
TLSCert []byte
}
func (svc service) Enroll(ctx context.Context) (Profile, error) {
@@ -93,6 +103,8 @@ func (svc service) Enroll(ctx context.Context) (Profile, error) {
Topic: svc.Topic,
}
payloadContent := []interface{}{*scepPayload, mdmPayloadContent}
if len(svc.CACert) > 0 {
caPayload := NewPayload("com.apple.ssl.certificate")
caPayload.PayloadDisplayName = "Root certificate for MicroMDM"
@@ -100,10 +112,21 @@ func (svc service) Enroll(ctx context.Context) (Profile, error) {
caPayload.PayloadIdentifier = "com.github.micromdm.ssl.ca"
caPayload.PayloadContent = svc.CACert
profile.PayloadContent = []interface{}{*scepPayload, mdmPayloadContent, *caPayload}
} else {
profile.PayloadContent = []interface{}{*scepPayload, mdmPayloadContent}
payloadContent = append(payloadContent, *caPayload)
}
// Client needs to trust us at this point if we are using a self signed certificate.
if len(svc.TLSCert) > 0 {
tlsPayload := NewPayload("com.apple.security.pkcs1")
tlsPayload.PayloadDisplayName = "Self-signed TLS certificate for MicroMDM"
tlsPayload.PayloadDescription = "Installs the TLS certificate for MicroMDM"
tlsPayload.PayloadIdentifier = "com.github.micromdm.tls"
tlsPayload.PayloadContent = svc.TLSCert
payloadContent = append(payloadContent, *tlsPayload)
}
profile.PayloadContent = payloadContent
return *profile, nil
}