Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 91

Allow msix-based FMAs to be added in the UI (#43338)

Browse source 
This pull request updates the handling of `.msix` package extensions in
the software installer logic to clarify support for Fleet-maintained
Windows apps and to ensure custom uploads of `.msix` files remain
unsupported. Test coverage is also expanded to explicitly check these
cases.

**Platform support changes:**

* Updated `packageExtensionToPlatform` in `software_installers.go` to
include `.msix` as a valid extension for Fleet-maintained Windows apps,
while maintaining that custom uploads of `.msix` files are still
rejected.

**Test coverage improvements:**

* Added test cases in `TestSoftwareInstallerPlatformFromExtension` and
`TestSofwareInstallerSourceFromExtensionAndName` to ensure `.msix` files
are correctly handled as unsupported for custom uploads.
[[1]](diffhunk://#diff-581f0146919318ed08c10123ad2f4585bfcfda40cba1dfcb20a65afc40259f32L164-R166)
[[2]](diffhunk://#diff-581f0146919318ed08c10123ad2f4585bfcfda40cba1dfcb20a65afc40259f32L214-R218)
This commit is contained in:
Allen Houchins 2026-04-09 13:21:01 -05:00 committed by GitHub
parent 0bf48d39c6
commit 4f9fe1d81b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3080,10 +3080,14 @@ func (svc *Service) selfServiceInstallInHouseApp(ctx context.Context, host *flee
// packageExtensionToPlatform returns the platform name based on the
// package extension. Returns an empty string if there is no match.
//
// .msix is included for Fleet-maintained Windows apps only; custom package
// upload still rejects .msix (see addMetadataToSoftwarePayload and
// SoftwareInstallerPlatformFromExtension).
func packageExtensionToPlatform(ext string) string {
var requiredPlatform string
switch ext {
case ".msi", ".exe", ".ps1":
case ".msi", ".exe", ".ps1", ".msix":
requiredPlatform = "windows"
case ".pkg", ".dmg", ".zip":
requiredPlatform = "darwin"

8
server/fleet/software_installer_test.go
View file

@ -161,7 +161,9 @@ func TestSoftwareInstallerPlatformFromExtension(t *testing.T) {
{".ps1", "windows", false},
{"ps1", "windows", false},
// Unsupported extensions
// Unsupported extensions (msix is fleet-maintained only, not custom upload)
{".msix", "", true},
{"msix", "", true},
{".txt", "", true},
{"", "", true},
}
@ -211,7 +213,9 @@ func TestSofwareInstallerSourceFromExtensionAndName(t *testing.T) {
{".ps1", "script.ps1", "ps1_packages", false},
{"ps1", "setup.ps1", "ps1_packages", false},
// Unsupported extensions
// Unsupported extensions (msix is fleet-maintained only, not custom upload)
{".msix", "app.msix", "", true},
{"msix", "app.msix", "", true},
{".txt", "readme.txt", "", true},
{"", "noext", "", true},
}