internal/web/export_test.go

@@ -1,5 +1,11 @@
 package web
 
+import "time"
+
 // DefaultUploadIdleTimeout exposes the production idle bound (#56) to the black-box tests:
 // cmd/tapir never sets App.UploadIdleTimeout, so this constant IS the deployed value.
 const DefaultUploadIdleTimeout = defaultUploadIdleTimeout
+
+// UploadIdleTimeoutForTest exposes the bound an App resolves to (#56), so a test can pin the
+// value the zero-value App -- production's -- actually uses rather than only the constant.
+func (a *App) UploadIdleTimeoutForTest() time.Duration { return a.uploadIdleTimeout() }

internal/web/uploads.go

@@ -142,6 +142,15 @@ func (a *App) handleUploadPost(w http.ResponseWriter, r *http.Request) {
 // hostile one; a legitimate upload, however slow, keeps delivering bytes.
 const defaultUploadIdleTimeout = 60 * time.Second
 
+// uploadIdleTimeout is the idle bound this App applies: UploadIdleTimeout when set, else
+// defaultUploadIdleTimeout. cmd/tapir leaves it unset, so production runs the default.
+func (a *App) uploadIdleTimeout() time.Duration {
+	if a.UploadIdleTimeout <= 0 {
+		return defaultUploadIdleTimeout
+	}
+	return a.UploadIdleTimeout
+}
+
 // idleBoundedBody bounds the SILENCE in an upload body, not its total duration (#56): every
 // read first pushes the connection's read deadline idle into the future, so a body that
 // keeps moving is never cut, and one that stops fails its read with a timeout. That read
@@ -152,10 +161,7 @@ const defaultUploadIdleTimeout = 60 * time.Second
 // the body is returned unbounded and that is logged: a control that silently does not
 // apply is worse than one that says so.
 func (a *App) idleBoundedBody(w http.ResponseWriter, body io.ReadCloser) io.ReadCloser {
-	idle := a.UploadIdleTimeout
+	idle := a.uploadIdleTimeout()
-	if idle <= 0 {
-		idle = defaultUploadIdleTimeout
-	}
 	rc := http.NewResponseController(w)
 	if err := rc.SetReadDeadline(time.Now().Add(idle)); err != nil {
 		a.logger().Warn("upload idle bound unavailable", "err", err)

internal/web/uploads_idle_handler_test.go

@@ -121,9 +121,18 @@ func TestDefaultUploadIdleTimeoutIsSixtySeconds(t *testing.T) {
 	require.Equal(t, 60*time.Second, web.DefaultUploadIdleTimeout)
 }
 
-// With UploadIdleTimeout unset the default applies: a body with 100 ms gaps between reads is
+// The bound an App actually resolves to, not the constant: production's App leaves
-// accepted (a default in milliseconds or nanoseconds would cut it).
+// UploadIdleTimeout unset, so the zero value must resolve to exactly 60 s, and a set value
-func TestUploadPost_AnUnsetIdleTimeoutAppliesTheDefaultAndAcceptsABodyWithSubSecondGaps(t *testing.T) {
+// must be used as given.
+func TestAppUploadIdleTimeout_ResolvesUnsetToSixtySecondsAndHonoursASetValue(t *testing.T) {
+	require.Equal(t, 60*time.Second, (&web.App{}).UploadIdleTimeoutForTest())
+	require.Equal(t, 60*time.Second, (&web.App{UploadIdleTimeout: -time.Second}).UploadIdleTimeoutForTest())
+	require.Equal(t, 300*time.Millisecond, (&web.App{UploadIdleTimeout: 300 * time.Millisecond}).UploadIdleTimeoutForTest())
+}
+
+// With UploadIdleTimeout unset, a body with 100 ms gaps between reads is not cut (a resolved
+// bound in milliseconds or nanoseconds would cut it). The exact value is pinned above.
+func TestUploadPost_AnUnsetIdleTimeoutDoesNotCutABodyWithSubSecondGaps(t *testing.T) {
 	addr := newIdleBoundServer(t, 0)
 	body, ct := multipartBody(t, bytes.Repeat([]byte("a"), 1000))