Fix error with plist encoding by dereferencing nested payloads.

Add correct header for enrollment profile.
Enrollment works with micromdm/scep server!

enroll/endpoint.go

@@ -8,7 +8,7 @@ import (
 type mdmEnrollRequest struct{}
 
 type mdmEnrollResponse struct {
-	*Profile
+	Profile
 }
 
 func makeEnrollEndpoint(svc Service) endpoint.Endpoint {

enroll/profile.go

@@ -13,7 +13,7 @@ type Payload struct {
 	PayloadDisplayName  string      `json:"displayname" db:"displayname"`
 	PayloadDescription  string      `json:"description,omitempty" db:"description"`
 	PayloadOrganization string      `json:"organization,omitempty" db:"organization"`
-	PayloadContent      interface{} `json:"content,omitempty"`
+	PayloadContent      interface{} `json:"content,omitempty" plist:"PayloadContent,omitempty"`
 }
 
 type Profile struct {
@@ -43,35 +43,35 @@ func NewProfile() *Profile {
 	}
 }
 
-func NewPayload(identifier string) *Payload {
+func NewPayload(payloadType string) *Payload {
 	payloadUuid := uuid.NewV4()
 
 	return &Payload{
 		PayloadVersion: 1,
-		PayloadIdentifier: identifier,
+		PayloadType:    payloadType,
 		PayloadUUID:    payloadUuid.String(),
 	}
 }
 
 type SCEPPayloadContent struct {
-	CAFingerprint []byte `plist:"omitempty"` // NSData
+	CAFingerprint []byte `plist:"CAFingerprint,omitempty"` // NSData
-	Challenge     string `plist:"omitempty"`
+	Challenge     string `plist:"Challenge,omitempty"`
 	Keysize       int
 	KeyType       string `plist:"Key Type"`
 	KeyUsage      int    `plist:"Key Usage"`
 	Name          string
-	Subject       [][][]string `plist:"omitempty"`
+	Subject       [][][]string `plist:"Subject,omitempty"`
 	URL           string
 }
 
 // TODO: Actually this is one of those non-nested payloads that doesnt respect the PayloadContent key.
 type MDMPayloadContent struct {
-	Payload                 Payload
+	Payload
 	AccessRights            int
 	CheckInURL              string
 	CheckOutWhenRemoved     bool
 	IdentityCertificateUUID string
-	ServerCapabilities      []string `plist:"omitempty"`
+	ServerCapabilities      []string `plist:"ServerCapabilities,omitempty"`
 	ServerURL               string
 	Topic                   string
 }

enroll/service.go

@@ -1,7 +1,7 @@
 package enroll
 
 type Service interface {
-	Enroll() (*Profile, error)
+	Enroll() (Profile, error)
 }
 
 func NewService() Service {
@@ -13,7 +13,11 @@ func NewService() Service {
 	}
 
 	return &service{
+		Url:         "https://micromdm.local:6443",
+		SCEPUrl:     "http://micromdm.local:2019/scep",
 		SCEPSubject: scepSubject,
+		Topic:       "",
+		CACert:      []byte{},
 	}
 }
 
@@ -23,9 +27,10 @@ type service struct {
 	SCEPChallenge string
 	SCEPSubject   [][][]string
 	Topic         string // APNS Topic for MDM notifications
+	CACert        []byte
 }
 
-func (svc service) Enroll() (*Profile, error) {
+func (svc service) Enroll() (Profile, error) {
 	profile := NewProfile()
 	profile.PayloadIdentifier = "com.github.micromdm.micromdm.mdm"
 	profile.PayloadOrganization = "MicroMDM"
@@ -45,15 +50,16 @@ func (svc service) Enroll() (*Profile, error) {
 	scepPayload := NewPayload("com.apple.security.scep")
 	scepPayload.PayloadDescription = "Configures SCEP"
 	scepPayload.PayloadDisplayName = "SCEP"
+	scepPayload.PayloadIdentifier = "com.github.micromdm.scep"
 	scepPayload.PayloadContent = scepContent
 
-	mdmPayload := MDMPayloadContent{
+	mdmPayload := NewPayload("com.apple.mdm")
-		Payload: Payload{
+	mdmPayload.PayloadDescription = "Enrolls with the MDM server"
-			PayloadVersion:      1,
+	mdmPayload.PayloadOrganization = "MicroMDM"
-			PayloadType:         "com.apple.mdm",
+	mdmPayload.PayloadIdentifier = "com.github.micromdm.mdm"
-			PayloadDescription:  "Enrolls with the MDM server",
+
-			PayloadOrganization: "MicroMDM",
+	mdmPayloadContent := MDMPayloadContent{
-		},
+		Payload:                 *mdmPayload,
 		AccessRights:            8191,
 		CheckInURL:              svc.Url + "/mdm/checkin",
 		CheckOutWhenRemoved:     true,
@@ -62,11 +68,12 @@ func (svc service) Enroll() (*Profile, error) {
 		Topic: svc.Topic,
 	}
 
-	caPayload := NewPayload("com.apple.ssl.certificate")
+	//caPayload := NewPayload("com.apple.ssl.certificate")
-	caPayload.PayloadDisplayName = "Root certificate for MicroMDM"
+	//caPayload.PayloadDisplayName = "Root certificate for MicroMDM"
-	caPayload.PayloadDescription = "Installs the root CA certificate for MicroMDM"
+	//caPayload.PayloadDescription = "Installs the root CA certificate for MicroMDM"
+	//caPayload.PayloadContent = []byte{}
 
-	profile.PayloadContent = []interface{}{scepPayload, mdmPayload, caPayload}
+	profile.PayloadContent = []interface{}{*scepPayload, mdmPayloadContent}
 
-	return profile, nil
+	return *profile, nil
 }

enroll/transport.go

@@ -37,13 +37,11 @@ func decodeMDMEnrollRequest(_ context.Context, r *http.Request) (interface{}, er
 func encodeResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error {
 	resp := response.(mdmEnrollResponse)
 
-	plistData, err := plist.Marshal(resp.Profile)
+	w.Header().Set("Content-Type", "application/x-apple-aspen-config")
-	if err != nil {
+
+	if err := plist.NewEncoder(w).Encode(resp); err != nil {
 		return err
 	}
 
-	if len(plistData) != 0 {
-		w.Write(plistData)
-	}
 	return nil
 }