From d23fb2428cc00b7bc89c83a3fb6e8c32adf78445 Mon Sep 17 00:00:00 2001 From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com> Date: Tue, 25 Nov 2025 13:00:00 -0600 Subject: [PATCH] Add Twingate as a macOS FMA (#36260) --- .../ingesters/homebrew/external_refs/main.go | 1 + .../twingate_version_shortener.go | 27 ++++++++++++++++++ .../inputs/homebrew/twingate.json | 8 ++++++ ee/maintained-apps/outputs/apps.json | 7 +++++ .../outputs/twingate/darwin.json | 21 ++++++++++++++ .../components/icons/Twingate.tsx | 14 +++++++++ .../images/app-icon-twingate-60x60@2x.png | Bin 0 -> 4549 bytes 7 files changed, 78 insertions(+) create mode 100644 ee/maintained-apps/ingesters/homebrew/external_refs/twingate_version_shortener.go create mode 100644 ee/maintained-apps/inputs/homebrew/twingate.json create mode 100644 ee/maintained-apps/outputs/twingate/darwin.json create mode 100644 frontend/pages/SoftwarePage/components/icons/Twingate.tsx create mode 100644 website/assets/images/app-icon-twingate-60x60@2x.png diff --git a/ee/maintained-apps/ingesters/homebrew/external_refs/main.go b/ee/maintained-apps/ingesters/homebrew/external_refs/main.go index 83e68b0165..75959e5e83 100644 --- a/ee/maintained-apps/ingesters/homebrew/external_refs/main.go +++ b/ee/maintained-apps/ingesters/homebrew/external_refs/main.go @@ -17,6 +17,7 @@ var Funcs = map[string][]func(*maintained_apps.FMAManifestApp) (*maintained_apps "cisco-jabber/darwin": {CiscoJabberVersionTransformer}, "parallels/darwin": {ParallelsVersionShortener}, "github/darwin": {GitHubDesktopVersionShortener}, + "twingate/darwin": {TwingateVersionShortener}, "citrix-workspace/darwin": {CitrixWorkspaceVersionShortener}, } diff --git a/ee/maintained-apps/ingesters/homebrew/external_refs/twingate_version_shortener.go b/ee/maintained-apps/ingesters/homebrew/external_refs/twingate_version_shortener.go new file mode 100644 index 0000000000..dd16115d0f --- /dev/null +++ b/ee/maintained-apps/ingesters/homebrew/external_refs/twingate_version_shortener.go @@ -0,0 +1,27 @@ +package externalrefs + +import ( + "fmt" + "strings" + + maintained_apps "github.com/fleetdm/fleet/v4/ee/maintained-apps" +) + +// TwingateVersionShortener extracts the bundle_short_version from Homebrew's version format. +// Homebrew version format: "2025.288.20108" +// osquery bundle_short_version: "2025.288" +// osquery bundle_version: "120108" +// This extracts the first two parts (before the last dot) to match osquery's bundle_short_version. +func TwingateVersionShortener(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) { + homebrewVersion := app.Version + + // Split on dots and take the first two parts (bundle_short_version) + parts := strings.Split(homebrewVersion, ".") + if len(parts) >= 2 { + app.Version = strings.Join(parts[:2], ".") + } else { + return app, fmt.Errorf("Expected Twingate version to have format X.Y.Z but found '%s'", homebrewVersion) + } + + return app, nil +} diff --git a/ee/maintained-apps/inputs/homebrew/twingate.json b/ee/maintained-apps/inputs/homebrew/twingate.json new file mode 100644 index 0000000000..acc316e761 --- /dev/null +++ b/ee/maintained-apps/inputs/homebrew/twingate.json @@ -0,0 +1,8 @@ +{ + "name": "Twingate", + "unique_identifier": "com.twingate.macos", + "token": "twingate", + "installer_format": "pkg", + "slug": "twingate/darwin", + "default_categories": ["Productivity"] +} diff --git a/ee/maintained-apps/outputs/apps.json b/ee/maintained-apps/outputs/apps.json index fae507deba..e67572a097 100644 --- a/ee/maintained-apps/outputs/apps.json +++ b/ee/maintained-apps/outputs/apps.json @@ -764,6 +764,13 @@ "unique_identifier": "net.tunnelblick.tunnelblick", "description": "Tunnelblick is a free and open-source OpenVPN client." }, + { + "name": "Twingate", + "slug": "twingate/darwin", + "platform": "darwin", + "unique_identifier": "com.twingate.macos", + "description": "Twingate is a zero trust network access platform." + }, { "name": "Microsoft Visual Studio Code", "slug": "visual-studio-code/darwin", diff --git a/ee/maintained-apps/outputs/twingate/darwin.json b/ee/maintained-apps/outputs/twingate/darwin.json new file mode 100644 index 0000000000..c70dfdaf69 --- /dev/null +++ b/ee/maintained-apps/outputs/twingate/darwin.json @@ -0,0 +1,21 @@ +{ + "versions": [ + { + "version": "2025.288", + "queries": { + "exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.twingate.macos';" + }, + "installer_url": "https://binaries.twingate.com/client/macos/2025.288.20108/Twingate.pkg", + "install_script_ref": "46fecb23", + "uninstall_script_ref": "1dcccc7a", + "sha256": "22b5143a3eba41c5494c4ddd962aedd9591b4fe22b87124b6bcd94c3136b368d", + "default_categories": [ + "Productivity" + ] + } + ], + "refs": { + "1dcccc7a": "#!/bin/sh\n\n# variables\nLOGGED_IN_USER=$(scutil <<< \"show State:/Users/ConsoleUser\" | awk '/Name :/ { print $3 }')\n# functions\n\nexpand_pkgid_and_map() {\n local PKGID=\"$1\"\n local FUNC=\"$2\"\n if [[ \"$PKGID\" == *\"*\" ]]; then\n local prefix=\"${PKGID%\\*}\"\n echo \"Expanding wildcard for PKGID: $PKGID\"\n for receipt in $(pkgutil --pkgs | grep \"^${prefix}\"); do\n echo \"Processing $receipt\"\n \"$FUNC\" \"$receipt\"\n done\n else\n \"$FUNC\" \"$PKGID\"\n fi\n}\n\nforget_pkg() {\n local PKGID=\"$1\"\n expand_pkgid_and_map \"$PKGID\" forget_receipt\n}\n\nforget_receipt() {\n local PKGID=\"$1\"\n sudo pkgutil --forget \"$PKGID\"\n}\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\nremove_launchctl_service() {\n local service=\"$1\"\n local booleans=(\"true\" \"false\")\n local plist_status\n local paths\n local should_sudo\n\n echo \"Removing launchctl service ${service}\"\n\n for should_sudo in \"${booleans[@]}\"; do\n plist_status=$(launchctl list \"${service}\" 2>/dev/null)\n\n if [[ $plist_status == \\{* ]]; then\n if [[ $should_sudo == \"true\" ]]; then\n sudo launchctl remove \"${service}\"\n else\n launchctl remove \"${service}\"\n fi\n sleep 1\n fi\n\n paths=(\n \"/Library/LaunchAgents/${service}.plist\"\n \"/Library/LaunchDaemons/${service}.plist\"\n )\n\n # if not using sudo, prepend the home directory to the paths\n if [[ $should_sudo == \"false\" ]]; then\n for i in \"${!paths[@]}\"; do\n paths[i]=\"${HOME}${paths[i]}\"\n done\n fi\n\n for path in \"${paths[@]}\"; do\n if [[ -e \"$path\" ]]; then\n if [[ $should_sudo == \"true\" ]]; then\n sudo rm -f -- \"$path\"\n else\n rm -f -- \"$path\"\n fi\n fi\n done\n done\n}\n\nremove_pkg_files() {\n local PKGID=\"$1\"\n expand_pkgid_and_map \"$PKGID\" remove_receipt_files\n}\n\nremove_receipt_files() {\n local PKGID=\"$1\"\n local PKGINFO VOLUME INSTALL_LOCATION FULL_INSTALL_LOCATION\n\n echo \"pkgutil --pkg-info-plist \\\"$PKGID\\\"\"\n PKGINFO=$(pkgutil --pkg-info-plist \"$PKGID\")\n VOLUME=$(echo \"$PKGINFO\" | awk '/volume<\\/key>/ {getline; gsub(/.*|<\\/string>.*/, \"\"); print}')\n INSTALL_LOCATION=$(echo \"$PKGINFO\" | awk '/install-location<\\/key>/ {getline; gsub(/.*|<\\/string>.*/, \"\"); print}')\n\n if [ -z \"$INSTALL_LOCATION\" ] || [ \"$INSTALL_LOCATION\" = \"/\" ]; then\n FULL_INSTALL_LOCATION=\"$VOLUME\"\n else\n FULL_INSTALL_LOCATION=\"$VOLUME/$INSTALL_LOCATION\"\n FULL_INSTALL_LOCATION=$(echo \"$FULL_INSTALL_LOCATION\" | sed 's|//|/|g')\n fi\n\n echo \"sudo pkgutil --only-files --files \\\"$PKGID\\\" | sed \\\"s|^|${FULL_INSTALL_LOCATION}/|\\\" | tr '\\\\\\\\n' '\\\\\\\\0' | /usr/bin/sudo -u root -E -- /usr/bin/xargs -0 -- /bin/rm -rf\"\n sudo pkgutil --only-files --files \"$PKGID\" | sed \"s|^|/${INSTALL_LOCATION}/|\" | tr '\\n' '\\0' | /usr/bin/sudo -u root -E -- /usr/bin/xargs -0 -- /bin/rm -rf\n\n echo \"sudo pkgutil --only-dirs --files \\\"$PKGID\\\" | sed \\\"s|^|${FULL_INSTALL_LOCATION}/|\\\" | grep '\\\\.app$' | tr '\\\\\\\\n' '\\\\\\\\0' | /usr/bin/sudo -u root -E -- /usr/bin/xargs -0 -- /bin/rm -rf\"\n sudo pkgutil --only-dirs --files \"$PKGID\" | sed \"s|^|${FULL_INSTALL_LOCATION}/|\" | grep '\\.app$' | tr '\\n' '\\0' | /usr/bin/sudo -u root -E -- /usr/bin/xargs -0 -- /bin/rm -rf\n\n root_app_dir=$(\n sudo pkgutil --only-dirs --files \"$PKGID\" \\\n | sed \"s|^|${FULL_INSTALL_LOCATION}/|\" \\\n | grep 'Applications' \\\n | awk '{ print length, $0 }' \\\n | sort -n \\\n | head -n1 \\\n | cut -d' ' -f2-\n )\n if [ -n \"$root_app_dir\" ]; then\n echo \"sudo rmdir -p \\\"$root_app_dir\\\" 2>/dev/null || :\"\n sudo rmdir -p \"$root_app_dir\" 2>/dev/null || :\n fi\n}\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\nremove_launchctl_service 'com.twingate.macos.launcher'\nquit_application 'com.twingate.macos'\nremove_pkg_files 'com.twingate.macos'\nforget_pkg 'com.twingate.macos'\n(cd /Users/$LOGGED_IN_USER && 'networksetup' '-deletepppoeservice' 'Twingate') || true\ntrash $LOGGED_IN_USER '~/Library/Application Scripts/6GX8KVTR9H.com.twingate'\ntrash $LOGGED_IN_USER '~/Library/Application Scripts/group.com.twingate'\ntrash $LOGGED_IN_USER '~/Library/Containers/com.twingate.macos'\ntrash $LOGGED_IN_USER '~/Library/Containers/com.twingate.macos.tunnelprovider'\ntrash $LOGGED_IN_USER '~/Library/Group Containers/6GX8KVTR9H.com.twingate'\ntrash $LOGGED_IN_USER '~/Library/Group Containers/group.com.twingate'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.twingate.macos.plist'\n", + "46fecb23": "#!/bin/sh\n\n# variables\nAPPDIR=\"/Applications/\"\nTMPDIR=$(dirname \"$(realpath $INSTALLER_PATH)\")\n\n# install pkg files\nsudo installer -pkg \"$TMPDIR/Twingate.pkg\" -target /\n" + } +} diff --git a/frontend/pages/SoftwarePage/components/icons/Twingate.tsx b/frontend/pages/SoftwarePage/components/icons/Twingate.tsx new file mode 100644 index 0000000000..c8063fa17a --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/Twingate.tsx @@ -0,0 +1,14 @@ +import * as React from "react"; + +import type { SVGProps } from "react"; + +const Twingate = (props: SVGProps) => ( + + + +); +export default Twingate; diff --git a/website/assets/images/app-icon-twingate-60x60@2x.png b/website/assets/images/app-icon-twingate-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..18350ca68de24136c7efd0a08153ddc8cc2b9083 GIT binary patch literal 4549 zcmZvAWmwc*(D#3r1(yyf5s4c_8l=0Cbm>}BloaWfSh`EPk!BGDZn{$t79>Pqsig&_ zOAy$X`~C2~&xhy3oS8E-XRhma&YZdCniy@E3NZm40RRBRYN|@Q_Z;ybLGkX_0hw20 z_YCBrtD*qZPSEe(Z(T0m=mP;+he(Qo3^d4~2CkxZqiV z??0e<)*}lzJjX&;_k-6qD!b#eS=)*Bk%5K99j5;EaKq)na&F&Q=e=bk;gPy3(|Ss@ z54^FWwif1l^7UC4AvL#sN=nM{Dcj4Ovors$E-41B;qdTq%_T{Dd4jF{%Bm{yn7_wp zH2PN5d1>C#%&haX&*4fYxl!E7USpcwTqBGc=s&o+`+I0=YipYbq#j;g1>iIZz`0&C z5k-*2-x?SgbQB2_z+0Se8Pmug_7|m78ua)TGDXw$ zinZyO4CxK|OaIQ5|6S#6)t)v;-rUg8VD~ZIUZpj(XvA;}a`z+X_WB%GyUVB)>eAxt zN&d`vxxGoIi0Z~XT>$AEYenGekP;UC`1cpHnxmp>w4A)0j1ddO!+5=CXQ|C2A6Z>J z_x5Sy@{Aq}nJ8wTK!J99Cg)q_r%#?~$T=3zLGnL;%@W9x!4jst7M)_Wfj4f_5HD+n zb^m>IlMa(SN;0Qk=%TRrriKCOmi;i>9uGw;!z&x`$Msr^GA2`&sUYfL-q-P57d$|Y z6J8|f%P5NOCHz{*tDNkcQ1P0J--W!xAF)RwbKYujrQScz3tG~OFNY|-Q+2<)x%x!S z19uAR=~fXU_k^4Oq$cDuYvrf#AQ~lFx)BSuqu8jjy zp;Z`E7x?#r60E1l>Vy~+d53oL$aY~URMilwtO+@f-KL8FfTBh~;%#U;esot!ozUPh z|6FK#JJ;rm2{o7r%?4wJH0PGSBs}i1r}K1{KWCRiTR&OXSIYS!`Y*xB@0Bje3Z0S{ zJv9&N|5{1l)}j5TNM&zaMF~WPf&>)-snx(s^B09Ofp@PYnyIOv)uyx(o|W3Vx{l)O*a`AHlF-OOI6d~?==K5EX z-kXFq@Fs5}x-5QpOqpk7JDBAjmHYkz%;@&82iwj6W<XlG=oFvbVYSx0!|2$^ z$Ee5@z?4kD)YPsLO4z9(+#-<#`d55CQp&1oYE50Eq~NX&sc?HNoa2fj1mkrJslAJ{r%kWSHq4q zD3aYwZj*JRtMv4i@X}INNyHmkJj^j=WJLQ9(x2pjrMI`p(+QmrPHeVa0aXT%>6+11 zBG>}A&h=sHvmD`eLr~E$-=afJ@M?FU0`?9ke7WNi`ZBj1$yCwJD#UJ*Nd;=|HMR$h zHzN!|M=M@)=Kp?@({{<%zq)^@Xw2zT70s=wQ z3Pg=*%SuL8mROPexJW#c-p`4$QJ0zWcY{o&^5RbOEDAw)vOJf}R{9s~7yFCCCQV3O zglQ`t3H?Z_7+NJhhmA_phu1)6xh+Nis#xB{!s5~M{o)8#dh(@U?5!3{l4Ca#*6Md^ zYw75?C&mMqq<9}JwFTWD2`UY^Djp3!9k*#dW$sm$qW3g$o%fH%x0uA{M zUgp0U{W(<b9ip6$*PHQ_FY*z~cS?I@x{HD0QPI7Lp=qvHvq)LRxOfKyfx#W7Pm#q@TclE7 zMJb6v`U^`g=L%9?>3p@(VMfKPm*SY)DdlV{_v6XevxLW3w#`k~&)e9rN^^Vd6}PDU zmrRrWqWq$wMzi*E34m|+?Zsl@g3fK~mFMnsrVFd~*0)?ymHQOQ>BaWR3$c?vk)YEF z6KI8%V82##=#^K}5m!}k`8 zIfXf_N0OP7O4x^*z_DO{`$;A~c*OpfJ3+e%N+i;eDCJi$r|jpDdX=?eQf5Av)K_8C zWC%Qg2fpR=#O#USB5)ur>|6+l+cjDHjTk#eOt#i{|G>(o%bNOPLgb09N=A3`Kpj*i zcs61ECA1;<#dnpk`VcNQ;}&Og34&kL%JWp!{yX^w?b&?D8&?!fW_Ve-NKzK5Jh^x( z#pJ7~kMFt4*3%%pGd;mr3-t)4Q)!-){{DZ=4M-U8vVx;&B)Tg`4;NcL^DMQslckOb zInDDckJqpQD~*jpruYC)u=Ihsg!lG%?sD(weQ*Q)!HH`?hapG!?TeMKbfFDk0A~{C z+lOMx7^)W=7W(?73x}}nQv%}C9X>L#u$|4PuRe<5%7*z!B`9YMH@skysYBGV_8C5q z%#(i4ORF-3?RvixX>)h_O^ecd|9Yw3u=}6&&Ca>S5K*%a15Zsry(u*ezUfX+0V=9= zM^`MzxRjW$0?yyRZ|69lyxWRer##5+9C$>GU+0GG@3PDLaZ=cjbjwvi`uhUK zD@UY{wXvBS9Bysj5b{1T{*crFCgV!$UlCvScmS&i(Phbah>##+(Ui@cAP6mx@IoJ_ zO8W0cl56ptsGsN<0{1mrzr4j-a%c|72Vym)j>=mZ|BKYL(LTk=wt}36VJ%L{e3z4-IMwJ^{eK8wMLx~9gM#I!|tJY2*`)z8LJyZ2jxx9J z*mV&Hc9ISV#^9TJGPz$gz;FCdLv%N{u~{AXH&FsEHC z(fQal04?MM8MnHw`JpNUZJsK4*O)ra#H1e;kKOrij-(6&VfPVesc@MPBRtUFoe*qu zkK2Zw5VyOeKq0El_t;v-x#c^*dO9%4-1v5`R!SHbo*ntxwcw=Q_qgyM83sG)wdP!t zm>%QHOv|7vpPSFrgpH zvRS11*wf^y z?a#9xACZJm)>@M`_btok;%{=dn%+RaUB(EV4%J2|N=vr+E3?J=z_8Bqb+04~o?e1u z9fmrnL6t+vNAx#ihtb(Jo&S=uDHeY`DVrc}q`W_%tcYFbUvy5pL{d4iNE9H%`_&ymwHF zm8pQ``wLE98;A!ftW9zO+&g$TV2%8C<8Tk$sUzlaiY1iYG=rVkO+n|RX)QUZ$Pz;& z1MAhwl;DiEgQ&djXa5l1H&HX^7E5^Pvgdef+m{hrYvq-nFi`y&R{d+1tL6U2hxfX# zY(FP38<5gDkl=|7lzFjRCLO*ILKtfgF_M8hvJx&H((eb>9p&wmG{e(3c8{1_)tDEhGTyK?w#Ildf%!waaB zl9s+D3>d!9f#THYi_(??3Ek(v=CJN#89dLl(`Gr&H(BxQEoX>K5GrewLNBdUy_GEel@*rYB=i6-!rhB-|FAt%Y0=w2iUTRZ+v7T32stdK!2Qmg31^yZ4E5gc6@^KhStKYd$9Z{z8gI3yo;K@4GyNTwTb2QinNE_+YCp#5%krZ69W; zw$SYK^ik9btkWLWSg7|`5$8;~h0pRX=6yT3rUfc$j0gMt0xr%6XNlL?5z9Pke>b@H%Nc_+NQKRy{vjy z!ADU}S<!_Dmy)A(;DVbLEe4_ zQAJ4%-4te{LGXKW$fJfJl|=gNBpj{_Z?aQm!2%3^Lfj{WkIJ~GL8Lj@*L6j-z#+^xn78DRT&{S7<9Oe=iZ@bH6P0``C`V>UR<)+?uq#Gc%!5`_O?C0nA;75(A59q3u z?a4pX}U}S3g>#?Y_nFqIl z2F}KT)eHUwm#pJcU#pYZ4<9}>6c-nBWp#JQ&dtt0M{S(=p{bM1*393C%*mpyrDZU# zVMMs>n9fcR*Afk_xwiSKdU?bI*HIp1O?5Ds0I!4Yc`&yyWziPi|2mgg&je#}=htbL UPOa2O{u`mFDZ`X%6|6%44@feT