Cherry-Pick: Exempt bootstrap package uploads from server-side reques…

…t timeout (#25552) For #25533, merged into `main` in #25536
fleetdm · Jan 17, 2025 · b6b7032 · b6b7032
1 parent bc77c23
commit b6b7032
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/changes/25533-read-timeout-bootstrap-packages b/changes/25533-read-timeout-bootstrap-packages
@@ -0,0 +1 @@
+* Removed request timeout on bootstrap package uploads for consistency with software package upload endpoints
diff --git a/cmd/fleet/serve.go b/cmd/fleet/serve.go
@@ -1203,10 +1203,11 @@ the way that the Fleet server works.
 				}
 
 				if (req.Method == http.MethodPost && strings.HasSuffix(req.URL.Path, "/fleet/software/package")) ||
-					(req.Method == http.MethodPatch && strings.HasSuffix(req.URL.Path, "/package") && strings.Contains(req.URL.Path, "/fleet/software/titles/")) {
+					(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")) {
 					var zeroTime time.Time
 					rc := http.NewResponseController(rw)
-					// For large software installers, the server time needs time to read the full
+					// For large software installers and bootstrap packages, the server time needs time to read the full
 					// request body so we use the zero value to remove the deadline and override the
 					// default read timeout.
 					// TODO: Is this really how we want to handle this? Or would an arbitrarily long
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Removed request timeout on bootstrap package uploads for consistency with software package upload endpoints