Add GitHub Desktop to macOS FMA library (#36066)

<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #

# Checklist for submitter

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

- [ ] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files)
for more information.

- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] If paths of existing endpoints are modified without backwards
compatibility, checked the frontend/CLI for any necessary changes

## Testing

- [ ] Added/updated automated tests
- [ ] Where appropriate, [automated tests simulate multiple hosts and
test for host
isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing)
(updates to one hosts's records do not affect another)

- [ ] QA'd all new/changed functionality manually

For unreleased bug fixes in a release candidate, one of:

- [ ] Confirmed that the fix is not expected to adversely impact load
test results
- [ ] Alerted the release DRI if additional load testing is needed

## Database migrations

- [ ] Checked schema for all modified table for columns that will
auto-update timestamps during migration.
- [ ] Confirmed that updating the timestamps is acceptable, and will not
cause unwanted side effects.
- [ ] Ensured the correct collation is explicitly set for character
columns (`COLLATE utf8mb4_unicode_ci`).

## New Fleet configuration settings

- [ ] Setting(s) is/are explicitly excluded from GitOps

If you didn't check the box above, follow this checklist for
GitOps-enabled settings:

- [ ] Verified that the setting is exported via `fleetctl
generate-gitops`
- [ ] Verified the setting is documented in a separate PR to [the GitOps
documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485)
- [ ] Verified that the setting is cleared on the server if it is not
supplied in a YAML file (or that it is documented as being optional)
- [ ] Verified that any relevant UI is disabled when GitOps mode is
enabled

## fleetd/orbit/Fleet Desktop

- [ ] Verified compatibility with the latest released version of Fleet
(see [Must
rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md))
- [ ] If the change applies to only one platform, confirmed that
`runtime.GOOS` is used as needed to isolate changes
- [ ] Verified that fleetd runs on macOS, Linux and Windows
- [ ] Verified auto-update works from the released version of component
to the new version (see [tools/tuf/test](../tools/tuf/test/README.md))
This commit is contained in:
Allen Houchins
2025-11-20 17:30:50 -06:00
committed by GitHub
parent d6a75ebc8b
commit e494df7846
7 changed files with 76 additions and 0 deletions
@@ -0,0 +1,25 @@
package externalrefs
import (
"fmt"
"strings"
maintained_apps "github.com/fleetdm/fleet/v4/ee/maintained-apps"
)
// GitHubDesktopVersionShortener strips the git commit hash from GitHub Desktop versions.
// Homebrew provides versions like "3.5.4-9dfb8d8d", but osquery reports "3.5.4".
// This transformer extracts just the semantic version part.
func GitHubDesktopVersionShortener(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) {
homebrewVersion := app.Version
// Split on '-' and take the first part (the semantic version)
parts := strings.Split(homebrewVersion, "-")
if len(parts) > 0 && parts[0] != "" {
app.Version = parts[0]
} else {
return app, fmt.Errorf("Expected GitHub Desktop version to contain a semantic version but found '%s'", homebrewVersion)
}
return app, nil
}
@@ -15,6 +15,7 @@ var Funcs = map[string][]func(*maintained_apps.FMAManifestApp) (*maintained_apps
"omnissa-horizon-client/darwin": {OmnissaHorizonVersionShortener},
"cisco-jabber/darwin": {CiscoJabberVersionTransformer},
"parallels/darwin": {ParallelsVersionShortener},
"github/darwin": {GitHubDesktopVersionShortener},
}
func ChromePKGInstaller(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) {
@@ -0,0 +1,8 @@
{
"name": "GitHub Desktop",
"unique_identifier": "com.github.GitHubClient",
"token": "github",
"installer_format": "zip",
"slug": "github/darwin",
"default_categories": ["Developer tools"]
}
+7
View File
@@ -240,6 +240,13 @@
"unique_identifier": "Mozilla Firefox (x64 en-US)",
"description": "Firefox is a powerful, open-source web browser built for speed, privacy, and customization."
},
{
"name": "GitHub Desktop",
"slug": "github/darwin",
"platform": "darwin",
"unique_identifier": "com.github.GitHubClient",
"description": "GitHub Desktop is a desktop client for GitHub repositories."
},
{
"name": "GitKraken",
"slug": "gitkraken/darwin",
@@ -0,0 +1,21 @@
{
"versions": [
{
"version": "3.5.4",
"queries": {
"exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.github.GitHubClient';"
},
"installer_url": "https://desktop.githubusercontent.com/releases/3.5.4-9dfb8d8d/GitHubDesktop-arm64.zip",
"install_script_ref": "8992a57a",
"uninstall_script_ref": "e8252f2a",
"sha256": "34c76f8cbd58771ce7c9e4b7440708502cf9c6921fe099261ec08a413d72de8b",
"default_categories": [
"Developer tools"
]
}
],
"refs": {
"8992a57a": "#!/bin/sh\n\n# variables\nAPPDIR=\"/Applications/\"\nTMPDIR=$(dirname \"$(realpath $INSTALLER_PATH)\")\n# functions\n\nquit_application() {\n local bundle_id=\"$1\"\n local timeout_duration=10\n\n # check if the application is running\n if ! osascript -e \"application id \\\"$bundle_id\\\" is running\" 2>/dev/null; then\n return\n fi\n\n local console_user\n console_user=$(stat -f \"%Su\" /dev/console)\n if [[ $EUID -eq 0 && \"$console_user\" == \"root\" ]]; then\n echo \"Not logged into a non-root GUI; skipping quitting application ID '$bundle_id'.\"\n return\n fi\n\n echo \"Quitting application '$bundle_id'...\"\n\n # try to quit the application within the timeout period\n local quit_success=false\n SECONDS=0\n while (( SECONDS < timeout_duration )); do\n if osascript -e \"tell application id \\\"$bundle_id\\\" to quit\" >/dev/null 2>&1; then\n if ! pgrep -f \"$bundle_id\" >/dev/null 2>&1; then\n echo \"Application '$bundle_id' quit successfully.\"\n quit_success=true\n break\n fi\n fi\n sleep 1\n done\n\n if [[ \"$quit_success\" = false ]]; then\n echo \"Application '$bundle_id' did not quit.\"\n fi\n}\n\n\n# extract contents\nunzip \"$INSTALLER_PATH\" -d \"$TMPDIR\"\n# copy to the applications folder\nquit_application 'com.github.GitHubClient'\nif [ -d \"$APPDIR/GitHub Desktop.app\" ]; then\n\tsudo mv \"$APPDIR/GitHub Desktop.app\" \"$TMPDIR/GitHub Desktop.app.bkp\"\nfi\nsudo cp -R \"$TMPDIR/GitHub Desktop.app\" \"$APPDIR\"\nmkdir -p .\n/bin/ln -h -f -s -- \"$APPDIR/GitHub Desktop.app/Contents/Resources/app/static/github.sh\" \"github\"\n",
"e8252f2a": "#!/bin/sh\n\n# variables\nAPPDIR=\"/Applications/\"\nLOGGED_IN_USER=$(scutil <<< \"show State:/Users/ConsoleUser\" | awk '/Name :/ { print $3 }')\n# functions\n\ntrash() {\n local logged_in_user=\"$1\"\n local target_file=\"$2\"\n local timestamp=\"$(date +%Y-%m-%d-%s)\"\n local rand=\"$(jot -r 1 0 99999)\"\n\n # replace ~ with /Users/$logged_in_user\n if [[ \"$target_file\" == ~* ]]; then\n target_file=\"/Users/$logged_in_user${target_file:1}\"\n fi\n\n local trash=\"/Users/$logged_in_user/.Trash\"\n local file_name=\"$(basename \"${target_file}\")\"\n\n if [[ -e \"$target_file\" ]]; then\n echo \"removing $target_file.\"\n mv -f \"$target_file\" \"$trash/${file_name}_${timestamp}_${rand}\"\n else\n echo \"$target_file doesn't exist.\"\n fi\n}\n\nsudo rm -rf \"$APPDIR/GitHub Desktop.app\"\nsudo rm -rf 'github'\nsudo rmdir '~/.config/git'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.github.GitHubClient.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.github.GitHubClient'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.github.GitHubClient.ShipIt'\ntrash $LOGGED_IN_USER '~/Library/Application Support/GitHub Desktop'\ntrash $LOGGED_IN_USER '~/Library/Application Support/ShipIt_stderr.log'\ntrash $LOGGED_IN_USER '~/Library/Application Support/ShipIt_stdout.log'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.github.GitHubClient'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.github.GitHubClient.ShipIt'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.github.GitHubClient'\ntrash $LOGGED_IN_USER '~/Library/Logs/GitHub Desktop'\ntrash $LOGGED_IN_USER '~/Library/Preferences/ByHost/com.github.GitHubClient.ShipIt.*.plist'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.github.GitHubClient.helper.plist'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.github.GitHubClient.plist'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/com.github.GitHubClient.savedState'\n"
}
}
File diff suppressed because one or more lines are too long
Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB