Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Fixing Syncml cmd nested command data (#15632)

Browse source 
This relates to #15107 

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [X] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
- [X] Manual QA for all new/changed functionality
This commit is contained in:
Marcos Oviedo 2023-12-14 15:05:00 -03:00 committed by GitHub
parent 142d46beb7
commit 9812c10d1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/issue-15107-windows-automatic-enrollment Normal file
View file

@ -0,0 +1 @@
* Syncml cmd data now supports raw data

15
server/fleet/microsoft_mdm.go
View file

@ -1001,10 +1001,15 @@ func (cmd SyncMLCmd) DataType() SyncMLDataType {
}
type CmdItem struct {
Source *string `xml:"Source>LocURI,omitempty"`
Target *string `xml:"Target>LocURI,omitempty"`
Meta *Meta `xml:"Meta,omitempty"`
Data *string `xml:"Data"`
Source *string `xml:"Source>LocURI,omitempty"`
Target *string `xml:"Target>LocURI,omitempty"`
Meta *Meta `xml:"Meta,omitempty"`
Data *RawXmlData `xml:"Data"`
}
type RawXmlData struct {
Attrs []xml.Attr `xml:",any,attr"`
Content string `xml:",innerxml"`
}
type Meta struct {
@ -1334,7 +1339,7 @@ func (cmd *SyncMLCmd) GetTargetData() string {
}
if cmd.Items[0].Data != nil {
return *cmd.Items[0].Data
return cmd.Items[0].Data.Content
}
return ""

3
server/mdm/microsoft/profile_verifier_test.go
View file

@ -53,7 +53,6 @@ func TestLoopHostMDMLocURIs(t *testing.T) {
},
got,
)
}
func TestHashLocURI(t *testing.T) {
@ -257,7 +256,7 @@ func TestVerifyHostMDMProfilesHappyPaths(t *testing.T) {
CmdID: uuid.NewString(),
CmdRef: &ref,
Items: []fleet.CmdItem{
{Target: ptr.String(p.LocURI), Data: ptr.String(p.Data)},
{Target: ptr.String(p.LocURI), Data: &fleet.RawXmlData{Content: p.Data}},
},
})
}

4
server/service/integration_mdm_test.go
View file

@ -1010,7 +1010,7 @@ func (s *integrationMDMTestSuite) TestWindowsProfileRetries() {
CmdID: uuid.NewString(),
CmdRef: &ref,
Items: []mdm_types.CmdItem{
{Target: ptr.String(p.LocURI), Data: ptr.String(p.Data)},
{Target: ptr.String(p.LocURI), Data: &fleet.RawXmlData{Content: p.Data}},
},
})
}
@ -7876,7 +7876,7 @@ func (s *integrationMDMTestSuite) TestWindowsMDM() {
Items: []fleet.CmdItem{
{
Source: ptr.String("./Device/Vendor/MSFT/DMClient/Provider/DEMO%20MDM/SignedEntDMID"),
Data: ptr.String("0"),
Data: &fleet.RawXmlData{Content: "0"},
},
},
CmdID: cmdTwoRespUUID,

9
server/service/microsoft_mdm.go
View file

@ -1848,6 +1848,7 @@ func newSyncMLItem(cmdSource *string, cmdTarget *string, cmdDataType *string, cm
var metaFormat *mdm_types.MetaAttr
var metaType *mdm_types.MetaAttr
var meta *mdm_types.Meta
var data *mdm_types.RawXmlData
if cmdDataFormat != nil && len(*cmdDataFormat) > 0 {
metaFormat = &mdm_types.MetaAttr{
@ -1870,9 +1871,15 @@ func newSyncMLItem(cmdSource *string, cmdTarget *string, cmdDataType *string, cm
}
}
if cmdDataValue != nil {
data = &mdm_types.RawXmlData{
Content: *cmdDataValue,
}
}
return &mdm_types.CmdItem{
Meta: meta,
Data: cmdDataValue,
Data: data,
Target: cmdTarget,
Source: cmdSource,
}