From e5ebc3e20b5f88fb08a7d1c25ff8da5c57d8e1c3 Mon Sep 17 00:00:00 2001 From: Ian Littman Date: Thu, 27 Mar 2025 17:01:47 -0500 Subject: [PATCH] Drop request timeout on FMA add endpoint (#27602) If the Fleet server is on a connection that can't pull ~150 Mbps down, it'll time out before being able to add Microsoft Word for macOS, due to the 100-second default timeout. This skips that behavior. # 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/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/Committing-Changes.md#changes-files) for more information. --- changes/27548-installer-download-fail | 2 +- cmd/fleet/serve.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/27548-installer-download-fail b/changes/27548-installer-download-fail index 2e50e737a4..c9edc0151f 100644 --- a/changes/27548-installer-download-fail +++ b/changes/27548-installer-download-fail @@ -1 +1 @@ -- Fixed software installer download errors by extending the timeout for the download endpoints. \ No newline at end of file +- Fixed software installer download and Fleet Maintained App add errors by extending the timeout for the download and FMA add endpoints. \ No newline at end of file diff --git a/cmd/fleet/serve.go b/cmd/fleet/serve.go index bcb43c5d03..f49b728053 100644 --- a/cmd/fleet/serve.go +++ b/cmd/fleet/serve.go @@ -1224,6 +1224,7 @@ the way that the Fleet server works. (req.Method == http.MethodPatch && strings.HasSuffix(req.URL.Path, "/package") && strings.Contains(req.URL.Path, "/fleet/software/titles/")) || (req.Method == http.MethodPost && strings.HasSuffix(req.URL.Path, "/bootstrap")) || + (req.Method == http.MethodPost && strings.HasSuffix(req.URL.Path, "/fleet_maintained_apps")) || (req.Method == http.MethodGet && strings.Contains(req.URL.Path, "/package/token")) || (req.Method == http.MethodPost && strings.Contains(req.URL.Path, "orbit/software_install/package")) { var zeroTime time.Time