Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 114

Fix missing upgrade codes when Windows FMAs are uploaded via GitOps (#37862)

Browse source 
Relates to #37771.

No changes file as the #37772 changes file covers this.

- [x] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)

## Testing

- [x] Added/updated automated tests
- [x] QA'd all new/changed functionality manually
This commit is contained in:
Ian Littman 2026-01-05 13:44:58 -06:00 committed by GitHub
parent 4bd3a5ce4d
commit b96d250ecc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ee/server/service/software_installers.go
View file

@ -2363,6 +2363,10 @@ func (svc *Service) softwareBatchUpload(
installer.Platform = p.MaintainedApp.Platform
installer.Source = p.MaintainedApp.Source()
if installer.Source == "programs" && p.MaintainedApp.UpgradeCode != "" {
installer.UpgradeCode = p.MaintainedApp.UpgradeCode
}
installer.Extension = extension
installer.BundleIdentifier = p.MaintainedApp.BundleIdentifier()
installer.StorageID = p.MaintainedApp.SHA256

37
server/service/integration_enterprise_test.go
View file

@ -18784,6 +18784,43 @@ func (s *integrationEnterpriseTestSuite) TestUpgradeCodesFromMaintainedApps() {
require.Equal(t, len(hSWRes.Software), 1)
sw0 := hSWRes.Software[0]
require.Equal(t, warpUpgradeCode, *sw0.UpgradeCode)
// nuke the title so we can try this with a batch upload
mysql.ExecAdhocSQL(t, s.ds, func(q sqlx.ExtContext) error {
_, err := q.ExecContext(ctx, "DELETE FROM software_titles WHERE upgrade_code = ?", warpUpgradeCode)
return err
})
// Use the batch endpoint (GitOps) to add the Windows FMA
softwareToInstall := []*fleet.SoftwareInstallerPayload{
{Slug: ptr.String("cloudflare-warp/windows"), SelfService: true},
}
var batchResponse batchSetSoftwareInstallersResponse
s.DoJSON("POST", "/api/latest/fleet/software/batch", batchSetSoftwareInstallersRequest{Software: softwareToInstall}, http.StatusAccepted, &batchResponse)
packages := waitBatchSetSoftwareInstallersCompleted(t, &s.withServer, "", batchResponse.RequestUUID)
require.Len(t, packages, 1)
require.NotNil(t, packages[0].TitleID)
// Verify the upgrade code was correctly set on the software installer
var installerUpgradeCode *string
mysql.ExecAdhocSQL(t, s.ds, func(q sqlx.ExtContext) error {
return sqlx.GetContext(ctx, q, &installerUpgradeCode, "SELECT upgrade_code FROM software_installers WHERE title_id = ?", packages[0].TitleID)
})
require.NotNil(t, installerUpgradeCode)
require.Equal(t, warpUpgradeCode, *installerUpgradeCode)
// Also verify the software title has the upgrade code
var afterBatch listSoftwareTitlesResponse
s.DoJSON(
"GET", "/api/latest/fleet/software/titles",
listSoftwareTitlesRequest{},
http.StatusOK, &afterBatch,
"per_page", "1",
"available_for_install", "true",
"team_id", "0",
)
require.Len(t, afterBatch.SoftwareTitles, 1)
require.Equal(t, warpUpgradeCode, *afterBatch.SoftwareTitles[0].UpgradeCode)
}
func (s *integrationEnterpriseTestSuite) TestWindowsMigrateMDMNotEnabled() {