reverseproxy: Test that WebSockets + unix-sockets works

.github/SECURITY.md

@@ -8,7 +8,7 @@ The Caddy project would like to make sure that it stays on top of all relevant a
 | Version     | Supported |
 | ----------- | ----------|
 | 2.latest    | ✔️        |
-| < 2.latest | :x:       |
+| <= 2.latest | :x:       |
 
 
 ## Acceptable Scope
@@ -25,8 +25,6 @@ Client-side exploits are out of scope. In other words, it is not a bug in Caddy
 
 Security bugs in code dependencies (including Go's standard library) are out of scope. Instead, if a dependency has patched a relevant security bug, please feel free to open a public issue or pull request to update that dependency in our code.
 
-Many reports are not security bugs and can be addressed by updating the documentation.
-
 We accept security reports and patches, but do not assign CVEs, for code that has not been released with a non-prerelease tag.
 
 

AGENTS.md

@@ -1,217 +0,0 @@
-# Caddy Project Guidelines
-
-## Mission
-
-**Every site on HTTPS.** Caddy is a security-first, modular, extensible server platform.
-
-## Code Style
-
-### Go Idioms
-
-Follow [Go Code Review Comments](https://go.dev/wiki/CodeReviewComments):
-
-- **Error flow**: Early return, indent error handling—not else blocks
-  ```go
-  if err != nil {
-      return err
-  }
-  // normal code
-  ```
-- **Naming**: initialisms (`URL`, `HTTP`, `ID`—not `Url`, `Http`, `Id`)
-- **Receiver names**: 1–2 letters reflecting type (`c` for `Client`, `h` for `Handler`)
-- **Error strings**: Lowercase, no trailing punctuation (`"something failed"` not `"Something failed."`)
-- **Doc comments**: Full sentences starting with the name being documented
-  ```go
-  // Handler serves HTTP requests for the file server.
-  type Handler struct { ... }
-  ```
-- **Empty slices**: `var t []string` (nil slice), not `t := []string{}` (non-nil zero-length)
-- **Don't panic**: Use error returns for normal error handling
-
-### Caddy Patterns
-
-**Module registration**:
-```go
-func init() {
-    caddy.RegisterModule(MyModule{})
-}
-
-func (MyModule) CaddyModule() caddy.ModuleInfo {
-    return caddy.ModuleInfo{
-        ID:  "namespace.category.name",
-        New: func() caddy.Module { return new(MyModule) },
-    }
-}
-```
-
-**Module lifecycle**: `New()` → JSON unmarshal → `Provision()` → `Validate()` → use → `Cleanup()`
-
-**Interface guards** — compile-time verification that modules implement required interfaces:
-```go
-var (
-    _ caddy.Provisioner     = (*MyModule)(nil)
-    _ caddy.Validator       = (*MyModule)(nil)
-    _ caddyfile.Unmarshaler = (*MyModule)(nil)
-)
-```
-
-**Structured logging** — use the module-scoped logger from context:
-```go
-func (m *MyModule) Provision(ctx caddy.Context) error {
-    m.logger = ctx.Logger()
-    m.logger.Debug("provisioning", zap.String("field", m.Field))
-    return nil
-}
-```
-
-**Caddyfile support** — implement `UnmarshalCaddyfile(*caddyfile.Dispenser)` using the `Dispenser` API:
-```go
-// UnmarshalCaddyfile sets up the module from Caddyfile tokens. Syntax:
-//
-//     directive [arg1] [arg2] {
-//         subdir value
-//     }
-func (m *MyModule) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
-    d.Next() // consume directive name
-    for d.NextArg() {
-        // handle inline arguments
-    }
-    for nesting := d.Nesting(); d.NextBlock(nesting); {
-        switch d.Val() {
-        case "subdir":
-            if !d.NextArg() {
-                return d.ArgErr()
-            }
-            m.Field = d.Val()
-        default:
-            return d.Errf("unrecognized subdirective: %s", d.Val())
-        }
-    }
-    return nil
-}
-```
-
-**Admin API**: Implement `caddy.AdminRouter` for custom endpoints.
-
-**Context**: Use `caddy.Context` for accessing other apps/modules and logging—don't store contexts in structs.
-
-## Architecture
-
-Caddy is built around a **module system** where everything is a module registered via `caddy.RegisterModule()`:
-
-- **Apps** (`caddy.App`): Top-level modules like `http`, `tls`, `pki` that Caddy loads and runs
-- **Modules** (`caddy.Module`): Extensible components with namespaced IDs (e.g., `http.handlers.file_server`)
-- **Configuration**: Native JSON with adapters (Caddyfile → JSON via `caddyconfig/httpcaddyfile`)
-
-| Directory | Purpose |
-|-----------|---------|
-| `modules/` | All standard modules (HTTP, TLS, PKI, etc.) |
-| `modules/standard/imports.go` | Standard module registry |
-| `caddyconfig/httpcaddyfile/` | Caddyfile → JSON adapter for HTTP |
-| `caddytest/` | Test utilities and integration tests |
-| `cmd/caddy/` | CLI entry point with module imports |
-
-### Critical Packages
-
-`caddyhttp` and `caddytls` require **extra scrutiny** in code review—these are security-critical.
-
-## Quality Gates
-
-
-**All required before PR is merge-ready:**
-
-| Gate | Command | Notes |
-|------|---------|-------|
-| Tests pass | `go test -race -short ./...` | Race detection enabled |
-| Lint clean | `golangci-lint run --timeout 10m` | No warnings in changed files |
-| Builds | `go build ./...` | Must compile |
-| Benchmarks | `go test -bench=. -benchmem` | Required for optimizations |
-
-CI runs tests on **Linux, macOS, and Windows**—ensure cross-platform compatibility.
-
-### Build & Test
-
-```bash
-# Build
-cd cmd/caddy && go build
-
-# Tests with race detection (matches CI)
-go test -race -short ./...
-
-# Integration tests
-go test ./caddytest/integration/...
-
-# Lint (matches CI)
-golangci-lint run --timeout 10m
-```
-
-## Testing Conventions
-
-**Table-driven tests** (preferred pattern):
-```go
-func TestFeature(t *testing.T) {
-    for i, tc := range []struct {
-        input    string
-        expected string
-        wantErr  bool
-    }{
-        {input: "valid", expected: "result", wantErr: false},
-        {input: "invalid", expected: "", wantErr: true},
-    } {
-        actual, err := Function(tc.input)
-        if tc.wantErr && err == nil {
-            t.Errorf("Test %d: expected error but got none", i)
-        }
-        if !tc.wantErr && err != nil {
-            t.Errorf("Test %d: unexpected error: %v", i, err)
-        }
-        if actual != tc.expected {
-            t.Errorf("Test %d: expected %q, got %q", i, tc.expected, actual)
-        }
-    }
-}
-```
-
-**Integration tests** use `caddytest.Tester`:
-```go
-func TestHTTPFeature(t *testing.T) {
-    tester := caddytest.NewTester(t)
-    tester.InitServer(`
-    {
-        admin localhost:2999
-        http_port 9080
-    }
-    localhost:9080 {
-        respond "hello"
-    }`, "caddyfile")
-    
-    tester.AssertGetResponse("http://localhost:9080/", 200, "hello")
-}
-```
-
-Use non-standard ports (9080, 9443, 2999) to avoid conflicts with running servers.
-
-## AI Contribution Policy
-
-Per [CONTRIBUTING.md](.github/CONTRIBUTING.md), AI-assisted code **MUST** be:
-
-1. **Disclosed** — Tell reviewers when code was AI-generated or AI-assisted, mentioning which agent/model is used
-2. **Fully comprehended** — You must be able to explain every line
-3. **Tested** — Automated tests when feasible, thorough manual tests otherwise
-4. **Licensed** — Verify AI output doesn't include plagiarized or incompatibly-licensed code
-5. **Contributor License Agreement (CLA)** — The CLA must be signed by the human user
-
-**Do NOT submit code you cannot fully explain.** Contributors are responsible for their submissions.
-
-## Dependencies
-
-- **Avoid new dependencies** — Justify any additions; tiny deps can be inlined
-- **No exported dependency types** — Caddy must not export types defined by external packages
-- Use Go modules; check with `go mod tidy`
-
-## Further Reading
-
-- [CONTRIBUTING.md](.github/CONTRIBUTING.md) — Full PR process and expectations
-- [Extending Caddy](https://caddyserver.com/docs/extending-caddy) — Module development guide
-- [JSON Config](https://caddyserver.com/docs/json/) — Native configuration reference
-- [Caddyfile](https://caddyserver.com/docs/caddyfile/concepts) — Caddyfile syntax guide

admin.go

@@ -45,8 +45,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-
-	"github.com/caddyserver/caddy/v2/internal"
 )
 
 // testCertMagicStorageOverride is a package-level test hook. Tests may set
@@ -120,6 +118,10 @@ type AdminConfig struct {
 	//
 	// EXPERIMENTAL: This feature is subject to change.
 	Remote *RemoteAdmin `json:"remote,omitempty"`
+
+	// Holds onto the routers so that we can later provision them
+	// if they require provisioning.
+	routers []AdminRouter
 }
 
 // ConfigSettings configures the management of configuration.
@@ -208,8 +210,8 @@ type AdminAccess struct {
 // AdminPermissions specifies what kinds of requests are allowed
 // to be made to the admin endpoint.
 type AdminPermissions struct {
-	// The API paths allowed. A request path must either equal an
-	// allowed path or be a subpath with a path-segment boundary.
+	// The API paths allowed. Paths are simple prefix matches.
+	// Any subpath of the specified paths will be allowed.
 	Paths []string `json:"paths,omitempty"`
 
 	// The HTTP methods allowed for the given paths.
@@ -218,7 +220,7 @@ type AdminPermissions struct {
 
 // newAdminHandler reads admin's config and returns an http.Handler suitable
 // for use in an admin endpoint server, which will be listening on listenAddr.
-func (admin *AdminConfig) newAdminHandler(addr NetworkAddress, remote bool, ctx Context) (adminHandler, error) {
+func (admin *AdminConfig) newAdminHandler(addr NetworkAddress, remote bool, _ Context) adminHandler {
 	muxWrap := adminHandler{mux: http.NewServeMux()}
 
 	// secure the local or remote endpoint respectively
@@ -275,21 +277,34 @@ func (admin *AdminConfig) newAdminHandler(addr NetworkAddress, remote bool, ctx
 	// register third-party module endpoints
 	for _, m := range GetModules("admin.api") {
 		router := m.New().(AdminRouter)
-
-		// provision the router before registering its routes, so
-		// handlers have access to all provisioned state
-		if provisioner, ok := router.(Provisioner); ok {
-			if err := provisioner.Provision(ctx); err != nil {
-				return adminHandler{}, fmt.Errorf("provisioning admin router module %s: %v", m.ID, err)
-			}
-		}
-
 		for _, route := range router.Routes() {
 			addRoute(route.Pattern, handlerLabel, route.Handler)
 		}
+		admin.routers = append(admin.routers, router)
 	}
 
-	return muxWrap, nil
+	return muxWrap
+}
+
+// provisionAdminRouters provisions all the router modules
+// in the admin.api namespace that need provisioning.
+func (admin *AdminConfig) provisionAdminRouters(ctx Context) error {
+	for _, router := range admin.routers {
+		provisioner, ok := router.(Provisioner)
+		if !ok {
+			continue
+		}
+
+		err := provisioner.Provision(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	// We no longer need the routers once provisioned, allow for GC
+	admin.routers = nil
+
+	return nil
 }
 
 // allowedOrigins returns a list of origins that are allowed.
@@ -413,7 +428,11 @@ func replaceLocalAdminServer(cfg *Config, ctx Context) error {
 		return err
 	}
 
-	handler, err := cfg.Admin.newAdminHandler(addr, false, ctx)
+	handler := cfg.Admin.newAdminHandler(addr, false, ctx)
+
+	// run the provisioners for loaded modules to make sure local
+	// state is properly re-initialized in the new admin server
+	err = cfg.Admin.provisionAdminRouters(ctx)
 	if err != nil {
 		return err
 	}
@@ -537,7 +556,11 @@ func replaceRemoteAdminServer(ctx Context, cfg *Config) error {
 
 	// make the HTTP handler but disable Host/Origin enforcement
 	// because we are using TLS authentication instead
-	handler, err := cfg.Admin.newAdminHandler(addr, true, ctx)
+	handler := cfg.Admin.newAdminHandler(addr, true, ctx)
+
+	// run the provisioners for loaded modules to make sure local
+	// state is properly re-initialized in the new admin server
+	err = cfg.Admin.provisionAdminRouters(ctx)
 	if err != nil {
 		return err
 	}
@@ -693,7 +716,7 @@ func (remote RemoteAdmin) enforceAccessControls(r *http.Request) error {
 						// verify path
 						pathFound := accessPerm.Paths == nil
 						for _, allowedPath := range accessPerm.Paths {
-							if adminPathAllowed(r.URL.Path, allowedPath) {
+							if strings.HasPrefix(r.URL.Path, allowedPath) {
 								pathFound = true
 								break
 							}
@@ -722,19 +745,6 @@ func (remote RemoteAdmin) enforceAccessControls(r *http.Request) error {
 	}
 }
 
-func adminPathAllowed(reqPath, allowedPath string) bool {
-	if allowedPath == "" || allowedPath == "/" {
-		return strings.HasPrefix(reqPath, allowedPath)
-	}
-	if reqPath == allowedPath {
-		return true
-	}
-	if strings.HasSuffix(allowedPath, "/") {
-		return strings.HasPrefix(reqPath, allowedPath)
-	}
-	return strings.HasPrefix(reqPath, allowedPath+"/")
-}
-
 func stopAdminServer(srv *http.Server) error {
 	if srv == nil {
 		return fmt.Errorf("no admin server")
@@ -790,7 +800,7 @@ func (h adminHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		zap.String("uri", r.RequestURI),
 		zap.String("remote_ip", ip),
 		zap.String("remote_port", port),
-		zap.Object("headers", internal.LoggableHTTPHeader{Header: r.Header}),
+		zap.Reflect("headers", r.Header),
 	)
 	if r.TLS != nil {
 		log = log.With(
@@ -1051,9 +1061,6 @@ func handleConfig(w http.ResponseWriter, r *http.Request) error {
 			buf.Reset()
 			defer bufPool.Put(buf)
 
-			const maxConfigSize = 100 * 1024 * 1024 // 100 MB
-			r.Body = http.MaxBytesReader(w, r.Body, maxConfigSize)
-
 			_, err := io.Copy(buf, r.Body)
 			if err != nil {
 				return APIError{
@@ -1136,20 +1143,6 @@ func handleStop(w http.ResponseWriter, r *http.Request) error {
 	return nil
 }
 
-func parseCanonicalArrayIndex(idx string) (int, error) {
-	if idx == "" {
-		return 0, fmt.Errorf("empty index")
-	}
-	i, err := strconv.Atoi(idx)
-	if err != nil {
-		return 0, err
-	}
-	if strconv.Itoa(i) != idx {
-		return 0, fmt.Errorf("non-canonical array index")
-	}
-	return i, nil
-}
-
 // unsyncedConfigAccess traverses into the current config and performs
 // the operation at path according to method, using body and out as
 // needed. This is a low-level, unsynchronized function; most callers
@@ -1211,12 +1204,11 @@ traverseLoop:
 				var idx int
 				if method != http.MethodPost {
 					idxStr := parts[len(parts)-1]
-					idx, err = parseCanonicalArrayIndex(idxStr)
+					idx, err = strconv.Atoi(idxStr)
 					if err != nil {
 						return fmt.Errorf("[%s] invalid array index '%s': %v",
 							path, idxStr, err)
 					}
-
 					if idx < 0 || (method != http.MethodPut && idx >= len(arr)) || idx > len(arr) {
 						return fmt.Errorf("[%s] array index out of bounds: %s", path, idxStr)
 					}
@@ -1316,7 +1308,7 @@ traverseLoop:
 			}
 
 		case []any:
-			partInt, err := parseCanonicalArrayIndex(part)
+			partInt, err := strconv.Atoi(part)
 			if err != nil {
 				return fmt.Errorf("[/%s] invalid array index '%s': %v",
 					strings.Join(parts[:i+1], "/"), part, err)

admin_test.go

@@ -15,13 +15,9 @@
 package caddy
 
 import (
-	"bytes"
 	"context"
-	"crypto"
-	"crypto/tls"
 	"crypto/x509"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"maps"
 	"net/http"
@@ -35,8 +31,6 @@ import (
 	"github.com/caddyserver/certmagic"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest/observer"
 )
 
 var testCfg = []byte(`{
@@ -57,13 +51,6 @@ var testCfg = []byte(`{
 		}
 		`)
 
-type testAdminPublicKey string
-
-func (k testAdminPublicKey) Equal(x crypto.PublicKey) bool {
-	other, ok := x.(testAdminPublicKey)
-	return ok && k == other
-}
-
 func TestUnsyncedConfigAccess(t *testing.T) {
 	// each test is performed in sequence, so
 	// each change builds on the previous ones;
@@ -255,51 +242,6 @@ func TestAdminHandlerErrorHandling(t *testing.T) {
 	}
 }
 
-func TestAdminHandlerServeHTTPRedactsSensitiveHeadersInLogs(t *testing.T) {
-	core, logs := observer.New(zap.InfoLevel)
-
-	defaultLoggerMu.Lock()
-	origLogger := defaultLogger.logger
-	defaultLogger.logger = zap.New(core)
-	defaultLoggerMu.Unlock()
-	t.Cleanup(func() {
-		defaultLoggerMu.Lock()
-		defaultLogger.logger = origLogger
-		defaultLoggerMu.Unlock()
-	})
-
-	handler := adminHandler{
-		mux: http.NewServeMux(),
-	}
-	req := httptest.NewRequest(http.MethodGet, "/", nil)
-	req.Header.Set("Authorization", "Bearer secret")
-	req.Header.Set("Cookie", "session=secret")
-	req.Header.Set("X-Test", "ok")
-	rr := httptest.NewRecorder()
-
-	handler.ServeHTTP(rr, req)
-
-	if logs.Len() == 0 {
-		t.Fatal("expected request log entry")
-	}
-
-	ctx := logs.All()[0].ContextMap()
-	headers, ok := ctx["headers"].(map[string]any)
-	if !ok {
-		t.Fatalf("expected headers field in log context, got %T", ctx["headers"])
-	}
-
-	if got := headers["Authorization"]; !reflect.DeepEqual(got, []any{"REDACTED"}) {
-		t.Fatalf("expected redacted Authorization header, got %#v", got)
-	}
-	if got := headers["Cookie"]; !reflect.DeepEqual(got, []any{"REDACTED"}) {
-		t.Fatalf("expected redacted Cookie header, got %#v", got)
-	}
-	if got := headers["X-Test"]; !reflect.DeepEqual(got, []any{"ok"}) {
-		t.Fatalf("expected X-Test header to remain visible, got %#v", got)
-	}
-}
-
 func initAdminMetrics() {
 	if adminMetrics.requestErrors != nil {
 		prometheus.Unregister(adminMetrics.requestErrors)
@@ -340,10 +282,7 @@ func TestAdminHandlerBuiltinRouteErrors(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to parse address: %v", err)
 	}
-	handler, err := cfg.Admin.newAdminHandler(addr, false, Context{})
-	if err != nil {
-		t.Fatalf("Failed to create admin handler: %v", err)
-	}
+	handler := cfg.Admin.newAdminHandler(addr, false, Context{})
 
 	tests := []struct {
 		name           string
@@ -464,10 +403,7 @@ func TestNewAdminHandlerRouterRegistration(t *testing.T) {
 	admin := &AdminConfig{
 		EnforceOrigin: false,
 	}
-	handler, err := admin.newAdminHandler(addr, false, Context{})
-	if err != nil {
-		t.Fatalf("Failed to create admin handler: %v", err)
-	}
+	handler := admin.newAdminHandler(addr, false, Context{})
 
 	req := httptest.NewRequest("GET", "/mock", nil)
 	req.Host = "localhost:2019"
@@ -479,6 +415,10 @@ func TestNewAdminHandlerRouterRegistration(t *testing.T) {
 		t.Errorf("Expected status code %d but got %d", http.StatusOK, rr.Code)
 		t.Logf("Response body: %s", rr.Body.String())
 	}
+
+	if len(admin.routers) != 1 {
+		t.Errorf("Expected 1 router to be stored, got %d", len(admin.routers))
+	}
 }
 
 type mockProvisionableRouter struct {
@@ -516,16 +456,19 @@ func TestAdminRouterProvisioning(t *testing.T) {
 		name         string
 		provisionErr error
 		wantErr      bool
+		routersAfter int // expected number of routers after provisioning
 	}{
 		{
 			name:         "successful provisioning",
 			provisionErr: nil,
 			wantErr:      false,
+			routersAfter: 0,
 		},
 		{
 			name:         "provisioning error",
 			provisionErr: fmt.Errorf("provision failed"),
 			wantErr:      true,
+			routersAfter: 1,
 		},
 	}
 
@@ -561,7 +504,8 @@ func TestAdminRouterProvisioning(t *testing.T) {
 				t.Fatalf("Failed to parse address: %v", err)
 			}
 
-			_, err = admin.newAdminHandler(addr, false, Context{})
+			_ = admin.newAdminHandler(addr, false, Context{})
+			err = admin.provisionAdminRouters(Context{})
 
 			if test.wantErr {
 				if err == nil {
@@ -572,6 +516,10 @@ func TestAdminRouterProvisioning(t *testing.T) {
 					t.Errorf("Expected no error but got: %v", err)
 				}
 			}
+
+			if len(admin.routers) != test.routersAfter {
+				t.Errorf("Expected %d routers after provisioning, got %d", test.routersAfter, len(admin.routers))
+			}
 		})
 	}
 }
@@ -656,99 +604,6 @@ func TestAllowedOriginsUnixSocket(t *testing.T) {
 	}
 }
 
-func TestRemoteAdminAccessControlPathSegmentMatching(t *testing.T) {
-	const authorizedKey testAdminPublicKey = "authorized"
-	peerCert := &x509.Certificate{PublicKey: authorizedKey}
-
-	tests := []struct {
-		name        string
-		allowedPath string
-		requestPath string
-		wantErr     bool
-	}{
-		{
-			name:        "exact path",
-			allowedPath: "/pki/ca/prod",
-			requestPath: "/pki/ca/prod",
-			wantErr:     false,
-		},
-		{
-			name:        "subpath",
-			allowedPath: "/pki/ca/prod",
-			requestPath: "/pki/ca/prod/certificates",
-			wantErr:     false,
-		},
-		{
-			name:        "trailing slash subpath",
-			allowedPath: "/pki/ca/prod/",
-			requestPath: "/pki/ca/prod/certificates",
-			wantErr:     false,
-		},
-		{
-			name:        "sibling with shared prefix",
-			allowedPath: "/pki/ca/prod",
-			requestPath: "/pki/ca/prod-backup",
-			wantErr:     true,
-		},
-		{
-			name:        "same segment plus digit",
-			allowedPath: "/pki/ca/prod",
-			requestPath: "/pki/ca/prod1",
-			wantErr:     true,
-		},
-		{
-			name:        "root path",
-			allowedPath: "/",
-			requestPath: "/pki/ca/prod",
-			wantErr:     false,
-		},
-	}
-
-	for i, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			remote := RemoteAdmin{
-				AccessControl: []*AdminAccess{
-					{
-						Permissions: []AdminPermissions{
-							{
-								Methods: []string{http.MethodGet},
-								Paths:   []string{test.allowedPath},
-							},
-						},
-						publicKeys: []crypto.PublicKey{authorizedKey},
-					},
-				},
-			}
-
-			req := httptest.NewRequest(http.MethodGet, "https://localhost:2021"+test.requestPath, nil)
-			req.TLS = &tls.ConnectionState{
-				VerifiedChains: [][]*x509.Certificate{{peerCert}},
-			}
-
-			err := remote.enforceAccessControls(req)
-			if test.wantErr {
-				if err == nil {
-					t.Errorf("test %d (%s): allowed path %q, request path %q: expected forbidden error, got nil", i, test.name, test.allowedPath, test.requestPath)
-					return
-				}
-				var apiErr APIError
-				if !errors.As(err, &apiErr) {
-					t.Errorf("test %d (%s): allowed path %q, request path %q: expected APIError with HTTP status %d, got %T: %v", i, test.name, test.allowedPath, test.requestPath, http.StatusForbidden, err, err)
-					return
-				}
-				if apiErr.HTTPStatus != http.StatusForbidden {
-					t.Errorf("test %d (%s): allowed path %q, request path %q: expected HTTP status %d, got %d", i, test.name, test.allowedPath, test.requestPath, http.StatusForbidden, apiErr.HTTPStatus)
-				}
-				return
-			}
-
-			if err != nil {
-				t.Errorf("test %d (%s): allowed path %q, request path %q: expected no error, got %v", i, test.name, test.allowedPath, test.requestPath, err)
-			}
-		})
-	}
-}
-
 func TestReplaceRemoteAdminServer(t *testing.T) {
 	const testCert = `MIIDCTCCAfGgAwIBAgIUXsqJ1mY8pKlHQtI3HJ23x2eZPqwwDQYJKoZIhvcNAQEL
 BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIzMDEwMTAwMDAwMFoXDTI0MDEw
@@ -1101,47 +956,3 @@ MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDRS0LmTwUT0iwP
 		})
 	}
 }
-
-func TestUnsyncedConfigAccessCanonicalArrayIndices(t *testing.T) {
-	rawCfg = map[string]any{
-		rawConfigKey: map[string]any{
-			"list": []any{"zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"},
-		},
-	}
-
-	tests := []struct {
-		name       string
-		path       string
-		wantOutput string
-		wantErr    bool
-	}{
-		{name: "allow zero", path: "/" + rawConfigKey + "/list/0", wantOutput: "\"zero\"\n"},
-		{name: "allow one", path: "/" + rawConfigKey + "/list/1", wantOutput: "\"one\"\n"},
-		{name: "allow ten", path: "/" + rawConfigKey + "/list/10", wantOutput: "\"ten\"\n"},
-		{name: "reject leading zero", path: "/" + rawConfigKey + "/list/01", wantErr: true},
-		{name: "reject multiple leading zeros", path: "/" + rawConfigKey + "/list/002", wantErr: true},
-		{name: "reject plus sign", path: "/" + rawConfigKey + "/list/+1", wantErr: true},
-		{name: "reject negative zero", path: "/" + rawConfigKey + "/list/-0", wantErr: true},
-	}
-
-	for i, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			var gotOutput bytes.Buffer
-			err := unsyncedConfigAccess(http.MethodGet, tc.path, nil, &gotOutput)
-
-			if tc.wantErr {
-				if err == nil {
-					t.Errorf("test %d (%s): input path %q: expected error, got nil with output %q", i, tc.name, tc.path, gotOutput.String())
-				}
-				return
-			}
-
-			if err != nil {
-				t.Errorf("test %d (%s): input path %q: expected no error with output %q, got error %v with output %q", i, tc.name, tc.path, tc.wantOutput, err, gotOutput.String())
-			}
-			if gotOutput.String() != tc.wantOutput {
-				t.Errorf("test %d (%s): input path %q: expected output %q, got %q", i, tc.name, tc.path, tc.wantOutput, gotOutput.String())
-			}
-		})
-	}
-}

api_error_test.go

@@ -1,377 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"testing"
-)
-
-func TestAPIError_Error_WithErr(t *testing.T) {
-	underlyingErr := errors.New("underlying error")
-	apiErr := APIError{
-		HTTPStatus: http.StatusBadRequest,
-		Err:        underlyingErr,
-		Message:    "API error message",
-	}
-
-	result := apiErr.Error()
-	expected := "underlying error"
-
-	if result != expected {
-		t.Errorf("Expected '%s', got '%s'", expected, result)
-	}
-}
-
-func TestAPIError_Error_WithoutErr(t *testing.T) {
-	apiErr := APIError{
-		HTTPStatus: http.StatusBadRequest,
-		Err:        nil,
-		Message:    "API error message",
-	}
-
-	result := apiErr.Error()
-	expected := "API error message"
-
-	if result != expected {
-		t.Errorf("Expected '%s', got '%s'", expected, result)
-	}
-}
-
-func TestAPIError_Error_BothNil(t *testing.T) {
-	apiErr := APIError{
-		HTTPStatus: http.StatusBadRequest,
-		Err:        nil,
-		Message:    "",
-	}
-
-	result := apiErr.Error()
-	expected := ""
-
-	if result != expected {
-		t.Errorf("Expected empty string, got '%s'", result)
-	}
-}
-
-func TestAPIError_JSON_Serialization(t *testing.T) {
-	tests := []struct {
-		name   string
-		apiErr APIError
-	}{
-		{
-			name: "with message only",
-			apiErr: APIError{
-				HTTPStatus: http.StatusBadRequest,
-				Message:    "validation failed",
-			},
-		},
-		{
-			name: "with underlying error only",
-			apiErr: APIError{
-				HTTPStatus: http.StatusInternalServerError,
-				Err:        errors.New("internal error"),
-			},
-		},
-		{
-			name: "with both message and error",
-			apiErr: APIError{
-				HTTPStatus: http.StatusConflict,
-				Err:        errors.New("underlying"),
-				Message:    "conflict detected",
-			},
-		},
-		{
-			name: "minimal error",
-			apiErr: APIError{
-				HTTPStatus: http.StatusNotFound,
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			// Marshal to JSON
-			jsonData, err := json.Marshal(test.apiErr)
-			if err != nil {
-				t.Fatalf("Failed to marshal APIError: %v", err)
-			}
-
-			// Unmarshal back
-			var unmarshaled APIError
-			err = json.Unmarshal(jsonData, &unmarshaled)
-			if err != nil {
-				t.Fatalf("Failed to unmarshal APIError: %v", err)
-			}
-
-			// Only Message field should survive JSON round-trip
-			// HTTPStatus and Err are marked with json:"-"
-			if unmarshaled.Message != test.apiErr.Message {
-				t.Errorf("Message mismatch: expected '%s', got '%s'",
-					test.apiErr.Message, unmarshaled.Message)
-			}
-
-			// HTTPStatus and Err should be zero values after unmarshal
-			if unmarshaled.HTTPStatus != 0 {
-				t.Errorf("HTTPStatus should be 0 after unmarshal, got %d", unmarshaled.HTTPStatus)
-			}
-			if unmarshaled.Err != nil {
-				t.Errorf("Err should be nil after unmarshal, got %v", unmarshaled.Err)
-			}
-		})
-	}
-}
-
-func TestAPIError_HTTPStatus_Values(t *testing.T) {
-	// Test common HTTP status codes
-	statusCodes := []int{
-		http.StatusBadRequest,
-		http.StatusUnauthorized,
-		http.StatusForbidden,
-		http.StatusNotFound,
-		http.StatusMethodNotAllowed,
-		http.StatusConflict,
-		http.StatusPreconditionFailed,
-		http.StatusInternalServerError,
-		http.StatusNotImplemented,
-		http.StatusServiceUnavailable,
-	}
-
-	for _, status := range statusCodes {
-		t.Run(fmt.Sprintf("status_%d", status), func(t *testing.T) {
-			apiErr := APIError{
-				HTTPStatus: status,
-				Message:    http.StatusText(status),
-			}
-
-			if apiErr.HTTPStatus != status {
-				t.Errorf("Expected status %d, got %d", status, apiErr.HTTPStatus)
-			}
-
-			// Test that error message is reasonable
-			if apiErr.Message == "" && status >= 400 {
-				t.Errorf("Status %d should have a message", status)
-			}
-		})
-	}
-}
-
-func TestAPIError_ErrorInterface_Compliance(t *testing.T) {
-	// Verify APIError properly implements error interface
-	var err error = APIError{
-		HTTPStatus: http.StatusBadRequest,
-		Message:    "test error",
-	}
-
-	errorMsg := err.Error()
-	if errorMsg != "test error" {
-		t.Errorf("Expected 'test error', got '%s'", errorMsg)
-	}
-
-	// Test with underlying error
-	underlyingErr := errors.New("underlying")
-	err2 := APIError{
-		HTTPStatus: http.StatusInternalServerError,
-		Err:        underlyingErr,
-		Message:    "wrapper",
-	}
-
-	if err2.Error() != "underlying" {
-		t.Errorf("Expected 'underlying', got '%s'", err2.Error())
-	}
-}
-
-func TestAPIError_JSON_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name    string
-		message string
-	}{
-		{
-			name:    "empty message",
-			message: "",
-		},
-		{
-			name:    "unicode message",
-			message: "Error: 🚨 Something went wrong! 你好",
-		},
-		{
-			name:    "json characters in message",
-			message: `Error with "quotes" and {brackets}`,
-		},
-		{
-			name:    "newlines in message",
-			message: "Line 1\nLine 2\r\nLine 3",
-		},
-		{
-			name:    "very long message",
-			message: string(make([]byte, 10000)), // 10KB message
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			apiErr := APIError{
-				HTTPStatus: http.StatusBadRequest,
-				Message:    test.message,
-			}
-
-			// Should be JSON serializable
-			jsonData, err := json.Marshal(apiErr)
-			if err != nil {
-				t.Fatalf("Failed to marshal APIError: %v", err)
-			}
-
-			// Should be deserializable
-			var unmarshaled APIError
-			err = json.Unmarshal(jsonData, &unmarshaled)
-			if err != nil {
-				t.Fatalf("Failed to unmarshal APIError: %v", err)
-			}
-
-			if unmarshaled.Message != test.message {
-				t.Errorf("Message corrupted during JSON round-trip")
-			}
-		})
-	}
-}
-
-func TestAPIError_Chaining(t *testing.T) {
-	// Test error chaining scenarios
-	rootErr := errors.New("root cause")
-	wrappedErr := fmt.Errorf("wrapped: %w", rootErr)
-
-	apiErr := APIError{
-		HTTPStatus: http.StatusInternalServerError,
-		Err:        wrappedErr,
-		Message:    "API wrapper",
-	}
-
-	// Error() should return the underlying error message
-	if apiErr.Error() != wrappedErr.Error() {
-		t.Errorf("Expected underlying error message, got '%s'", apiErr.Error())
-	}
-
-	// Should be able to unwrap
-	if !errors.Is(apiErr.Err, rootErr) {
-		t.Error("Should be able to unwrap to root cause")
-	}
-}
-
-func TestAPIError_StatusCode_Boundaries(t *testing.T) {
-	// Test edge cases for HTTP status codes
-	tests := []struct {
-		name   string
-		status int
-		valid  bool
-	}{
-		{
-			name:   "negative status",
-			status: -1,
-			valid:  false,
-		},
-		{
-			name:   "zero status",
-			status: 0,
-			valid:  false,
-		},
-		{
-			name:   "valid 1xx",
-			status: http.StatusContinue,
-			valid:  true,
-		},
-		{
-			name:   "valid 2xx",
-			status: http.StatusOK,
-			valid:  true,
-		},
-		{
-			name:   "valid 4xx",
-			status: http.StatusBadRequest,
-			valid:  true,
-		},
-		{
-			name:   "valid 5xx",
-			status: http.StatusInternalServerError,
-			valid:  true,
-		},
-		{
-			name:   "too large status",
-			status: 9999,
-			valid:  false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			err := APIError{
-				HTTPStatus: test.status,
-				Message:    "test",
-			}
-
-			// The struct allows any int value, but we can test
-			// if it's a valid HTTP status
-			statusText := http.StatusText(test.status)
-			isValidStatus := statusText != ""
-
-			if isValidStatus != test.valid {
-				t.Errorf("Status %d validity: expected %v, got %v",
-					test.status, test.valid, isValidStatus)
-			}
-
-			// Verify the struct holds the status
-			if err.HTTPStatus != test.status {
-				t.Errorf("Status not preserved: expected %d, got %d", test.status, err.HTTPStatus)
-			}
-		})
-	}
-}
-
-func BenchmarkAPIError_Error(b *testing.B) {
-	apiErr := APIError{
-		HTTPStatus: http.StatusBadRequest,
-		Err:        errors.New("benchmark error"),
-		Message:    "benchmark message",
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		apiErr.Error()
-	}
-}
-
-func BenchmarkAPIError_JSON_Marshal(b *testing.B) {
-	apiErr := APIError{
-		HTTPStatus: http.StatusBadRequest,
-		Err:        errors.New("benchmark error"),
-		Message:    "benchmark message",
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		json.Marshal(apiErr)
-	}
-}
-
-func BenchmarkAPIError_JSON_Unmarshal(b *testing.B) {
-	jsonData := []byte(`{"error": "benchmark message"}`)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		var result APIError
-		_ = json.Unmarshal(jsonData, &result)
-	}
-}

caddy.go

@@ -440,6 +440,13 @@ func run(newCfg *Config, start bool) (Context, error) {
 		}
 	}()
 
+	// Provision any admin routers which may need to access
+	// some of the other apps at runtime
+	err = ctx.cfg.Admin.provisionAdminRouters(ctx)
+	if err != nil {
+		return ctx, err
+	}
+
 	// Start
 	err = func() error {
 		started := make([]string, 0, len(ctx.cfg.apps))
@@ -759,7 +766,7 @@ func Validate(cfg *Config) error {
 // code is emitted.
 func exitProcess(ctx context.Context, logger *zap.Logger) {
 	// let the rest of the program know we're quitting; only do it once
-	if !exiting.CompareAndSwap(false, true) {
+	if !atomic.CompareAndSwapInt32(exiting, 0, 1) {
 		return
 	}
 
@@ -838,11 +845,11 @@ func exitProcess(ctx context.Context, logger *zap.Logger) {
 	}()
 }
 
-var exiting atomic.Bool
+var exiting = new(int32) // accessed atomically
 
 // Exiting returns true if the process is exiting.
 // EXPERIMENTAL API: subject to change or removal.
-func Exiting() bool { return exiting.Load() }
+func Exiting() bool { return atomic.LoadInt32(exiting) == 1 }
 
 // OnExit registers a callback to invoke during process exit.
 // This registration is PROCESS-GLOBAL, meaning that each

caddyconfig/caddyfile/importgraph_test.go

@@ -1,268 +0,0 @@
-package caddyfile
-
-import (
-	"testing"
-)
-
-func TestImportGraphAddNode(t *testing.T) {
-	g := &importGraph{}
-
-	g.addNode("a")
-	if !g.exists("a") {
-		t.Error("expected node 'a' to exist after addNode")
-	}
-
-	// Adding again should not error
-	g.addNode("a")
-	if !g.exists("a") {
-		t.Error("expected node 'a' to still exist after duplicate addNode")
-	}
-}
-
-func TestImportGraphAddNodes(t *testing.T) {
-	g := &importGraph{}
-
-	g.addNodes([]string{"a", "b", "c"})
-	for _, name := range []string{"a", "b", "c"} {
-		if !g.exists(name) {
-			t.Errorf("expected node %q to exist", name)
-		}
-	}
-}
-
-func TestImportGraphRemoveNode(t *testing.T) {
-	g := &importGraph{}
-
-	g.addNode("a")
-	g.addNode("b")
-	g.removeNode("a")
-
-	if g.exists("a") {
-		t.Error("expected node 'a' to not exist after removeNode")
-	}
-	if !g.exists("b") {
-		t.Error("expected node 'b' to still exist")
-	}
-}
-
-func TestImportGraphRemoveNodes(t *testing.T) {
-	g := &importGraph{}
-
-	g.addNodes([]string{"a", "b", "c", "d"})
-	g.removeNodes([]string{"a", "c"})
-
-	if g.exists("a") {
-		t.Error("expected node 'a' to be removed")
-	}
-	if g.exists("c") {
-		t.Error("expected node 'c' to be removed")
-	}
-	if !g.exists("b") {
-		t.Error("expected node 'b' to still exist")
-	}
-	if !g.exists("d") {
-		t.Error("expected node 'd' to still exist")
-	}
-}
-
-func TestImportGraphAddEdge(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b"})
-
-	err := g.addEdge("a", "b")
-	if err != nil {
-		t.Fatalf("addEdge() error = %v", err)
-	}
-
-	if !g.areConnected("a", "b") {
-		t.Error("expected 'a' -> 'b' edge to exist")
-	}
-	if g.areConnected("b", "a") {
-		t.Error("expected no 'b' -> 'a' edge (directed)")
-	}
-}
-
-func TestImportGraphAddEdgeNonExistentNode(t *testing.T) {
-	g := &importGraph{}
-	g.addNode("a")
-
-	err := g.addEdge("a", "nonexistent")
-	if err == nil {
-		t.Error("expected error when adding edge to nonexistent node")
-	}
-
-	err = g.addEdge("nonexistent", "a")
-	if err == nil {
-		t.Error("expected error when adding edge from nonexistent node")
-	}
-}
-
-func TestImportGraphAddEdgeDuplicate(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b"})
-
-	_ = g.addEdge("a", "b")
-	err := g.addEdge("a", "b")
-	if err != nil {
-		t.Errorf("duplicate addEdge() should not error, got %v", err)
-	}
-}
-
-func TestImportGraphCycleDetectionDirect(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b"})
-
-	_ = g.addEdge("a", "b")
-
-	// Adding b -> a should create a cycle
-	err := g.addEdge("b", "a")
-	if err == nil {
-		t.Error("expected error for cycle: a -> b -> a")
-	}
-}
-
-func TestImportGraphCycleDetectionIndirect(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b", "c"})
-
-	_ = g.addEdge("a", "b")
-	_ = g.addEdge("b", "c")
-
-	// Adding c -> a should create a cycle: a -> b -> c -> a
-	err := g.addEdge("c", "a")
-	if err == nil {
-		t.Error("expected error for indirect cycle: a -> b -> c -> a")
-	}
-}
-
-func TestImportGraphCycleDetectionLongChain(t *testing.T) {
-	g := &importGraph{}
-	nodes := []string{"a", "b", "c", "d", "e"}
-	g.addNodes(nodes)
-
-	_ = g.addEdge("a", "b")
-	_ = g.addEdge("b", "c")
-	_ = g.addEdge("c", "d")
-	_ = g.addEdge("d", "e")
-
-	// Adding e -> a should create a cycle
-	err := g.addEdge("e", "a")
-	if err == nil {
-		t.Error("expected error for long cycle: a -> b -> c -> d -> e -> a")
-	}
-
-	// Adding e -> c should also create a cycle
-	err = g.addEdge("e", "c")
-	if err == nil {
-		t.Error("expected error for cycle: c -> d -> e -> c")
-	}
-}
-
-func TestImportGraphNoCycleDAG(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b", "c", "d"})
-
-	// Create a diamond DAG: a -> b, a -> c, b -> d, c -> d
-	_ = g.addEdge("a", "b")
-	_ = g.addEdge("a", "c")
-	_ = g.addEdge("b", "d")
-
-	err := g.addEdge("c", "d")
-	if err != nil {
-		t.Errorf("expected no cycle in DAG, got error: %v", err)
-	}
-}
-
-func TestImportGraphSelfLoop(t *testing.T) {
-	g := &importGraph{}
-	g.addNode("a")
-
-	// BUG: Self-loops are not detected by willCycle(). The function checks if
-	// adding edge from→to would create a cycle by traversing edges from "to"
-	// to see if "from" is reachable. But for a self-loop (from==to), the edge
-	// doesn't exist yet, so the DFS finds nothing and returns false.
-	// A self-importing file would NOT be caught by this cycle detection.
-	err := g.addEdge("a", "a")
-	if err != nil {
-		t.Log("Self-loop was correctly detected (bug may have been fixed)")
-	} else {
-		t.Log("BUG CONFIRMED: addEdge('a', 'a') did not detect self-loop cycle")
-	}
-}
-
-func TestImportGraphExistsNonExistent(t *testing.T) {
-	g := &importGraph{}
-	if g.exists("nonexistent") {
-		t.Error("expected false for nonexistent node on empty graph")
-	}
-}
-
-func TestImportGraphAreConnectedEmpty(t *testing.T) {
-	g := &importGraph{}
-	if g.areConnected("a", "b") {
-		t.Error("expected false for areConnected on empty graph")
-	}
-}
-
-func TestImportGraphAddEdges(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b", "c", "d"})
-
-	err := g.addEdges("a", []string{"b", "c", "d"})
-	if err != nil {
-		t.Fatalf("addEdges() error = %v", err)
-	}
-
-	if !g.areConnected("a", "b") || !g.areConnected("a", "c") || !g.areConnected("a", "d") {
-		t.Error("expected all edges from 'a' to exist")
-	}
-}
-
-func TestImportGraphAddEdgesWithCycle(t *testing.T) {
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b", "c"})
-
-	_ = g.addEdge("b", "c")
-	_ = g.addEdge("c", "a")
-
-	// This should fail because a -> b -> c -> a creates a cycle
-	err := g.addEdges("a", []string{"b"})
-	if err == nil {
-		t.Error("expected error when addEdges creates a cycle")
-	}
-}
-
-func TestImportGraphRemoveNodeEdgeLeakBug(t *testing.T) {
-	// This test documents a known bug: removeNode doesn't clean up edges.
-	// Edges FROM the removed node remain in the adjacency list.
-	g := &importGraph{}
-	g.addNodes([]string{"a", "b", "c"})
-	_ = g.addEdge("a", "b")
-	_ = g.addEdge("b", "c")
-
-	g.removeNode("b")
-
-	// Bug: "b" is removed from nodes, but edges from "b" are still in the adjacency list.
-	// This means the graph is now inconsistent.
-	// The node doesn't exist...
-	if g.exists("b") {
-		t.Error("node 'b' should not exist after removeNode")
-	}
-
-	// ...but edges from "b" may still be present in the edges map (this is a bug).
-	// We test this to document the behavior.
-	if g.edges != nil {
-		if targets, ok := g.edges["b"]; ok && len(targets) > 0 {
-			t.Log("BUG CONFIRMED: removeNode does not clean up outgoing edges. " +
-				"Edges from removed node 'b' still exist in adjacency list.")
-		}
-	}
-}
-
-func TestImportGraphWillCycleEmptyGraph(t *testing.T) {
-	g := &importGraph{}
-	// willCycle on empty graph should return false
-	if g.willCycle("a", "b") {
-		t.Error("expected no cycle on empty graph")
-	}
-}

caddyconfig/configadapters_test.go

@@ -1,221 +0,0 @@
-package caddyconfig
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func TestJSON(t *testing.T) {
-	tests := []struct {
-		name         string
-		val          any
-		wantNil      bool
-		wantWarnings int
-		nilWarnings  bool // pass nil warnings pointer
-	}{
-		{
-			name:         "simple string",
-			val:          "hello",
-			wantNil:      false,
-			wantWarnings: 0,
-		},
-		{
-			name:         "struct",
-			val:          struct{ Name string }{"test"},
-			wantNil:      false,
-			wantWarnings: 0,
-		},
-		{
-			name:         "nil value",
-			val:          nil,
-			wantNil:      false, // json.Marshal(nil) returns "null"
-			wantWarnings: 0,
-		},
-		{
-			name:         "map",
-			val:          map[string]string{"key": "val"},
-			wantNil:      false,
-			wantWarnings: 0,
-		},
-		{
-			name:         "unmarshalable value produces warning",
-			val:          make(chan int),
-			wantNil:      true,
-			wantWarnings: 1,
-		},
-		{
-			name:        "unmarshalable value with nil warnings pointer",
-			val:         make(chan int),
-			wantNil:     true,
-			nilWarnings: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var warnings *[]Warning
-			if !tt.nilWarnings {
-				w := []Warning{}
-				warnings = &w
-			}
-
-			result := JSON(tt.val, warnings)
-
-			if tt.wantNil && result != nil {
-				t.Errorf("JSON() = %v, want nil", string(result))
-			}
-			if !tt.wantNil && result == nil {
-				t.Error("JSON() = nil, want non-nil")
-			}
-			if warnings != nil && len(*warnings) != tt.wantWarnings {
-				t.Errorf("JSON() produced %d warnings, want %d", len(*warnings), tt.wantWarnings)
-			}
-		})
-	}
-}
-
-func TestJSONModuleObject(t *testing.T) {
-	tests := []struct {
-		name         string
-		val          any
-		fieldName    string
-		fieldVal     string
-		wantNil      bool
-		wantField    bool
-		wantWarnings int
-	}{
-		{
-			name:         "simple struct",
-			val:          struct{ Name string }{"test"},
-			fieldName:    "handler",
-			fieldVal:     "file_server",
-			wantNil:      false,
-			wantField:    true,
-			wantWarnings: 0,
-		},
-		{
-			name:         "map value",
-			val:          map[string]any{"key": "val"},
-			fieldName:    "module",
-			fieldVal:     "my_module",
-			wantNil:      false,
-			wantField:    true,
-			wantWarnings: 0,
-		},
-		{
-			name:         "non-object type (string) produces warning",
-			val:          "not-an-object",
-			fieldName:    "handler",
-			fieldVal:     "test",
-			wantNil:      true,
-			wantField:    false,
-			wantWarnings: 1,
-		},
-		{
-			name:         "unmarshalable value produces warning",
-			val:          make(chan int),
-			fieldName:    "handler",
-			fieldVal:     "test",
-			wantNil:      true,
-			wantField:    false,
-			wantWarnings: 1,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			warnings := []Warning{}
-			result := JSONModuleObject(tt.val, tt.fieldName, tt.fieldVal, &warnings)
-
-			if tt.wantNil && result != nil {
-				t.Errorf("JSONModuleObject() = %v, want nil", string(result))
-			}
-			if !tt.wantNil && result == nil {
-				t.Error("JSONModuleObject() = nil, want non-nil")
-			}
-			if len(warnings) != tt.wantWarnings {
-				t.Errorf("JSONModuleObject() produced %d warnings, want %d", len(warnings), tt.wantWarnings)
-			}
-			if tt.wantField && result != nil {
-				var m map[string]any
-				if err := json.Unmarshal(result, &m); err != nil {
-					t.Fatalf("failed to unmarshal result: %v", err)
-				}
-				if v, ok := m[tt.fieldName]; !ok {
-					t.Errorf("expected field %q in result", tt.fieldName)
-				} else if v != tt.fieldVal {
-					t.Errorf("field %q = %v, want %v", tt.fieldName, v, tt.fieldVal)
-				}
-			}
-		})
-	}
-}
-
-func TestJSONModuleObjectPreservesExistingFields(t *testing.T) {
-	val := struct {
-		Name string `json:"name"`
-		Port int    `json:"port"`
-	}{"example", 8080}
-
-	warnings := []Warning{}
-	result := JSONModuleObject(val, "handler", "static", &warnings)
-
-	if result == nil {
-		t.Fatal("expected non-nil result")
-	}
-
-	var m map[string]any
-	if err := json.Unmarshal(result, &m); err != nil {
-		t.Fatalf("failed to unmarshal: %v", err)
-	}
-
-	if m["name"] != "example" {
-		t.Errorf("name = %v, want 'example'", m["name"])
-	}
-	if m["port"] != float64(8080) {
-		t.Errorf("port = %v, want 8080", m["port"])
-	}
-	if m["handler"] != "static" {
-		t.Errorf("handler = %v, want 'static'", m["handler"])
-	}
-}
-
-func TestGetAdapterNil(t *testing.T) {
-	adapter := GetAdapter("nonexistent_adapter_xyz")
-	if adapter != nil {
-		t.Error("expected nil for unregistered adapter")
-	}
-}
-
-func TestWarningString(t *testing.T) {
-	tests := []struct {
-		name    string
-		warning Warning
-		want    string
-	}{
-		{
-			name:    "all fields",
-			warning: Warning{File: "Caddyfile", Line: 10, Directive: "reverse_proxy", Message: "upstream not found"},
-			want:    "Caddyfile:10 (reverse_proxy): upstream not found",
-		},
-		{
-			name:    "no directive",
-			warning: Warning{File: "Caddyfile", Line: 5, Message: "something off"},
-			want:    "Caddyfile:5: something off",
-		},
-		{
-			name:    "zero line",
-			warning: Warning{File: "config.json", Line: 0, Message: "invalid"},
-			want:    "config.json:0: invalid",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.warning.String()
-			if got != tt.want {
-				t.Errorf("Warning.String() = %q, want %q", got, tt.want)
-			}
-		})
-	}
-}

caddyconfig/httpcaddyfile/builtins.go

@@ -550,11 +550,26 @@ func parseTLS(h Helper) ([]ConfigValue, error) {
 		}
 
 	case acmeIssuer != nil:
-		// implicit ACME issuers (from various subdirectives) should inherit from
-		// any globally-configured ACME issuer templates, then apply the local
-		// shortcut settings as overrides.
-		defaultIssuers := implicitACMEIssuers(h, acmeIssuer)
+		// implicit ACME issuers (from various subdirectives) - use defaults; there might be more than one
+		defaultIssuers := caddytls.DefaultIssuers(acmeIssuer.Email)
+
+		// if an ACME CA endpoint was set, the user expects to use that specific one,
+		// not any others that may be defaults, so replace all defaults with that ACME CA
+		if acmeIssuer.CA != "" {
+			defaultIssuers = []certmagic.Issuer{acmeIssuer}
+		}
+
 		for _, issuer := range defaultIssuers {
+			// apply settings from the implicitly-configured ACMEIssuer to any
+			// default ACMEIssuers, but preserve each default issuer's CA endpoint,
+			// because, for example, if you configure the DNS challenge, it should
+			// apply to any of the default ACMEIssuers, but you don't want to trample
+			// out their unique CA endpoints
+			if iss, ok := issuer.(*caddytls.ACMEIssuer); ok && iss != nil {
+				acmeCopy := *acmeIssuer
+				acmeCopy.CA = iss.CA
+				issuer = &acmeCopy
+			}
 			configVals = append(configVals, ConfigValue{
 				Class: "tls.cert_issuer",
 				Value: issuer,
@@ -1053,7 +1068,7 @@ func parseLogHelper(h Helper, globalLogNames map[string]struct{}) ([]ConfigValue
 					if !d.NextArg() {
 						return nil, d.ArgErr()
 					}
-					interval, err := caddy.ParseDuration(d.Val())
+					interval, err := time.ParseDuration(d.Val() + "ns")
 					if err != nil {
 						return nil, d.Errf("failed to parse interval: %v", err)
 					}

caddyconfig/httpcaddyfile/builtins_test.go

@@ -66,14 +66,14 @@ func TestLogDirectiveSyntax(t *testing.T) {
 			input: `:8080 {
 				log {
 					sampling {
-						interval 2s
+						interval 2
 						first 3
 						thereafter 4
 					}
 				}
 			}
 			`,
-			output:      `{"logging":{"logs":{"default":{"exclude":["http.log.access.log0"]},"log0":{"sampling":{"interval":2000000000,"first":3,"thereafter":4},"include":["http.log.access.log0"]}}},"apps":{"http":{"servers":{"srv0":{"listen":[":8080"],"logs":{"default_logger_name":"log0"}}}}}}`,
+			output:      `{"logging":{"logs":{"default":{"exclude":["http.log.access.log0"]},"log0":{"sampling":{"interval":2,"first":3,"thereafter":4},"include":["http.log.access.log0"]}}},"apps":{"http":{"servers":{"srv0":{"listen":[":8080"],"logs":{"default_logger_name":"log0"}}}}}}`,
 			expectError: false,
 		},
 	} {

caddyconfig/httpcaddyfile/options.go

@@ -484,8 +484,6 @@ func unmarshalCaddyfileMetricsOptions(d *caddyfile.Dispenser) (any, error) {
 			metrics.PerHost = true
 		case "observe_catchall_hosts":
 			metrics.ObserveCatchallHosts = true
-		case "otlp":
-			metrics.OTLP = true
 		default:
 			return nil, d.Errf("unrecognized servers option '%s'", d.Val())
 		}

caddyconfig/httpcaddyfile/options_test.go

@@ -3,9 +3,7 @@ package httpcaddyfile
 import (
 	"encoding/json"
 	"testing"
-	"time"
 
-	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
 	"github.com/caddyserver/caddy/v2/modules/caddytls"
 	_ "github.com/caddyserver/caddy/v2/modules/logging"
@@ -168,126 +166,3 @@ func TestGlobalResolversOption(t *testing.T) {
 		})
 	}
 }
-
-func TestGlobalCertIssuerAppliesToImplicitACMEIssuer(t *testing.T) {
-	adapter := caddyfile.Adapter{
-		ServerType: ServerType{},
-	}
-
-	input := `{
-		cert_issuer acme {
-			disable_tlsalpn_challenge
-		}
-	}
-	report.company.intern {
-		tls {
-			ca https://deglacme01.company.intern/acme/acme/directory
-			ca_root /etc/certs/company_root2.crt
-		}
-		respond "ok"
-	}`
-
-	out, _, err := adapter.Adapt([]byte(input), nil)
-	if err != nil {
-		t.Fatalf("adapting caddyfile: %v", err)
-	}
-
-	var config struct {
-		Apps struct {
-			TLS *caddytls.TLS `json:"tls"`
-		} `json:"apps"`
-	}
-	if err := json.Unmarshal(out, &config); err != nil {
-		t.Fatalf("unmarshaling adapted config: %v", err)
-	}
-	if config.Apps.TLS == nil || config.Apps.TLS.Automation == nil {
-		t.Fatal("expected tls automation config")
-	}
-
-	var subjectPolicy *caddytls.AutomationPolicy
-	for _, ap := range config.Apps.TLS.Automation.Policies {
-		if len(ap.SubjectsRaw) == 1 && ap.SubjectsRaw[0] == "report.company.intern" {
-			subjectPolicy = ap
-			break
-		}
-	}
-	if subjectPolicy == nil {
-		t.Fatal("expected subject-specific automation policy")
-	}
-	if len(subjectPolicy.IssuersRaw) != 1 {
-		t.Fatalf("expected one issuer for subject-specific policy, got %d", len(subjectPolicy.IssuersRaw))
-	}
-
-	var issuer caddytls.ACMEIssuer
-	if err := json.Unmarshal(subjectPolicy.IssuersRaw[0], &issuer); err != nil {
-		t.Fatalf("unmarshaling issuer: %v", err)
-	}
-	if issuer.CA != "https://deglacme01.company.intern/acme/acme/directory" {
-		t.Fatalf("expected custom ACME CA, got %q", issuer.CA)
-	}
-	if len(issuer.TrustedRootsPEMFiles) != 1 || issuer.TrustedRootsPEMFiles[0] != "/etc/certs/company_root2.crt" {
-		t.Fatalf("expected trusted roots to include site CA root, got %v", issuer.TrustedRootsPEMFiles)
-	}
-	if issuer.Challenges == nil || issuer.Challenges.TLSALPN == nil || !issuer.Challenges.TLSALPN.Disabled {
-		t.Fatalf("expected tls-alpn challenge to be disabled, got %#v", issuer.Challenges)
-	}
-}
-
-func TestMergeACMEIssuers(t *testing.T) {
-	base := &caddytls.ACMEIssuer{
-		Email: "ops@example.com",
-		Challenges: &caddytls.ChallengesConfig{
-			HTTP: &caddytls.HTTPChallengeConfig{
-				AlternatePort: 8080,
-			},
-			TLSALPN: &caddytls.TLSALPNChallengeConfig{
-				Disabled:      true,
-				AlternatePort: 8443,
-			},
-			DNS: &caddytls.DNSChallengeConfig{
-				Resolvers:      []string{"1.1.1.1"},
-				OverrideDomain: "_acme-challenge.example.net",
-			},
-		},
-		TrustedRootsPEMFiles: []string{"global.pem"},
-	}
-	overrides := &caddytls.ACMEIssuer{
-		CA: "https://deglacme01.company.intern/acme/acme/directory",
-		Challenges: &caddytls.ChallengesConfig{
-			HTTP: &caddytls.HTTPChallengeConfig{
-				Disabled: true,
-			},
-			DNS: &caddytls.DNSChallengeConfig{
-				PropagationTimeout: caddy.Duration(time.Minute),
-			},
-		},
-		TrustedRootsPEMFiles: []string{"site.pem"},
-	}
-
-	merged := mergeACMEIssuers(base, overrides)
-	if merged.CA != overrides.CA {
-		t.Fatalf("expected merged CA %q, got %q", overrides.CA, merged.CA)
-	}
-	if merged.Email != base.Email {
-		t.Fatalf("expected merged email %q, got %q", base.Email, merged.Email)
-	}
-	if len(merged.TrustedRootsPEMFiles) != 2 || merged.TrustedRootsPEMFiles[0] != "global.pem" || merged.TrustedRootsPEMFiles[1] != "site.pem" {
-		t.Fatalf("expected merged roots [global.pem site.pem], got %v", merged.TrustedRootsPEMFiles)
-	}
-	if merged.Challenges == nil || merged.Challenges.HTTP == nil || !merged.Challenges.HTTP.Disabled || merged.Challenges.HTTP.AlternatePort != 8080 {
-		t.Fatalf("expected merged HTTP challenge config to preserve alternate port and apply disable flag, got %#v", merged.Challenges)
-	}
-	if merged.Challenges.TLSALPN == nil || !merged.Challenges.TLSALPN.Disabled || merged.Challenges.TLSALPN.AlternatePort != 8443 {
-		t.Fatalf("expected merged TLS-ALPN challenge config to preserve global settings, got %#v", merged.Challenges)
-	}
-	if merged.Challenges.DNS == nil || merged.Challenges.DNS.PropagationTimeout != caddy.Duration(time.Minute) || len(merged.Challenges.DNS.Resolvers) != 1 || merged.Challenges.DNS.Resolvers[0] != "1.1.1.1" || merged.Challenges.DNS.OverrideDomain != "_acme-challenge.example.net" {
-		t.Fatalf("expected merged DNS challenge config to preserve global values and apply overrides, got %#v", merged.Challenges)
-	}
-
-	if base.CA != "" {
-		t.Fatalf("expected base issuer to remain unchanged, got CA %q", base.CA)
-	}
-	if len(base.TrustedRootsPEMFiles) != 1 || base.TrustedRootsPEMFiles[0] != "global.pem" {
-		t.Fatalf("expected base roots to remain unchanged, got %v", base.TrustedRootsPEMFiles)
-	}
-}

caddyconfig/httpcaddyfile/shorthands_test.go

@@ -1,299 +0,0 @@
-package httpcaddyfile
-
-import (
-	"testing"
-
-	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
-)
-
-func TestShorthandReplacerSimpleReplacements(t *testing.T) {
-	sr := NewShorthandReplacer()
-
-	tests := []struct {
-		name  string
-		input string
-		want  string
-	}{
-		{
-			name:  "host",
-			input: "{host}",
-			want:  "{http.request.host}",
-		},
-		{
-			name:  "hostport",
-			input: "{hostport}",
-			want:  "{http.request.hostport}",
-		},
-		{
-			name:  "port",
-			input: "{port}",
-			want:  "{http.request.port}",
-		},
-		{
-			name:  "method",
-			input: "{method}",
-			want:  "{http.request.method}",
-		},
-		{
-			name:  "uri",
-			input: "{uri}",
-			want:  "{http.request.uri}",
-		},
-		{
-			name:  "path",
-			input: "{path}",
-			want:  "{http.request.uri.path}",
-		},
-		{
-			name:  "query",
-			input: "{query}",
-			want:  "{http.request.uri.query}",
-		},
-		{
-			name:  "scheme",
-			input: "{scheme}",
-			want:  "{http.request.scheme}",
-		},
-		{
-			name:  "remote_host",
-			input: "{remote_host}",
-			want:  "{http.request.remote.host}",
-		},
-		{
-			name:  "remote_port",
-			input: "{remote_port}",
-			want:  "{http.request.remote.port}",
-		},
-		{
-			name:  "uuid",
-			input: "{uuid}",
-			want:  "{http.request.uuid}",
-		},
-		{
-			name:  "tls_cipher",
-			input: "{tls_cipher}",
-			want:  "{http.request.tls.cipher_suite}",
-		},
-		{
-			name:  "tls_version",
-			input: "{tls_version}",
-			want:  "{http.request.tls.version}",
-		},
-		{
-			name:  "client_ip",
-			input: "{client_ip}",
-			want:  "{http.vars.client_ip}",
-		},
-		{
-			name:  "upstream_hostport",
-			input: "{upstream_hostport}",
-			want:  "{http.reverse_proxy.upstream.hostport}",
-		},
-		{
-			name:  "dir",
-			input: "{dir}",
-			want:  "{http.request.uri.path.dir}",
-		},
-		{
-			name:  "file",
-			input: "{file}",
-			want:  "{http.request.uri.path.file}",
-		},
-		{
-			name:  "orig_method",
-			input: "{orig_method}",
-			want:  "{http.request.orig_method}",
-		},
-		{
-			name:  "orig_uri",
-			input: "{orig_uri}",
-			want:  "{http.request.orig_uri}",
-		},
-		{
-			name:  "orig_path",
-			input: "{orig_path}",
-			want:  "{http.request.orig_uri.path}",
-		},
-		{
-			name:  "no matching placeholder",
-			input: "{unknown}",
-			want:  "{unknown}",
-		},
-		{
-			name:  "not a placeholder",
-			input: "plain text",
-			want:  "plain text",
-		},
-		{
-			name:  "empty string",
-			input: "",
-			want:  "",
-		},
-		{
-			name:  "multiple placeholders in one string",
-			input: "{host}:{port}",
-			want:  "{http.request.host}:{http.request.port}",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			segment := caddyfile.Segment{{Text: tt.input}}
-			sr.ApplyToSegment(&segment)
-			got := segment[0].Text
-			if got != tt.want {
-				t.Errorf("ApplyToSegment(%q) = %q, want %q", tt.input, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestShorthandReplacerComplexReplacements(t *testing.T) {
-	sr := NewShorthandReplacer()
-
-	tests := []struct {
-		name  string
-		input string
-		want  string
-	}{
-		{
-			name:  "header placeholder",
-			input: "{header.X-Forwarded-For}",
-			want:  "{http.request.header.X-Forwarded-For}",
-		},
-		{
-			name:  "cookie placeholder",
-			input: "{cookie.session_id}",
-			want:  "{http.request.cookie.session_id}",
-		},
-		{
-			name:  "labels placeholder",
-			input: "{labels.0}",
-			want:  "{http.request.host.labels.0}",
-		},
-		{
-			name:  "path segment placeholder",
-			input: "{path.0}",
-			want:  "{http.request.uri.path.0}",
-		},
-		{
-			name:  "query placeholder",
-			input: "{query.page}",
-			want:  "{http.request.uri.query.page}",
-		},
-		{
-			name:  "re placeholder with dots",
-			input: "{re.name.group}",
-			want:  "{http.regexp.name.group}",
-		},
-		{
-			name:  "vars placeholder",
-			input: "{vars.my_var}",
-			want:  "{http.vars.my_var}",
-		},
-		{
-			name:  "rp placeholder",
-			input: "{rp.upstream.address}",
-			want:  "{http.reverse_proxy.upstream.address}",
-		},
-		{
-			name:  "resp placeholder",
-			input: "{resp.status_code}",
-			want:  "{http.intercept.status_code}",
-		},
-		{
-			name:  "err placeholder",
-			input: "{err.status_code}",
-			want:  "{http.error.status_code}",
-		},
-		{
-			name:  "file_match placeholder",
-			input: "{file_match.relative}",
-			want:  "{http.matchers.file.relative}",
-		},
-		{
-			name:  "header with hyphen",
-			input: "{header.Content-Type}",
-			want:  "{http.request.header.Content-Type}",
-		},
-		{
-			name:  "header with underscore",
-			input: "{header.X_Custom_Header}",
-			want:  "{http.request.header.X_Custom_Header}",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			segment := caddyfile.Segment{{Text: tt.input}}
-			sr.ApplyToSegment(&segment)
-			got := segment[0].Text
-			if got != tt.want {
-				t.Errorf("ApplyToSegment(%q) = %q, want %q", tt.input, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestShorthandReplacerApplyToNilSegment(t *testing.T) {
-	sr := NewShorthandReplacer()
-	// Should not panic
-	sr.ApplyToSegment(nil)
-}
-
-func TestShorthandReplacerMultipleTokens(t *testing.T) {
-	sr := NewShorthandReplacer()
-
-	segment := caddyfile.Segment{
-		{Text: "{host}"},
-		{Text: "{path}"},
-		{Text: "{header.X-Test}"},
-		{Text: "plain"},
-	}
-
-	sr.ApplyToSegment(&segment)
-
-	expected := []string{
-		"{http.request.host}",
-		"{http.request.uri.path}",
-		"{http.request.header.X-Test}",
-		"plain",
-	}
-
-	for i, want := range expected {
-		if segment[i].Text != want {
-			t.Errorf("token %d: got %q, want %q", i, segment[i].Text, want)
-		}
-	}
-}
-
-func TestShorthandReplacerEmptySegment(t *testing.T) {
-	sr := NewShorthandReplacer()
-	segment := caddyfile.Segment{}
-	sr.ApplyToSegment(&segment) // should not panic
-}
-
-func TestShorthandReplacerEscapedPlaceholders(t *testing.T) {
-	sr := NewShorthandReplacer()
-
-	// Percent-escaped path placeholder
-	segment := caddyfile.Segment{{Text: "{%path}"}}
-	sr.ApplyToSegment(&segment)
-	if segment[0].Text != "{http.request.uri.path_escaped}" {
-		t.Errorf("got %q, want {http.request.uri.path_escaped}", segment[0].Text)
-	}
-
-	// Percent-escaped query placeholder
-	segment = caddyfile.Segment{{Text: "{%query}"}}
-	sr.ApplyToSegment(&segment)
-	if segment[0].Text != "{http.request.uri.query_escaped}" {
-		t.Errorf("got %q, want {http.request.uri.query_escaped}", segment[0].Text)
-	}
-
-	// Prefixed query
-	segment = caddyfile.Segment{{Text: "{?query}"}}
-	sr.ApplyToSegment(&segment)
-	if segment[0].Text != "{http.request.uri.prefixed_query}" {
-		t.Errorf("got %q, want {http.request.uri.prefixed_query}", segment[0].Text)
-	}
-}

caddyconfig/httpcaddyfile/tlsapp.go

@@ -612,289 +612,6 @@ func fillInGlobalACMEDefaults(issuer certmagic.Issuer, options map[string]any) e
 	return nil
 }
 
-// implicitACMEIssuers returns the issuers to use for ACME-related tls
-// shortcuts such as ca, ca_root, and dns. If any global cert_issuer options
-// configure ACME issuers, those become the templates for the local shortcut
-// configuration; otherwise, default ACME issuers are used.
-func implicitACMEIssuers(h Helper, acmeIssuer *caddytls.ACMEIssuer) []certmagic.Issuer {
-	globalIssuers, _ := h.Option("cert_issuer").([]certmagic.Issuer)
-
-	var implicitIssuers []certmagic.Issuer
-	for _, issuer := range globalIssuers {
-		acmeWrapper, ok := issuer.(acmeCapable)
-		if !ok {
-			continue
-		}
-		baseIssuer := acmeWrapper.GetACMEIssuer()
-		if baseIssuer == nil {
-			continue
-		}
-		implicitIssuers = append(implicitIssuers, mergeACMEIssuers(baseIssuer, acmeIssuer))
-	}
-	if len(implicitIssuers) > 0 {
-		return implicitIssuers
-	}
-
-	// If an ACME CA endpoint was set locally, the user expects to use only that
-	// CA rather than the usual default fallback issuers.
-	defaultIssuers := caddytls.DefaultIssuers(acmeIssuer.Email)
-	if acmeIssuer.CA != "" {
-		defaultIssuers = []certmagic.Issuer{new(caddytls.ACMEIssuer)}
-	}
-
-	implicitIssuers = make([]certmagic.Issuer, 0, len(defaultIssuers))
-	for _, issuer := range defaultIssuers {
-		acmeWrapper, ok := issuer.(acmeCapable)
-		if !ok {
-			implicitIssuers = append(implicitIssuers, issuer)
-			continue
-		}
-		baseIssuer := acmeWrapper.GetACMEIssuer()
-		if baseIssuer == nil {
-			implicitIssuers = append(implicitIssuers, issuer)
-			continue
-		}
-		implicitIssuers = append(implicitIssuers, mergeACMEIssuers(baseIssuer, acmeIssuer))
-	}
-	return implicitIssuers
-}
-
-func mergeACMEIssuers(base, overrides *caddytls.ACMEIssuer) *caddytls.ACMEIssuer {
-	if base == nil {
-		return cloneACMEIssuer(overrides)
-	}
-
-	merged := cloneACMEIssuer(base)
-	if overrides == nil {
-		return merged
-	}
-
-	if overrides.CA != "" {
-		merged.CA = overrides.CA
-	}
-	if overrides.TestCA != "" {
-		merged.TestCA = overrides.TestCA
-	}
-	if overrides.Email != "" {
-		merged.Email = overrides.Email
-	}
-	if overrides.Profile != "" {
-		merged.Profile = overrides.Profile
-	}
-	if overrides.AccountKey != "" {
-		merged.AccountKey = overrides.AccountKey
-	}
-	if overrides.ExternalAccount != nil {
-		merged.ExternalAccount = cloneACMEEAB(overrides.ExternalAccount)
-	}
-	if overrides.ACMETimeout != 0 {
-		merged.ACMETimeout = overrides.ACMETimeout
-	}
-	if len(overrides.TrustedRootsPEMFiles) > 0 {
-		merged.TrustedRootsPEMFiles = appendUniqueStrings(merged.TrustedRootsPEMFiles, overrides.TrustedRootsPEMFiles...)
-	}
-	if overrides.PreferredChains != nil {
-		merged.PreferredChains = cloneChainPreference(overrides.PreferredChains)
-	}
-	if overrides.CertificateLifetime != 0 {
-		merged.CertificateLifetime = overrides.CertificateLifetime
-	}
-	if len(overrides.NetworkProxyRaw) > 0 {
-		merged.NetworkProxyRaw = slices.Clone(overrides.NetworkProxyRaw)
-	}
-	merged.Challenges = mergeChallengesConfig(merged.Challenges, overrides.Challenges)
-
-	return merged
-}
-
-func mergeChallengesConfig(base, overrides *caddytls.ChallengesConfig) *caddytls.ChallengesConfig {
-	if base == nil {
-		return cloneChallengesConfig(overrides)
-	}
-	merged := cloneChallengesConfig(base)
-	if overrides == nil {
-		return merged
-	}
-
-	merged.HTTP = mergeHTTPChallengeConfig(merged.HTTP, overrides.HTTP)
-	merged.TLSALPN = mergeTLSALPNChallengeConfig(merged.TLSALPN, overrides.TLSALPN)
-	merged.DNS = mergeDNSChallengeConfig(merged.DNS, overrides.DNS)
-	if overrides.BindHost != "" {
-		merged.BindHost = overrides.BindHost
-	}
-	if overrides.Distributed != nil {
-		value := *overrides.Distributed
-		merged.Distributed = &value
-	}
-
-	return merged
-}
-
-func mergeHTTPChallengeConfig(base, overrides *caddytls.HTTPChallengeConfig) *caddytls.HTTPChallengeConfig {
-	if base == nil {
-		return cloneHTTPChallengeConfig(overrides)
-	}
-	merged := cloneHTTPChallengeConfig(base)
-	if overrides == nil {
-		return merged
-	}
-
-	if overrides.Disabled {
-		merged.Disabled = true
-	}
-	if overrides.AlternatePort != 0 {
-		merged.AlternatePort = overrides.AlternatePort
-	}
-
-	return merged
-}
-
-func mergeTLSALPNChallengeConfig(base, overrides *caddytls.TLSALPNChallengeConfig) *caddytls.TLSALPNChallengeConfig {
-	if base == nil {
-		return cloneTLSALPNChallengeConfig(overrides)
-	}
-	merged := cloneTLSALPNChallengeConfig(base)
-	if overrides == nil {
-		return merged
-	}
-
-	if overrides.Disabled {
-		merged.Disabled = true
-	}
-	if overrides.AlternatePort != 0 {
-		merged.AlternatePort = overrides.AlternatePort
-	}
-
-	return merged
-}
-
-func mergeDNSChallengeConfig(base, overrides *caddytls.DNSChallengeConfig) *caddytls.DNSChallengeConfig {
-	if base == nil {
-		return cloneDNSChallengeConfig(overrides)
-	}
-	merged := cloneDNSChallengeConfig(base)
-	if overrides == nil {
-		return merged
-	}
-
-	if len(overrides.ProviderRaw) > 0 {
-		merged.ProviderRaw = slices.Clone(overrides.ProviderRaw)
-	}
-	if overrides.PropagationDelay != 0 {
-		merged.PropagationDelay = overrides.PropagationDelay
-	}
-	if overrides.PropagationTimeout != 0 {
-		merged.PropagationTimeout = overrides.PropagationTimeout
-	}
-	if overrides.Resolvers != nil {
-		merged.Resolvers = slices.Clone(overrides.Resolvers)
-	}
-	if overrides.OverrideDomain != "" {
-		merged.OverrideDomain = overrides.OverrideDomain
-	}
-	if overrides.TTL != 0 {
-		merged.TTL = overrides.TTL
-	}
-
-	return merged
-}
-
-func cloneACMEIssuer(iss *caddytls.ACMEIssuer) *caddytls.ACMEIssuer {
-	if iss == nil {
-		return nil
-	}
-
-	cloned := *iss
-	cloned.Challenges = cloneChallengesConfig(iss.Challenges)
-	cloned.ExternalAccount = cloneACMEEAB(iss.ExternalAccount)
-	cloned.TrustedRootsPEMFiles = slices.Clone(iss.TrustedRootsPEMFiles)
-	cloned.PreferredChains = cloneChainPreference(iss.PreferredChains)
-	cloned.NetworkProxyRaw = slices.Clone(iss.NetworkProxyRaw)
-
-	return &cloned
-}
-
-func cloneChallengesConfig(cfg *caddytls.ChallengesConfig) *caddytls.ChallengesConfig {
-	if cfg == nil {
-		return nil
-	}
-
-	cloned := *cfg
-	cloned.HTTP = cloneHTTPChallengeConfig(cfg.HTTP)
-	cloned.TLSALPN = cloneTLSALPNChallengeConfig(cfg.TLSALPN)
-	cloned.DNS = cloneDNSChallengeConfig(cfg.DNS)
-	if cfg.Distributed != nil {
-		value := *cfg.Distributed
-		cloned.Distributed = &value
-	}
-
-	return &cloned
-}
-
-func cloneHTTPChallengeConfig(cfg *caddytls.HTTPChallengeConfig) *caddytls.HTTPChallengeConfig {
-	if cfg == nil {
-		return nil
-	}
-
-	cloned := *cfg
-	return &cloned
-}
-
-func cloneTLSALPNChallengeConfig(cfg *caddytls.TLSALPNChallengeConfig) *caddytls.TLSALPNChallengeConfig {
-	if cfg == nil {
-		return nil
-	}
-
-	cloned := *cfg
-	return &cloned
-}
-
-func cloneDNSChallengeConfig(cfg *caddytls.DNSChallengeConfig) *caddytls.DNSChallengeConfig {
-	if cfg == nil {
-		return nil
-	}
-
-	cloned := *cfg
-	cloned.ProviderRaw = slices.Clone(cfg.ProviderRaw)
-	cloned.Resolvers = slices.Clone(cfg.Resolvers)
-
-	return &cloned
-}
-
-func cloneACMEEAB(eab *acme.EAB) *acme.EAB {
-	if eab == nil {
-		return nil
-	}
-
-	cloned := *eab
-	return &cloned
-}
-
-func cloneChainPreference(pref *caddytls.ChainPreference) *caddytls.ChainPreference {
-	if pref == nil {
-		return nil
-	}
-
-	cloned := *pref
-	cloned.RootCommonName = slices.Clone(pref.RootCommonName)
-	cloned.AnyCommonName = slices.Clone(pref.AnyCommonName)
-	if pref.Smallest != nil {
-		value := *pref.Smallest
-		cloned.Smallest = &value
-	}
-
-	return &cloned
-}
-
-func appendUniqueStrings(existing []string, additions ...string) []string {
-	for _, value := range additions {
-		if !slices.Contains(existing, value) {
-			existing = append(existing, value)
-		}
-	}
-	return existing
-}
-
 // newBaseAutomationPolicy returns a new TLS automation policy that gets
 // its values from the global options map. It should be used as the base
 // for any other automation policies. A nil policy (and no error) will be

caddytest/integration/autohttps_test.go

@@ -55,28 +55,6 @@ func TestAutoHTTPtoHTTPSRedirectsExplicitPortDifferentFromHTTPSPort(t *testing.T
 	tester.AssertRedirect("http://localhost:9080/", "https://localhost:1234/", http.StatusPermanentRedirect)
 }
 
-func TestAutoHTTPtoHTTPSRedirectsPreferHTTPSPortOverAlternatePort(t *testing.T) {
-	tester := caddytest.NewTester(t)
-	tester.InitServer(`
-	{
-		skip_install_trust
-		admin localhost:2999
-		http_port     9080
-		https_port    9443
-		local_certs
-	}
-	localhost {
-		respond "Canonical"
-	}
-
-	localhost:10443 {
-		respond "Alternate"
-	}
-  `, "caddyfile")
-
-	tester.AssertRedirect("http://localhost:9080/", "https://localhost/", http.StatusPermanentRedirect)
-}
-
 func TestAutoHTTPRedirectsWithHTTPListenerFirstInAddresses(t *testing.T) {
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`

caddytest/integration/caddyfile_adapt/global_options_log_sampling.caddyfiletest

@@ -1,7 +1,7 @@
 {
 	log {
 		sampling {
-			interval 5m
+			interval 300
 			first 50
 			thereafter 40
 		}
@@ -13,7 +13,7 @@
 		"logs": {
 			"default": {
 				"sampling": {
-					"interval": 300000000000,
+					"interval": 300,
 					"first": 50,
 					"thereafter": 40
 				}

caddytest/integration/caddyfile_adapt/log_sampling.caddyfiletest

@@ -1,7 +1,7 @@
 :80 {
 	log {
 		sampling {
-			interval 5m
+			interval 300
 			first 50
 			thereafter 40
 		}
@@ -18,7 +18,7 @@
 			},
 			"log0": {
 				"sampling": {
-					"interval": 300000000000,
+					"interval": 300,
 					"first": 50,
 					"thereafter": 40
 				},

caddytest/integration/caddyfile_adapt/metrics_otlp.caddyfiletest

@@ -1,35 +0,0 @@
-{
-	metrics {
-		otlp
-	}
-}
-:80 {
-	respond "Hello"
-}
-----------
-{
-	"apps": {
-		"http": {
-			"servers": {
-				"srv0": {
-					"listen": [
-						":80"
-					],
-					"routes": [
-						{
-							"handle": [
-								{
-									"body": "Hello",
-									"handler": "static_response"
-								}
-							]
-						}
-					]
-				}
-			},
-			"metrics": {
-				"otlp": true
-			}
-		}
-	}
-}

caddytest/integration/caddyfile_adapt/reverse_proxy_retry_match_oneline.caddyfiletest

@@ -1,58 +0,0 @@
-:8884
-
-reverse_proxy 127.0.0.1:65535 {
-	lb_retries 3
-	lb_retry_match expression `{rp.status_code} in [502, 503]`
-	lb_retry_match expression `{rp.is_transport_error} || {rp.status_code} == 502`
-	lb_retry_match expression `method('POST') && {rp.status_code} == 503`
-	lb_retry_match `{rp.status_code} == 504`
-	lb_retry_match `{rp.is_transport_error} && method('PUT')`
-}
-----------
-{
-	"apps": {
-		"http": {
-			"servers": {
-				"srv0": {
-					"listen": [
-						":8884"
-					],
-					"routes": [
-						{
-							"handle": [
-								{
-									"handler": "reverse_proxy",
-									"load_balancing": {
-										"retries": 3,
-										"retry_match": [
-											{
-												"expression": "{http.reverse_proxy.status_code} in [502, 503]"
-											},
-											{
-												"expression": "{http.reverse_proxy.is_transport_error} || {http.reverse_proxy.status_code} == 502"
-											},
-											{
-												"expression": "method('POST') \u0026\u0026 {http.reverse_proxy.status_code} == 503"
-											},
-											{
-												"expression": "{http.reverse_proxy.status_code} == 504"
-											},
-											{
-												"expression": "{http.reverse_proxy.is_transport_error} \u0026\u0026 method('PUT')"
-											}
-										]
-									},
-									"upstreams": [
-										{
-											"dial": "127.0.0.1:65535"
-										}
-									]
-								}
-							]
-						}
-					]
-				}
-			}
-		}
-	}
-}

caddytest/integration/caddyfile_adapt/reverse_proxy_retry_match_response.caddyfiletest

@@ -1,147 +0,0 @@
-:8884
-
-reverse_proxy 127.0.0.1:65535 {
-	lb_retries 5
-
-	# request matchers (backward-compatible, non-expression)
-	lb_retry_match {
-		method POST PUT
-	}
-	lb_retry_match {
-		path /foo*
-	}
-	lb_retry_match {
-		header X-Idempotency-Key *
-	}
-
-	# response status code via expression
-	lb_retry_match {
-		expression `{rp.status_code} in [502, 503, 504]`
-	}
-
-	# response header via expression
-	lb_retry_match {
-		expression `{rp.header.X-Retry} == "true"`
-	}
-
-	# CEL request functions combined with response placeholders
-	lb_retry_match {
-		expression `method('POST') && {rp.status_code} >= 500`
-	}
-	lb_retry_match {
-		expression `path('/api*') && {rp.status_code} in [502, 503]`
-	}
-	lb_retry_match {
-		expression `host('example.com') && {rp.status_code} == 503`
-	}
-	lb_retry_match {
-		expression `query({'retry': 'true'}) && {rp.status_code} >= 500`
-	}
-	lb_retry_match {
-		expression `header({'X-Idempotency-Key': '*'}) && {rp.status_code} in [502, 503]`
-	}
-	lb_retry_match {
-		expression `protocol('https') && {rp.status_code} == 502`
-	}
-	lb_retry_match {
-		expression `path_regexp('^/api/v[0-9]+/') && {rp.status_code} >= 500`
-	}
-	lb_retry_match {
-		expression `header_regexp('Content-Type', '^application/json') && {rp.status_code} == 502`
-	}
-
-	# transport error handling via placeholder
-	lb_retry_match {
-		expression `{rp.is_transport_error} || {rp.status_code} in [502, 503]`
-	}
-	lb_retry_match {
-		expression `{rp.is_transport_error} && method('POST')`
-	}
-}
-----------
-{
-	"apps": {
-		"http": {
-			"servers": {
-				"srv0": {
-					"listen": [
-						":8884"
-					],
-					"routes": [
-						{
-							"handle": [
-								{
-									"handler": "reverse_proxy",
-									"load_balancing": {
-										"retries": 5,
-										"retry_match": [
-											{
-												"method": [
-													"POST",
-													"PUT"
-												]
-											},
-											{
-												"path": [
-													"/foo*"
-												]
-											},
-											{
-												"header": {
-													"X-Idempotency-Key": [
-														"*"
-													]
-												}
-											},
-											{
-												"expression": "{http.reverse_proxy.status_code} in [502, 503, 504]"
-											},
-											{
-												"expression": "{http.reverse_proxy.header.X-Retry} == \"true\""
-											},
-											{
-												"expression": "method('POST') \u0026\u0026 {http.reverse_proxy.status_code} \u003e= 500"
-											},
-											{
-												"expression": "path('/api*') \u0026\u0026 {http.reverse_proxy.status_code} in [502, 503]"
-											},
-											{
-												"expression": "host('example.com') \u0026\u0026 {http.reverse_proxy.status_code} == 503"
-											},
-											{
-												"expression": "query({'retry': 'true'}) \u0026\u0026 {http.reverse_proxy.status_code} \u003e= 500"
-											},
-											{
-												"expression": "header({'X-Idempotency-Key': '*'}) \u0026\u0026 {http.reverse_proxy.status_code} in [502, 503]"
-											},
-											{
-												"expression": "protocol('https') \u0026\u0026 {http.reverse_proxy.status_code} == 502"
-											},
-											{
-												"expression": "path_regexp('^/api/v[0-9]+/') \u0026\u0026 {http.reverse_proxy.status_code} \u003e= 500"
-											},
-											{
-												"expression": "header_regexp('Content-Type', '^application/json') \u0026\u0026 {http.reverse_proxy.status_code} == 502"
-											},
-											{
-												"expression": "{http.reverse_proxy.is_transport_error} || {http.reverse_proxy.status_code} in [502, 503]"
-											},
-											{
-												"expression": "{http.reverse_proxy.is_transport_error} \u0026\u0026 method('POST')"
-											}
-										]
-									},
-									"upstreams": [
-										{
-											"dial": "127.0.0.1:65535"
-										}
-									]
-								}
-							]
-						}
-					]
-				}
-			}
-		}
-	}
-}

caddytest/integration/reverseproxy_test.go

@@ -1,13 +1,17 @@
 package integration
 
 import (
+	"bufio"
+	"crypto/sha1"
+	"encoding/base64"
 	"fmt"
+	"io"
 	"net"
 	"net/http"
+	"net/textproto"
 	"os"
 	"runtime"
 	"strings"
-	"sync/atomic"
 	"testing"
 
 	"github.com/caddyserver/caddy/v2/caddytest"
@@ -564,232 +568,128 @@ func TestReverseProxyHealthCheckUnixSocketWithoutPort(t *testing.T) {
 	tester.AssertGetResponse("http://localhost:9080/", 200, "Hello, World!")
 }
 
-// TestReverseProxyRetryMatchStatusCode verifies that lb_retry_match with a
-// CEL expression matching on {rp.status_code} causes the request to be
-// retried on the next upstream when the first upstream returns a matching
-// status code
-func TestReverseProxyRetryMatchStatusCode(t *testing.T) {
-	// Bad upstream: returns 502
-	badSrv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusBadGateway)
-		}),
+func TestReverseProxyWebSocketUpgradeUnixSocket(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.SkipNow()
 	}
-	badLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	go badSrv.Serve(badLn)
-	t.Cleanup(func() { badSrv.Close(); badLn.Close() })
 
-	// Good upstream: returns 200
-	goodSrv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("ok"))
-		}),
-	}
-	goodLn, err := net.Listen("tcp", "127.0.0.1:0")
+	f, err := os.CreateTemp("", "*.sock")
 	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
+		t.Fatalf("failed to create temporary socket file: %v", err)
 	}
-	go goodSrv.Serve(goodLn)
-	t.Cleanup(func() { goodSrv.Close(); goodLn.Close() })
+	_ = os.Remove(f.Name())
+	socketName := f.Name()
 
-	tester := caddytest.NewTester(t)
-	tester.InitServer(fmt.Sprintf(`
-	{
-		skip_install_trust
-		admin localhost:2999
-		http_port 9080
-		https_port 9443
-		grace_period 1ns
-	}
-	http://localhost:9080 {
-		reverse_proxy %s %s {
-			lb_policy round_robin
-			lb_retries 1
-			lb_retry_match {
-				expression `+"`{rp.status_code} in [502, 503]`"+`
+	backend := http.Server{
+		Handler: http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			if req.URL.Path != "/ws" {
+				http.NotFound(w, req)
+				return
 			}
-		}
-	}
-	`, goodLn.Addr().String(), badLn.Addr().String()), "caddyfile")
 
-	tester.AssertGetResponse("http://localhost:9080/", 200, "ok")
-}
-
-// TestReverseProxyRetryMatchHeader verifies that lb_retry_match with a CEL
-// expression matching on {rp.header.*} causes the request to be retried when
-// the upstream sets a matching response header
-func TestReverseProxyRetryMatchHeader(t *testing.T) {
-	var badHits atomic.Int32
-
-	// Bad upstream: returns 200 but signals retry via header
-	badSrv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			badHits.Add(1)
-			w.Header().Set("X-Upstream-Retry", "true")
-			w.Write([]byte("bad"))
-		}),
-	}
-	badLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	go badSrv.Serve(badLn)
-	t.Cleanup(func() { badSrv.Close(); badLn.Close() })
-
-	// Good upstream: returns 200 without retry header
-	goodSrv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("good"))
-		}),
-	}
-	goodLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	go goodSrv.Serve(goodLn)
-	t.Cleanup(func() { goodSrv.Close(); goodLn.Close() })
-
-	tester := caddytest.NewTester(t)
-	tester.InitServer(fmt.Sprintf(`
-	{
-		skip_install_trust
-		admin localhost:2999
-		http_port 9080
-		https_port 9443
-		grace_period 1ns
-	}
-	http://localhost:9080 {
-		reverse_proxy %s %s {
-			lb_policy round_robin
-			lb_retries 1
-			lb_retry_match {
-				expression `+"`{rp.header.X-Upstream-Retry} == \"true\"`"+`
+			if !strings.EqualFold(req.Header.Get("Upgrade"), "websocket") ||
+				!strings.Contains(strings.ToLower(req.Header.Get("Connection")), "upgrade") {
+				http.Error(w, "missing websocket upgrade headers", http.StatusBadRequest)
+				return
 			}
-		}
-	}
-	`, goodLn.Addr().String(), badLn.Addr().String()), "caddyfile")
 
-	tester.AssertGetResponse("http://localhost:9080/", 200, "good")
-
-	if badHits.Load() != 1 {
-		t.Errorf("bad upstream hits: got %d, want 1", badHits.Load())
-	}
-}
-
-// TestReverseProxyRetryMatchCombined verifies that a CEL expression combining
-// request path matching with response status code matching works correctly -
-// only retrying when both conditions are met
-func TestReverseProxyRetryMatchCombined(t *testing.T) {
-	// Upstream: returns 502 for all requests
-	srv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusBadGateway)
-		}),
-	}
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	go srv.Serve(ln)
-	t.Cleanup(func() { srv.Close(); ln.Close() })
-
-	// Good upstream
-	goodSrv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("ok"))
-		}),
-	}
-	goodLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	go goodSrv.Serve(goodLn)
-	t.Cleanup(func() { goodSrv.Close(); goodLn.Close() })
-
-	tester := caddytest.NewTester(t)
-	tester.InitServer(fmt.Sprintf(`
-	{
-		skip_install_trust
-		admin localhost:2999
-		http_port 9080
-		https_port 9443
-		grace_period 1ns
-	}
-	http://localhost:9080 {
-		reverse_proxy %s %s {
-			lb_policy round_robin
-			lb_retries 1
-			lb_retry_match {
-				expression `+"`path('/retry*') && {rp.status_code} in [502, 503]`"+`
+			wsKey := req.Header.Get("Sec-WebSocket-Key")
+			if wsKey == "" {
+				http.Error(w, "missing Sec-WebSocket-Key", http.StatusBadRequest)
+				return
 			}
-		}
-	}
-	`, goodLn.Addr().String(), ln.Addr().String()), "caddyfile")
 
-	// /retry path matches the expression - should retry to good upstream
-	tester.AssertGetResponse("http://localhost:9080/retry", 200, "ok")
+			hj, ok := w.(http.Hijacker)
+			if !ok {
+				http.Error(w, "hijacker not supported", http.StatusInternalServerError)
+				return
+			}
 
-	// /other path does NOT match - should return the 502
-	req, _ := http.NewRequest(http.MethodGet, "http://localhost:9080/other", nil)
-	tester.AssertResponse(req, 502, "")
-}
-
-// TestReverseProxyRetryMatchIsTransportError verifies that the
-// {rp.is_transport_error} == true CEL function correctly identifies transport errors
-// and allows retrying them alongside response-based matching
-func TestReverseProxyRetryMatchIsTransportError(t *testing.T) {
-	// Good upstream: returns 200
-	goodSrv := &http.Server{
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Write([]byte("ok"))
-		}),
-	}
-	goodLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	go goodSrv.Serve(goodLn)
-	t.Cleanup(func() { goodSrv.Close(); goodLn.Close() })
-
-	// Broken upstream: accepts connections but closes immediately
-	brokenLn, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { brokenLn.Close() })
-	go func() {
-		for {
-			conn, err := brokenLn.Accept()
+			conn, brw, err := hj.Hijack()
 			if err != nil {
 				return
 			}
-			conn.Close()
-		}
-	}()
+			defer conn.Close()
+
+			_, _ = brw.WriteString("HTTP/1.1 101 Switching Protocols\r\n")
+			_, _ = brw.WriteString("Upgrade: websocket\r\n")
+			_, _ = brw.WriteString("Connection: Upgrade\r\n")
+			_, _ = brw.WriteString("Sec-WebSocket-Accept: " + computeWebSocketAccept(wsKey) + "\r\n")
+			_, _ = brw.WriteString("\r\n")
+			_ = brw.Flush()
+		}),
+	}
+
+	unixListener, err := net.Listen("unix", socketName)
+	if err != nil {
+		t.Fatalf("failed to listen on unix socket: %v", err)
+	}
+	go backend.Serve(unixListener)
+	t.Cleanup(func() {
+		_ = backend.Close()
+		_ = unixListener.Close()
+		_ = os.Remove(socketName)
+	})
+	runtime.Gosched()
 
 	tester := caddytest.NewTester(t)
 	tester.InitServer(fmt.Sprintf(`
 	{
 		skip_install_trust
 		admin localhost:2999
-		http_port 9080
-		https_port 9443
+		http_port     9080
+		https_port    9443
 		grace_period 1ns
 	}
 	http://localhost:9080 {
-		reverse_proxy %s %s {
-			lb_policy round_robin
-			lb_retries 1
-			lb_retry_match {
-				expression `+"`{rp.is_transport_error} || {rp.status_code} in [502, 503]`"+`
-			}
-		}
+		reverse_proxy unix/%s
 	}
-	`, goodLn.Addr().String(), brokenLn.Addr().String()), "caddyfile")
+	`, socketName), "caddyfile")
 
-	// Transport error on broken upstream should be retried to good upstream
-	tester.AssertGetResponse("http://localhost:9080/", 200, "ok")
+	conn, err := net.Dial("tcp", "127.0.0.1:9080")
+	if err != nil {
+		t.Fatalf("failed to dial caddy listener: %v", err)
+	}
+	defer conn.Close()
+
+	wsKey := "dGhlIHNhbXBsZSBub25jZQ=="
+	request := strings.Join([]string{
+		"GET /ws HTTP/1.1",
+		"Host: localhost:9080",
+		"Connection: Upgrade",
+		"Upgrade: websocket",
+		"Sec-WebSocket-Version: 13",
+		"Sec-WebSocket-Key: " + wsKey,
+		"",
+		"",
+	}, "\r\n")
+
+	if _, err := io.WriteString(conn, request); err != nil {
+		t.Fatalf("failed to send websocket handshake request: %v", err)
+	}
+
+	tpr := textproto.NewReader(bufio.NewReader(conn))
+	statusLine, err := tpr.ReadLine()
+	if err != nil {
+		t.Fatalf("failed reading handshake status line: %v", err)
+	}
+	if !strings.Contains(statusLine, "101") || !strings.Contains(strings.ToLower(statusLine), "switching protocols") {
+		t.Fatalf("unexpected status line: %q", statusLine)
+	}
+
+	headers, err := tpr.ReadMIMEHeader()
+	if err != nil {
+		t.Fatalf("failed reading handshake headers: %v", err)
+	}
+	if !strings.EqualFold(headers.Get("Upgrade"), "websocket") {
+		t.Fatalf("unexpected Upgrade header: %q", headers.Get("Upgrade"))
+	}
+	if !strings.Contains(strings.ToLower(headers.Get("Connection")), "upgrade") {
+		t.Fatalf("unexpected Connection header: %q", headers.Get("Connection"))
+	}
+}
+
+func computeWebSocketAccept(wsKey string) string {
+	h := sha1.Sum([]byte(wsKey + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"))
+	return base64.StdEncoding.EncodeToString(h[:])
 }

cmd/packagesfuncs.go

@@ -234,7 +234,7 @@ func getModules() (standard, nonstandard, unknown []moduleInfo, err error) {
 		// not sure why), and since New() should return a pointer
 		// value, we need to dereference it first
 		iface := any(modInfo.New())
-		if rv := reflect.ValueOf(iface); rv.Kind() == reflect.Pointer {
+		if rv := reflect.ValueOf(iface); rv.Kind() == reflect.Ptr {
 			iface = reflect.New(reflect.TypeOf(iface).Elem()).Elem().Interface()
 		}
 		modPkgPath := reflect.TypeOf(iface).PkgPath()

cmd/packagesfuncs_test.go

@@ -1,234 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddycmd
-
-import (
-	"testing"
-)
-
-func TestSplitModule(t *testing.T) {
-	tests := []struct {
-		name            string
-		input           string
-		expectedModule  string
-		expectedVersion string
-		expectError     bool
-	}{
-		{
-			name:            "simple module without version",
-			input:           "github.com/caddyserver/caddy",
-			expectedModule:  "github.com/caddyserver/caddy",
-			expectedVersion: "",
-			expectError:     false,
-		},
-		{
-			name:            "module with version",
-			input:           "github.com/caddyserver/caddy@v2.0.0",
-			expectedModule:  "github.com/caddyserver/caddy",
-			expectedVersion: "v2.0.0",
-			expectError:     false,
-		},
-		{
-			name:            "module with semantic version",
-			input:           "github.com/user/module@v1.2.3",
-			expectedModule:  "github.com/user/module",
-			expectedVersion: "v1.2.3",
-			expectError:     false,
-		},
-		{
-			name:            "module with prerelease version",
-			input:           "github.com/user/module@v1.0.0-beta.1",
-			expectedModule:  "github.com/user/module",
-			expectedVersion: "v1.0.0-beta.1",
-			expectError:     false,
-		},
-		{
-			name:            "module with commit hash",
-			input:           "github.com/user/module@abc123def",
-			expectedModule:  "github.com/user/module",
-			expectedVersion: "abc123def",
-			expectError:     false,
-		},
-		{
-			name:            "module with @ in path and version",
-			input:           "github.com/@user/module@v1.0.0",
-			expectedModule:  "github.com/@user/module",
-			expectedVersion: "v1.0.0",
-			expectError:     false,
-		},
-		{
-			name:            "module with multiple @ in path",
-			input:           "github.com/@org/@user/module@v2.3.4",
-			expectedModule:  "github.com/@org/@user/module",
-			expectedVersion: "v2.3.4",
-			expectError:     false,
-		},
-		// TODO: decide on the behavior for this case; it fails currently
-		// {
-		// 	name:            "module with @ in path but no version",
-		// 	input:           "github.com/@user/module",
-		// 	expectedModule:  "github.com/@user/module",
-		// 	expectedVersion: "",
-		// 	expectError:     false,
-		// },
-		{
-			name:            "empty string",
-			input:           "",
-			expectedModule:  "",
-			expectedVersion: "",
-			expectError:     true,
-		},
-		{
-			name:            "only @ symbol",
-			input:           "@",
-			expectedModule:  "",
-			expectedVersion: "",
-			expectError:     true,
-		},
-		{
-			name:            "@ at start",
-			input:           "@v1.0.0",
-			expectedModule:  "",
-			expectedVersion: "v1.0.0",
-			expectError:     true,
-		},
-		{
-			name:            "@ at end",
-			input:           "github.com/user/module@",
-			expectedModule:  "github.com/user/module",
-			expectedVersion: "",
-			expectError:     false,
-		},
-		{
-			name:            "multiple consecutive @",
-			input:           "github.com/user/module@@v1.0.0",
-			expectedModule:  "github.com/user/module@",
-			expectedVersion: "v1.0.0",
-			expectError:     false,
-		},
-		{
-			name:            "version with latest tag",
-			input:           "github.com/user/module@latest",
-			expectedModule:  "github.com/user/module",
-			expectedVersion: "latest",
-			expectError:     false,
-		},
-		{
-			name:            "long module path",
-			input:           "github.com/organization/team/project/subproject/module@v3.14.159",
-			expectedModule:  "github.com/organization/team/project/subproject/module",
-			expectedVersion: "v3.14.159",
-			expectError:     false,
-		},
-		{
-			name:            "module with dots in name",
-			input:           "github.com/user/my.module.name@v1.0",
-			expectedModule:  "github.com/user/my.module.name",
-			expectedVersion: "v1.0",
-			expectError:     false,
-		},
-		{
-			name:            "module with hyphens",
-			input:           "github.com/user/my-module-name@v1.0.0",
-			expectedModule:  "github.com/user/my-module-name",
-			expectedVersion: "v1.0.0",
-			expectError:     false,
-		},
-		{
-			name:            "gitlab module",
-			input:           "gitlab.com/user/module@v2.0.0",
-			expectedModule:  "gitlab.com/user/module",
-			expectedVersion: "v2.0.0",
-			expectError:     false,
-		},
-		{
-			name:            "bitbucket module",
-			input:           "bitbucket.org/user/module@v1.5.0",
-			expectedModule:  "bitbucket.org/user/module",
-			expectedVersion: "v1.5.0",
-			expectError:     false,
-		},
-		{
-			name:            "custom domain",
-			input:           "example.com/custom/module@v1.0.0",
-			expectedModule:  "example.com/custom/module",
-			expectedVersion: "v1.0.0",
-			expectError:     false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			module, version, err := splitModule(tt.input)
-
-			// Check error expectation
-			if tt.expectError {
-				if err == nil {
-					t.Errorf("expected error but got none")
-				}
-			} else {
-				if err != nil {
-					t.Errorf("unexpected error: %v", err)
-				}
-			}
-
-			// Check module
-			if module != tt.expectedModule {
-				t.Errorf("module: got %q, want %q", module, tt.expectedModule)
-			}
-
-			// Check version
-			if version != tt.expectedVersion {
-				t.Errorf("version: got %q, want %q", version, tt.expectedVersion)
-			}
-		})
-	}
-}
-
-func TestSplitModule_ErrorCases(t *testing.T) {
-	errorCases := []string{
-		"",
-		"@",
-		"@version",
-		"@v1.0.0",
-	}
-
-	for _, tc := range errorCases {
-		t.Run("error_"+tc, func(t *testing.T) {
-			_, _, err := splitModule(tc)
-			if err == nil {
-				t.Errorf("splitModule(%q) should return error", tc)
-			}
-		})
-	}
-}
-
-// BenchmarkSplitModule benchmarks the splitModule function
-func BenchmarkSplitModule(b *testing.B) {
-	testCases := []string{
-		"github.com/user/module",
-		"github.com/user/module@v1.0.0",
-		"github.com/@org/@user/module@v2.3.4",
-		"github.com/organization/team/project/subproject/module@v3.14.159",
-	}
-
-	for _, tc := range testCases {
-		b.Run(tc, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				splitModule(tc)
-			}
-		})
-	}
-}

config_test.go

@@ -1,720 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestConfig_Start_Stop_Basic(t *testing.T) {
-	cfg := &Config{
-		Admin: &AdminConfig{Disabled: true}, // Disable admin to avoid port conflicts
-	}
-
-	ctx, err := run(cfg, true)
-	if err != nil {
-		t.Fatalf("Failed to run config: %v", err)
-	}
-
-	// Verify context is valid
-	if ctx.cfg == nil {
-		t.Error("Expected non-nil config in context")
-	}
-
-	// Stop the config
-	unsyncedStop(ctx)
-
-	// Verify cleanup was called
-	if ctx.cfg.cancelFunc == nil {
-		t.Error("Expected cancel function to be set")
-	}
-}
-
-func TestConfig_Validate_InvalidConfig(t *testing.T) {
-	// Create a config with an invalid app module
-	cfg := &Config{
-		AppsRaw: ModuleMap{
-			"non-existent-app": json.RawMessage(`{}`),
-		},
-	}
-
-	err := Validate(cfg)
-	if err == nil {
-		t.Error("Expected validation error for invalid app module")
-	}
-}
-
-func TestConfig_Validate_ValidConfig(t *testing.T) {
-	cfg := &Config{
-		Admin: &AdminConfig{Disabled: true},
-	}
-
-	err := Validate(cfg)
-	if err != nil {
-		t.Errorf("Unexpected validation error: %v", err)
-	}
-}
-
-func TestChangeConfig_ConcurrentAccess(t *testing.T) {
-	// Save original config state
-	originalRawCfg := rawCfg[rawConfigKey]
-	originalRawCfgJSON := rawCfgJSON
-	defer func() {
-		rawCfg[rawConfigKey] = originalRawCfg
-		rawCfgJSON = originalRawCfgJSON
-	}()
-
-	// Initialize with a basic config
-	initialCfg := map[string]any{
-		"test": "value",
-	}
-	rawCfg[rawConfigKey] = initialCfg
-
-	const numGoroutines = 10 // Reduced for more controlled testing
-	var wg sync.WaitGroup
-	errors := make([]error, numGoroutines)
-
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(index int) {
-			defer wg.Done()
-
-			// Only test read operations to avoid complex state changes
-			// that could cause nil pointer issues in concurrent scenarios
-			var buf bytes.Buffer
-			errors[index] = readConfig("/"+rawConfigKey+"/test", &buf)
-		}(i)
-	}
-
-	wg.Wait()
-
-	// Check that read operations succeeded
-	for i, err := range errors {
-		if err != nil {
-			t.Errorf("Goroutine %d: Unexpected read error: %v", i, err)
-		}
-	}
-}
-
-func TestChangeConfig_MethodValidation(t *testing.T) {
-	// Save original config state
-	originalRawCfg := rawCfg[rawConfigKey]
-	defer func() {
-		rawCfg[rawConfigKey] = originalRawCfg
-	}()
-
-	// Set up a simple valid config for testing
-	rawCfg[rawConfigKey] = map[string]any{}
-
-	tests := []struct {
-		method    string
-		expectErr bool
-	}{
-		{http.MethodPost, false},
-		{http.MethodPut, true}, // because key 'admin' already exists
-		{http.MethodPatch, false},
-		{http.MethodDelete, false},
-		{http.MethodGet, true},
-		{http.MethodHead, true},
-		{http.MethodOptions, true},
-		{http.MethodConnect, true},
-		{http.MethodTrace, true},
-	}
-
-	for _, test := range tests {
-		t.Run(test.method, func(t *testing.T) {
-			// Use a simple admin config path that won't cause complex validation
-			err := changeConfig(test.method, "/"+rawConfigKey+"/admin", []byte(`{"disabled": true}`), "", false)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error for invalid method")
-			}
-			if !test.expectErr && err != nil && (err != errSameConfig) {
-				t.Errorf("Unexpected error: %v", err)
-			}
-		})
-	}
-}
-
-func TestChangeConfig_IfMatchHeader_Validation(t *testing.T) {
-	// Set up initial config
-	initialCfg := map[string]any{"test": "value"}
-	rawCfg[rawConfigKey] = initialCfg
-
-	tests := []struct {
-		name             string
-		ifMatch          string
-		expectErr        bool
-		expectStatusCode int
-	}{
-		{
-			name:             "malformed - no quotes",
-			ifMatch:          "path hash",
-			expectErr:        true,
-			expectStatusCode: http.StatusBadRequest,
-		},
-		{
-			name:             "malformed - single quote",
-			ifMatch:          `"path hash`,
-			expectErr:        true,
-			expectStatusCode: http.StatusBadRequest,
-		},
-		{
-			name:             "malformed - wrong number of parts",
-			ifMatch:          `"path"`,
-			expectErr:        true,
-			expectStatusCode: http.StatusBadRequest,
-		},
-		{
-			name:             "malformed - too many parts",
-			ifMatch:          `"path hash extra"`,
-			expectErr:        true,
-			expectStatusCode: http.StatusBadRequest,
-		},
-		{
-			name:             "wrong hash",
-			ifMatch:          `"/config/test wronghash"`,
-			expectErr:        true,
-			expectStatusCode: http.StatusPreconditionFailed,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			err := changeConfig(http.MethodPost, "/"+rawConfigKey+"/test", []byte(`"newvalue"`), test.ifMatch, false)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-
-			if test.expectErr && err != nil {
-				if apiErr, ok := err.(APIError); ok {
-					if apiErr.HTTPStatus != test.expectStatusCode {
-						t.Errorf("Expected status %d, got %d", test.expectStatusCode, apiErr.HTTPStatus)
-					}
-				} else {
-					t.Error("Expected APIError type")
-				}
-			}
-		})
-	}
-}
-
-func TestIndexConfigObjects_Basic(t *testing.T) {
-	config := map[string]any{
-		"app1": map[string]any{
-			"@id":    "my-app",
-			"config": "value",
-		},
-		"nested": map[string]any{
-			"array": []any{
-				map[string]any{
-					"@id":  "nested-item",
-					"data": "test",
-				},
-				map[string]any{
-					"@id":  123.0, // JSON numbers are float64
-					"more": "data",
-				},
-			},
-		},
-	}
-
-	index := make(map[string]string)
-	err := indexConfigObjects(config, "/config", index)
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-
-	expected := map[string]string{
-		"my-app":      "/config/app1",
-		"nested-item": "/config/nested/array/0",
-		"123":         "/config/nested/array/1",
-	}
-
-	if len(index) != len(expected) {
-		t.Errorf("Expected %d indexed items, got %d", len(expected), len(index))
-	}
-
-	for id, expectedPath := range expected {
-		if actualPath, exists := index[id]; !exists || actualPath != expectedPath {
-			t.Errorf("ID %s: expected path '%s', got '%s'", id, expectedPath, actualPath)
-		}
-	}
-}
-
-func TestIndexConfigObjects_InvalidID(t *testing.T) {
-	config := map[string]any{
-		"app": map[string]any{
-			"@id": map[string]any{"invalid": "id"}, // Invalid ID type
-		},
-	}
-
-	index := make(map[string]string)
-	err := indexConfigObjects(config, "/config", index)
-	if err == nil {
-		t.Error("Expected error for invalid ID type")
-	}
-}
-
-func TestRun_AppStartFailure(t *testing.T) {
-	// Register a mock app that fails to start
-	RegisterModule(&failingApp{})
-	defer func() {
-		// Clean up module registry
-		delete(modules, "failing-app")
-	}()
-
-	cfg := &Config{
-		Admin: &AdminConfig{Disabled: true},
-		AppsRaw: ModuleMap{
-			"failing-app": json.RawMessage(`{}`),
-		},
-	}
-
-	_, err := run(cfg, true)
-	if err == nil {
-		t.Error("Expected error when app fails to start")
-	}
-
-	// Should contain the app name in the error
-	if err.Error() == "" {
-		t.Error("Expected descriptive error message")
-	}
-}
-
-func TestRun_AppStopFailure_During_Cleanup(t *testing.T) {
-	// Register apps where one fails to start and another fails to stop
-	RegisterModule(&workingApp{})
-	RegisterModule(&failingStopApp{})
-	defer func() {
-		delete(modules, "working-app")
-		delete(modules, "failing-stop-app")
-	}()
-
-	cfg := &Config{
-		Admin: &AdminConfig{Disabled: true},
-		AppsRaw: ModuleMap{
-			"working-app":      json.RawMessage(`{}`),
-			"failing-stop-app": json.RawMessage(`{}`),
-		},
-	}
-
-	// Start both apps
-	ctx, err := run(cfg, true)
-	if err != nil {
-		t.Fatalf("Unexpected error starting apps: %v", err)
-	}
-
-	// Stop context - this should handle stop failures gracefully
-	unsyncedStop(ctx)
-
-	// Test passed if we reach here without panic
-}
-
-func TestProvisionContext_NilConfig(t *testing.T) {
-	ctx, err := provisionContext(nil, false)
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-
-	if ctx.cfg == nil {
-		t.Error("Expected non-nil config even when input is nil")
-	}
-
-	// Clean up
-	// TODO: Investigate
-	ctx.cfg.cancelFunc(nil)
-}
-
-func TestDuration_UnmarshalJSON_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expectErr bool
-		expected  time.Duration
-	}{
-		{
-			name:      "empty input",
-			input:     "",
-			expectErr: true,
-		},
-		{
-			name:      "integer nanoseconds",
-			input:     "1000000000",
-			expected:  time.Second,
-			expectErr: false,
-		},
-		{
-			name:      "string duration",
-			input:     `"5m30s"`,
-			expected:  5*time.Minute + 30*time.Second,
-			expectErr: false,
-		},
-		{
-			name:      "days conversion",
-			input:     `"2d"`,
-			expected:  48 * time.Hour,
-			expectErr: false,
-		},
-		{
-			name:      "mixed days and hours",
-			input:     `"1d12h"`,
-			expected:  36 * time.Hour,
-			expectErr: false,
-		},
-		{
-			name:      "invalid duration",
-			input:     `"invalid"`,
-			expectErr: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			var d Duration
-			err := d.UnmarshalJSON([]byte(test.input))
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-			if !test.expectErr && time.Duration(d) != test.expected {
-				t.Errorf("Expected %v, got %v", test.expected, time.Duration(d))
-			}
-		})
-	}
-}
-
-func TestParseDuration_LongInput(t *testing.T) {
-	// Test input length limit
-	longInput := string(make([]byte, 1025)) // Exceeds 1024 limit
-	for i := range longInput {
-		longInput = longInput[:i] + "1"
-	}
-	longInput += "d"
-
-	_, err := ParseDuration(longInput)
-	if err == nil {
-		t.Error("Expected error for input longer than 1024 characters")
-	}
-}
-
-func TestVersion_Deterministic(t *testing.T) {
-	// Test that Version() returns consistent results
-	simple1, full1 := Version()
-	simple2, full2 := Version()
-
-	if simple1 != simple2 {
-		t.Errorf("Version() simple form not deterministic: '%s' != '%s'", simple1, simple2)
-	}
-	if full1 != full2 {
-		t.Errorf("Version() full form not deterministic: '%s' != '%s'", full1, full2)
-	}
-}
-
-func TestInstanceID_Consistency(t *testing.T) {
-	// Test that InstanceID returns the same ID on subsequent calls
-	id1, err := InstanceID()
-	if err != nil {
-		t.Fatalf("Failed to get instance ID: %v", err)
-	}
-
-	id2, err := InstanceID()
-	if err != nil {
-		t.Fatalf("Failed to get instance ID on second call: %v", err)
-	}
-
-	if id1 != id2 {
-		t.Errorf("InstanceID not consistent: %v != %v", id1, id2)
-	}
-}
-
-func TestRemoveMetaFields_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected string
-	}{
-		{
-			name:     "no meta fields",
-			input:    `{"normal": "field"}`,
-			expected: `{"normal": "field"}`,
-		},
-		{
-			name:     "single @id field",
-			input:    `{"@id": "test", "other": "field"}`,
-			expected: `{"other": "field"}`,
-		},
-		{
-			name:     "@id at beginning",
-			input:    `{"@id": "test", "other": "field"}`,
-			expected: `{"other": "field"}`,
-		},
-		{
-			name:     "@id at end",
-			input:    `{"other": "field", "@id": "test"}`,
-			expected: `{"other": "field"}`,
-		},
-		{
-			name:     "@id in middle",
-			input:    `{"first": "value", "@id": "test", "last": "value"}`,
-			expected: `{"first": "value", "last": "value"}`,
-		},
-		{
-			name:     "multiple @id fields",
-			input:    `{"@id": "test1", "other": "field", "@id": "test2"}`,
-			expected: `{"other": "field"}`,
-		},
-		{
-			name:     "numeric @id",
-			input:    `{"@id": 123, "other": "field"}`,
-			expected: `{"other": "field"}`,
-		},
-		{
-			name:     "nested objects with @id",
-			input:    `{"outer": {"@id": "nested", "data": "value"}}`,
-			expected: `{"outer": {"data": "value"}}`,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result := RemoveMetaFields([]byte(test.input))
-			// resultStr := string(result)
-
-			// Parse both to ensure valid JSON and compare structures
-			var expectedObj, resultObj any
-			if err := json.Unmarshal([]byte(test.expected), &expectedObj); err != nil {
-				t.Fatalf("Expected result is not valid JSON: %v", err)
-			}
-			if err := json.Unmarshal(result, &resultObj); err != nil {
-				t.Fatalf("Result is not valid JSON: %v", err)
-			}
-
-			// Note: We can't do exact string comparison due to potential field ordering
-			// Instead, verify the structure matches
-			expectedJSON, _ := json.Marshal(expectedObj)
-			resultJSON, _ := json.Marshal(resultObj)
-
-			if string(expectedJSON) != string(resultJSON) {
-				t.Errorf("Expected %s, got %s", string(expectedJSON), string(resultJSON))
-			}
-		})
-	}
-}
-
-func TestUnsyncedConfigAccess_ArrayOperations_EdgeCases(t *testing.T) {
-	// Test array boundary conditions and edge cases
-	tests := []struct {
-		name         string
-		initialState map[string]any
-		method       string
-		path         string
-		payload      string
-		expectErr    bool
-		expectState  map[string]any
-	}{
-		{
-			name:         "delete from empty array",
-			initialState: map[string]any{"arr": []any{}},
-			method:       http.MethodDelete,
-			path:         "/config/arr/0",
-			expectErr:    true,
-		},
-		{
-			name:         "access negative index",
-			initialState: map[string]any{"arr": []any{"a", "b"}},
-			method:       http.MethodGet,
-			path:         "/config/arr/-1",
-			expectErr:    true,
-		},
-		{
-			name:         "put at index beyond end",
-			initialState: map[string]any{"arr": []any{"a"}},
-			method:       http.MethodPut,
-			path:         "/config/arr/5",
-			payload:      `"new"`,
-			expectErr:    true,
-		},
-		{
-			name:         "patch non-existent index",
-			initialState: map[string]any{"arr": []any{"a"}},
-			method:       http.MethodPatch,
-			path:         "/config/arr/5",
-			payload:      `"new"`,
-			expectErr:    true,
-		},
-		{
-			name:         "put at exact end of array",
-			initialState: map[string]any{"arr": []any{"a", "b"}},
-			method:       http.MethodPut,
-			path:         "/config/arr/2",
-			payload:      `"c"`,
-			expectState:  map[string]any{"arr": []any{"a", "b", "c"}},
-		},
-		{
-			name:         "ellipses with non-array payload",
-			initialState: map[string]any{"arr": []any{"a"}},
-			method:       http.MethodPost,
-			path:         "/config/arr/...",
-			payload:      `"not-array"`,
-			expectErr:    true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			// Set up initial state
-			rawCfg[rawConfigKey] = test.initialState
-
-			err := unsyncedConfigAccess(test.method, test.path, []byte(test.payload), nil)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-
-			if test.expectState != nil {
-				// Compare resulting state
-				expectedJSON, _ := json.Marshal(test.expectState)
-				actualJSON, _ := json.Marshal(rawCfg[rawConfigKey])
-
-				if string(expectedJSON) != string(actualJSON) {
-					t.Errorf("Expected state %s, got %s", string(expectedJSON), string(actualJSON))
-				}
-			}
-		})
-	}
-}
-
-func TestExitProcess_ConcurrentCalls(t *testing.T) {
-	// Test that multiple concurrent calls to exitProcess are safe
-	// We can't test the actual exit, but we can test the atomic flag
-
-	// Reset the exiting flag
-	oldExiting := exiting
-	exiting = new(int32)
-	defer func() { exiting = oldExiting }()
-
-	const numGoroutines = 10
-	var wg sync.WaitGroup
-	results := make([]bool, numGoroutines)
-
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(index int) {
-			defer wg.Done()
-			// Check the Exiting() function which reads the atomic flag
-			wasExitingBefore := Exiting()
-
-			// This would call exitProcess, but we don't want to actually exit
-			// So we just test the atomic operation directly
-			results[index] = atomic.CompareAndSwapInt32(exiting, 0, 1)
-
-			wasExitingAfter := Exiting()
-
-			// At least one should succeed in setting the flag
-			if !wasExitingBefore && wasExitingAfter && !results[index] {
-				t.Errorf("Goroutine %d: Flag was set but CAS failed", index)
-			}
-		}(i)
-	}
-
-	wg.Wait()
-
-	// Exactly one goroutine should have successfully set the flag
-	successCount := 0
-	for _, success := range results {
-		if success {
-			successCount++
-		}
-	}
-
-	if successCount != 1 {
-		t.Errorf("Expected exactly 1 successful flag set, got %d", successCount)
-	}
-
-	// Flag should be set
-	if !Exiting() {
-		t.Error("Exiting flag should be set")
-	}
-}
-
-// Mock apps for testing
-type failingApp struct{}
-
-func (fa *failingApp) CaddyModule() ModuleInfo {
-	return ModuleInfo{
-		ID:  "failing-app",
-		New: func() Module { return new(failingApp) },
-	}
-}
-
-func (fa *failingApp) Start() error {
-	return fmt.Errorf("simulated start failure")
-}
-
-func (fa *failingApp) Stop() error {
-	return nil
-}
-
-type workingApp struct{}
-
-func (wa *workingApp) CaddyModule() ModuleInfo {
-	return ModuleInfo{
-		ID:  "working-app",
-		New: func() Module { return new(workingApp) },
-	}
-}
-
-func (wa *workingApp) Start() error {
-	return nil
-}
-
-func (wa *workingApp) Stop() error {
-	return nil
-}
-
-type failingStopApp struct{}
-
-func (fsa *failingStopApp) CaddyModule() ModuleInfo {
-	return ModuleInfo{
-		ID:  "failing-stop-app",
-		New: func() Module { return new(failingStopApp) },
-	}
-}
-
-func (fsa *failingStopApp) Start() error {
-	return nil
-}
-
-func (fsa *failingStopApp) Stop() error {
-	return fmt.Errorf("simulated stop failure")
-}

context.go

@@ -378,7 +378,7 @@ func (ctx Context) LoadModuleByID(id string, rawMsg json.RawMessage) (any, error
 	// value must be a pointer for unmarshaling into concrete type, even if
 	// the module's concrete type is a slice or map; New() *should* return
 	// a pointer, otherwise unmarshaling errors or panics will occur
-	if rv := reflect.ValueOf(val); rv.Kind() != reflect.Pointer {
+	if rv := reflect.ValueOf(val); rv.Kind() != reflect.Ptr {
 		log.Printf("[WARNING] ModuleInfo.New() for module '%s' did not return a pointer,"+
 			" so we are using reflection to make a pointer instead; please fix this by"+
 			" using new(Type) or &Type notation in your module's New() function.", id)

duration_test.go

@@ -1,407 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"encoding/json"
-	"math"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestParseDuration_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expectErr bool
-		expected  time.Duration
-	}{
-		{
-			name:     "zero duration",
-			input:    "0",
-			expected: 0,
-		},
-		{
-			name:      "invalid format",
-			input:     "abc",
-			expectErr: true,
-		},
-		{
-			name:     "negative days",
-			input:    "-2d",
-			expected: -48 * time.Hour,
-		},
-		{
-			name:     "decimal days",
-			input:    "0.5d",
-			expected: 12 * time.Hour,
-		},
-		{
-			name:     "large decimal days",
-			input:    "365.25d",
-			expected: time.Duration(365.25*24) * time.Hour,
-		},
-		{
-			name:     "multiple days in same string",
-			input:    "1d2d3d",
-			expected: (24 * 6) * time.Hour, // 6 days total
-		},
-		{
-			name:     "days with other units",
-			input:    "1d30m15s",
-			expected: 24*time.Hour + 30*time.Minute + 15*time.Second,
-		},
-		{
-			name:      "malformed days",
-			input:     "d",
-			expectErr: true,
-		},
-		{
-			name:      "invalid day value",
-			input:     "abcd",
-			expectErr: true,
-		},
-		{
-			name:      "overflow protection",
-			input:     "9999999999999999999999999d",
-			expectErr: true,
-		},
-		{
-			name:     "zero days",
-			input:    "0d",
-			expected: 0,
-		},
-		{
-			name:      "input at limit",
-			input:     strings.Repeat("1", 1024) + "ns",
-			expectErr: true, // Likely to cause parsing error due to size
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result, err := ParseDuration(test.input)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error but got none")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-			if !test.expectErr && result != test.expected {
-				t.Errorf("Expected %v, got %v", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestParseDuration_InputLengthLimit(t *testing.T) {
-	// Test the 1024 character limit
-	longInput := strings.Repeat("1", 1025) + "s"
-
-	_, err := ParseDuration(longInput)
-	if err == nil {
-		t.Error("Expected error for input longer than 1024 characters")
-	}
-
-	expectedErrMsg := "parsing duration: input string too long"
-	if err.Error() != expectedErrMsg {
-		t.Errorf("Expected error message '%s', got '%s'", expectedErrMsg, err.Error())
-	}
-}
-
-func TestParseDuration_ComplexNumberFormats(t *testing.T) {
-	tests := []struct {
-		input    string
-		expected time.Duration
-	}{
-		{
-			input:    "+1d",
-			expected: 24 * time.Hour,
-		},
-		{
-			input:    "-1.5d",
-			expected: -36 * time.Hour,
-		},
-		{
-			input:    "1.0d",
-			expected: 24 * time.Hour,
-		},
-		{
-			input:    "0.25d",
-			expected: 6 * time.Hour,
-		},
-		{
-			input:    "1.5d30m",
-			expected: 36*time.Hour + 30*time.Minute,
-		},
-		{
-			input:    "2.5d1h30m45s",
-			expected: 60*time.Hour + time.Hour + 30*time.Minute + 45*time.Second,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			result, err := ParseDuration(test.input)
-			if err != nil {
-				t.Fatalf("Unexpected error: %v", err)
-			}
-			if result != test.expected {
-				t.Errorf("Expected %v, got %v", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestDuration_UnmarshalJSON_TypeValidation(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expectErr bool
-		expected  time.Duration
-	}{
-		{
-			name:      "null value",
-			input:     "null",
-			expectErr: false,
-			expected:  0,
-		},
-		{
-			name:      "boolean value",
-			input:     "true",
-			expectErr: true,
-		},
-		{
-			name:      "array value",
-			input:     `[1,2,3]`,
-			expectErr: true,
-		},
-		{
-			name:      "object value",
-			input:     `{"duration": "5m"}`,
-			expectErr: true,
-		},
-		{
-			name:      "negative integer",
-			input:     "-1000000000",
-			expected:  -time.Second,
-			expectErr: false,
-		},
-		{
-			name:      "zero integer",
-			input:     "0",
-			expected:  0,
-			expectErr: false,
-		},
-		{
-			name:      "large integer",
-			input:     "9223372036854775807", // Max int64
-			expected:  time.Duration(math.MaxInt64),
-			expectErr: false,
-		},
-		{
-			name:      "float as integer (invalid JSON for int)",
-			input:     "1.5",
-			expectErr: true,
-		},
-		{
-			name:      "string with special characters",
-			input:     `"5m\"30s"`,
-			expectErr: true,
-		},
-		{
-			name:      "string with unicode",
-			input:     `"5m🚀"`,
-			expectErr: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			var d Duration
-			err := d.UnmarshalJSON([]byte(test.input))
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error but got none")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-			if !test.expectErr && time.Duration(d) != test.expected {
-				t.Errorf("Expected %v, got %v", test.expected, time.Duration(d))
-			}
-		})
-	}
-}
-
-func TestDuration_JSON_RoundTrip(t *testing.T) {
-	tests := []struct {
-		duration time.Duration
-		asString bool
-	}{
-		{duration: 5 * time.Minute, asString: true},
-		{duration: 24 * time.Hour, asString: false}, // Will be stored as nanoseconds
-		{duration: 0, asString: false},
-		{duration: -time.Hour, asString: true},
-		{duration: time.Nanosecond, asString: false},
-		{duration: time.Second, asString: false},
-	}
-
-	for _, test := range tests {
-		t.Run(test.duration.String(), func(t *testing.T) {
-			d := Duration(test.duration)
-
-			// Marshal to JSON
-			jsonData, err := json.Marshal(d)
-			if err != nil {
-				t.Fatalf("Failed to marshal: %v", err)
-			}
-
-			// Unmarshal back
-			var unmarshaled Duration
-			err = unmarshaled.UnmarshalJSON(jsonData)
-			if err != nil {
-				t.Fatalf("Failed to unmarshal: %v", err)
-			}
-
-			// Should be equal
-			if time.Duration(unmarshaled) != test.duration {
-				t.Errorf("Round trip failed: expected %v, got %v", test.duration, time.Duration(unmarshaled))
-			}
-		})
-	}
-}
-
-func TestParseDuration_Precision(t *testing.T) {
-	// Test floating point precision with days
-	tests := []struct {
-		input    string
-		expected time.Duration
-	}{
-		{
-			input:    "0.1d",
-			expected: time.Duration(0.1 * 24 * float64(time.Hour)),
-		},
-		{
-			input:    "0.01d",
-			expected: time.Duration(0.01 * 24 * float64(time.Hour)),
-		},
-		{
-			input:    "0.001d",
-			expected: time.Duration(0.001 * 24 * float64(time.Hour)),
-		},
-		{
-			input:    "1.23456789d",
-			expected: time.Duration(1.23456789 * 24 * float64(time.Hour)),
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			result, err := ParseDuration(test.input)
-			if err != nil {
-				t.Fatalf("Unexpected error: %v", err)
-			}
-
-			// Allow for small floating point differences
-			diff := result - test.expected
-			if diff < 0 {
-				diff = -diff
-			}
-			if diff > time.Nanosecond {
-				t.Errorf("Expected %v, got %v (diff: %v)", test.expected, result, diff)
-			}
-		})
-	}
-}
-
-func TestParseDuration_Boundary_Values(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expectErr bool
-	}{
-		{
-			name:  "minimum day value",
-			input: "0.000000001d", // Very small but valid
-		},
-		{
-			name:      "very large day value",
-			input:     "999999999999999999999d",
-			expectErr: true, // Should overflow
-		},
-		{
-			name:  "negative zero",
-			input: "-0d",
-		},
-		{
-			name:  "positive zero",
-			input: "+0d",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			_, err := ParseDuration(test.input)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error but got none")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-		})
-	}
-}
-
-func BenchmarkParseDuration_SimpleDay(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseDuration("1d")
-	}
-}
-
-func BenchmarkParseDuration_ComplexDay(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseDuration("1.5d30m15.5s")
-	}
-}
-
-func BenchmarkParseDuration_MultipleDays(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseDuration("1d2d3d4d5d")
-	}
-}
-
-func BenchmarkDuration_UnmarshalJSON_String(b *testing.B) {
-	input := []byte(`"5m30s"`)
-	var d Duration
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		d.UnmarshalJSON(input)
-	}
-}
-
-func BenchmarkDuration_UnmarshalJSON_Integer(b *testing.B) {
-	input := []byte("300000000000") // 5 minutes in nanoseconds
-	var d Duration
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		d.UnmarshalJSON(input)
-	}
-}

event_test.go

@@ -1,642 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestNewEvent_Basic(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	eventName := "test.event"
-	eventData := map[string]any{
-		"key1": "value1",
-		"key2": 42,
-	}
-
-	event, err := NewEvent(ctx, eventName, eventData)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	// Verify event properties
-	if event.Name() != eventName {
-		t.Errorf("Expected name '%s', got '%s'", eventName, event.Name())
-	}
-
-	if event.Data == nil {
-		t.Error("Expected non-nil data")
-	}
-
-	if len(event.Data) != len(eventData) {
-		t.Errorf("Expected %d data items, got %d", len(eventData), len(event.Data))
-	}
-
-	for key, expectedValue := range eventData {
-		if actualValue, exists := event.Data[key]; !exists || actualValue != expectedValue {
-			t.Errorf("Data key '%s': expected %v, got %v", key, expectedValue, actualValue)
-		}
-	}
-
-	// Verify ID is generated
-	if event.ID().String() == "" {
-		t.Error("Event ID should not be empty")
-	}
-
-	// Verify timestamp is recent
-	if time.Since(event.Timestamp()) > time.Second {
-		t.Error("Event timestamp should be recent")
-	}
-}
-
-func TestNewEvent_NameNormalization(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	tests := []struct {
-		input    string
-		expected string
-	}{
-		{"UPPERCASE", "uppercase"},
-		{"MixedCase", "mixedcase"},
-		{"already.lower", "already.lower"},
-		{"With-Dashes", "with-dashes"},
-		{"With_Underscores", "with_underscores"},
-		{"", ""},
-	}
-
-	for _, test := range tests {
-		t.Run(test.input, func(t *testing.T) {
-			event, err := NewEvent(ctx, test.input, nil)
-			if err != nil {
-				t.Fatalf("Failed to create event: %v", err)
-			}
-
-			if event.Name() != test.expected {
-				t.Errorf("Expected normalized name '%s', got '%s'", test.expected, event.Name())
-			}
-		})
-	}
-}
-
-func TestEvent_CloudEvent_NilData(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	event, err := NewEvent(ctx, "test", nil)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	cloudEvent := event.CloudEvent()
-
-	// Should not panic with nil data
-	if cloudEvent.Data == nil {
-		t.Error("CloudEvent data should not be nil even with nil input")
-	}
-
-	// Should be valid JSON
-	var parsed any
-	if err := json.Unmarshal(cloudEvent.Data, &parsed); err != nil {
-		t.Errorf("CloudEvent data should be valid JSON: %v", err)
-	}
-}
-
-func TestEvent_CloudEvent_WithModule(t *testing.T) {
-	// Create a context with a mock module
-	mockMod := &mockModule{}
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	// Simulate module ancestry
-	ctx.ancestry = []Module{mockMod}
-
-	event, err := NewEvent(ctx, "test", nil)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	cloudEvent := event.CloudEvent()
-
-	// Source should be the module ID
-	expectedSource := string(mockMod.CaddyModule().ID)
-	if cloudEvent.Source != expectedSource {
-		t.Errorf("Expected source '%s', got '%s'", expectedSource, cloudEvent.Source)
-	}
-
-	// Origin should be the module
-	if event.Origin() != mockMod {
-		t.Error("Expected event origin to be the mock module")
-	}
-}
-
-func TestEvent_CloudEvent_Fields(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	eventName := "test.event"
-	eventData := map[string]any{"test": "data"}
-
-	event, err := NewEvent(ctx, eventName, eventData)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	cloudEvent := event.CloudEvent()
-
-	// Verify CloudEvent fields
-	if cloudEvent.ID == "" {
-		t.Error("CloudEvent ID should not be empty")
-	}
-
-	if cloudEvent.Source != "caddy" {
-		t.Errorf("Expected source 'caddy' for nil module, got '%s'", cloudEvent.Source)
-	}
-
-	if cloudEvent.SpecVersion != "1.0" {
-		t.Errorf("Expected spec version '1.0', got '%s'", cloudEvent.SpecVersion)
-	}
-
-	if cloudEvent.Type != eventName {
-		t.Errorf("Expected type '%s', got '%s'", eventName, cloudEvent.Type)
-	}
-
-	if cloudEvent.DataContentType != "application/json" {
-		t.Errorf("Expected content type 'application/json', got '%s'", cloudEvent.DataContentType)
-	}
-
-	// Verify data is valid JSON
-	var parsedData map[string]any
-	if err := json.Unmarshal(cloudEvent.Data, &parsedData); err != nil {
-		t.Errorf("CloudEvent data is not valid JSON: %v", err)
-	}
-
-	if parsedData["test"] != "data" {
-		t.Errorf("Expected data to contain test='data', got %v", parsedData)
-	}
-}
-
-func TestEvent_ConcurrentAccess(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	event, err := NewEvent(ctx, "concurrent.test", map[string]any{
-		"counter": 0,
-		"data":    "shared",
-	})
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	const numGoroutines = 50
-	var wg sync.WaitGroup
-
-	// Test concurrent read access to event properties
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-
-			// These should be safe for concurrent access
-			_ = event.ID()
-			_ = event.Name()
-			_ = event.Timestamp()
-			_ = event.Origin()
-			_ = event.CloudEvent()
-
-			// Data map is not synchronized, so read-only access should be safe
-			if data, exists := event.Data["data"]; !exists || data != "shared" {
-				t.Errorf("Goroutine %d: Expected shared data", id)
-			}
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func TestEvent_DataModification_Warning(t *testing.T) {
-	// This test documents the non-thread-safe nature of event data
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	event, err := NewEvent(ctx, "data.test", map[string]any{
-		"mutable": "original",
-	})
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	// Modifying data after creation (this is allowed but not thread-safe)
-	event.Data["mutable"] = "modified"
-	event.Data["new_key"] = "new_value"
-
-	// Verify modifications are visible
-	if event.Data["mutable"] != "modified" {
-		t.Error("Data modification should be visible")
-	}
-	if event.Data["new_key"] != "new_value" {
-		t.Error("New data should be visible")
-	}
-
-	// CloudEvent should reflect the current state
-	cloudEvent := event.CloudEvent()
-	var parsedData map[string]any
-	json.Unmarshal(cloudEvent.Data, &parsedData)
-
-	if parsedData["mutable"] != "modified" {
-		t.Error("CloudEvent should reflect modified data")
-	}
-	if parsedData["new_key"] != "new_value" {
-		t.Error("CloudEvent should reflect new data")
-	}
-}
-
-func TestEvent_Aborted_State(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	event, err := NewEvent(ctx, "abort.test", nil)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	// Initially not aborted
-	if event.Aborted != nil {
-		t.Error("Event should not be aborted initially")
-	}
-
-	// Simulate aborting the event
-	event.Aborted = ErrEventAborted
-
-	if event.Aborted != ErrEventAborted {
-		t.Error("Event should be marked as aborted")
-	}
-}
-
-func TestErrEventAborted_Value(t *testing.T) {
-	if ErrEventAborted == nil {
-		t.Error("ErrEventAborted should not be nil")
-	}
-
-	if ErrEventAborted.Error() != "event aborted" {
-		t.Errorf("Expected 'event aborted', got '%s'", ErrEventAborted.Error())
-	}
-}
-
-func TestEvent_UniqueIDs(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	const numEvents = 1000
-	ids := make(map[string]bool)
-
-	for i := 0; i < numEvents; i++ {
-		event, err := NewEvent(ctx, "unique.test", nil)
-		if err != nil {
-			t.Fatalf("Failed to create event %d: %v", i, err)
-		}
-
-		idStr := event.ID().String()
-		if ids[idStr] {
-			t.Errorf("Duplicate event ID: %s", idStr)
-		}
-		ids[idStr] = true
-	}
-}
-
-func TestEvent_TimestampProgression(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	// Create events with small delays
-	events := make([]Event, 5)
-	for i := range events {
-		var err error
-		events[i], err = NewEvent(ctx, "time.test", nil)
-		if err != nil {
-			t.Fatalf("Failed to create event %d: %v", i, err)
-		}
-
-		if i < len(events)-1 {
-			time.Sleep(time.Millisecond)
-		}
-	}
-
-	// Verify timestamps are in ascending order
-	for i := 1; i < len(events); i++ {
-		if !events[i].Timestamp().After(events[i-1].Timestamp()) {
-			t.Errorf("Event %d timestamp (%v) should be after event %d timestamp (%v)",
-				i, events[i].Timestamp(), i-1, events[i-1].Timestamp())
-		}
-	}
-}
-
-func TestEvent_JSON_Serialization(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	eventData := map[string]any{
-		"string":  "value",
-		"number":  42,
-		"boolean": true,
-		"array":   []any{1, 2, 3},
-		"object":  map[string]any{"nested": "value"},
-	}
-
-	event, err := NewEvent(ctx, "json.test", eventData)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	cloudEvent := event.CloudEvent()
-
-	// CloudEvent should be JSON serializable
-	cloudEventJSON, err := json.Marshal(cloudEvent)
-	if err != nil {
-		t.Fatalf("Failed to marshal CloudEvent: %v", err)
-	}
-
-	// Should be able to unmarshal back
-	var parsed CloudEvent
-	err = json.Unmarshal(cloudEventJSON, &parsed)
-	if err != nil {
-		t.Fatalf("Failed to unmarshal CloudEvent: %v", err)
-	}
-
-	// Verify key fields survived round-trip
-	if parsed.ID != cloudEvent.ID {
-		t.Errorf("ID mismatch after round-trip")
-	}
-	if parsed.Source != cloudEvent.Source {
-		t.Errorf("Source mismatch after round-trip")
-	}
-	if parsed.Type != cloudEvent.Type {
-		t.Errorf("Type mismatch after round-trip")
-	}
-}
-
-func TestEvent_EmptyData(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	// Test with empty map
-	event1, err := NewEvent(ctx, "empty.map", map[string]any{})
-	if err != nil {
-		t.Fatalf("Failed to create event with empty map: %v", err)
-	}
-
-	cloudEvent1 := event1.CloudEvent()
-	var parsed1 map[string]any
-	json.Unmarshal(cloudEvent1.Data, &parsed1)
-	if len(parsed1) != 0 {
-		t.Error("Expected empty data map")
-	}
-
-	// Test with nil data
-	event2, err := NewEvent(ctx, "nil.data", nil)
-	if err != nil {
-		t.Fatalf("Failed to create event with nil data: %v", err)
-	}
-
-	cloudEvent2 := event2.CloudEvent()
-	if cloudEvent2.Data == nil {
-		t.Error("CloudEvent data should not be nil even with nil input")
-	}
-}
-
-func TestEvent_Origin_WithModule(t *testing.T) {
-	mockMod := &mockEventModule{}
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	// Set module in ancestry
-	ctx.ancestry = []Module{mockMod}
-
-	event, err := NewEvent(ctx, "module.test", nil)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	if event.Origin() != mockMod {
-		t.Error("Expected event origin to be the mock module")
-	}
-
-	cloudEvent := event.CloudEvent()
-	expectedSource := string(mockMod.CaddyModule().ID)
-	if cloudEvent.Source != expectedSource {
-		t.Errorf("Expected source '%s', got '%s'", expectedSource, cloudEvent.Source)
-	}
-}
-
-func TestEvent_LargeData(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	// Create event with large data
-	largeData := make(map[string]any)
-	for i := 0; i < 1000; i++ {
-		largeData[fmt.Sprintf("key%d", i)] = fmt.Sprintf("value%d", i)
-	}
-
-	event, err := NewEvent(ctx, "large.data", largeData)
-	if err != nil {
-		t.Fatalf("Failed to create event with large data: %v", err)
-	}
-
-	// CloudEvent should handle large data
-	cloudEvent := event.CloudEvent()
-
-	var parsedData map[string]any
-	err = json.Unmarshal(cloudEvent.Data, &parsedData)
-	if err != nil {
-		t.Fatalf("Failed to parse large data in CloudEvent: %v", err)
-	}
-
-	if len(parsedData) != len(largeData) {
-		t.Errorf("Expected %d data items, got %d", len(largeData), len(parsedData))
-	}
-}
-
-func TestEvent_SpecialCharacters_InData(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	specialData := map[string]any{
-		"unicode":     "🚀✨",
-		"newlines":    "line1\nline2\r\nline3",
-		"quotes":      `"double" and 'single' quotes`,
-		"backslashes": "\\path\\to\\file",
-		"json_chars":  `{"key": "value"}`,
-		"empty":       "",
-		"null_value":  nil,
-	}
-
-	event, err := NewEvent(ctx, "special.chars", specialData)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	cloudEvent := event.CloudEvent()
-
-	// Should produce valid JSON
-	var parsedData map[string]any
-	err = json.Unmarshal(cloudEvent.Data, &parsedData)
-	if err != nil {
-		t.Fatalf("Failed to parse data with special characters: %v", err)
-	}
-
-	// Verify some special cases survived JSON round-trip
-	if parsedData["unicode"] != "🚀✨" {
-		t.Error("Unicode characters should survive JSON encoding")
-	}
-
-	if parsedData["quotes"] != `"double" and 'single' quotes` {
-		t.Error("Quotes should be properly escaped in JSON")
-	}
-}
-
-func TestEvent_ConcurrentCreation(t *testing.T) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	const numGoroutines = 100
-	var wg sync.WaitGroup
-	events := make([]Event, numGoroutines)
-	errors := make([]error, numGoroutines)
-
-	// Create events concurrently
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(index int) {
-			defer wg.Done()
-
-			eventData := map[string]any{
-				"goroutine": index,
-				"timestamp": time.Now().UnixNano(),
-			}
-
-			events[index], errors[index] = NewEvent(ctx, "concurrent.test", eventData)
-		}(i)
-	}
-
-	wg.Wait()
-
-	// Verify all events were created successfully
-	ids := make(map[string]bool)
-	for i, event := range events {
-		if errors[i] != nil {
-			t.Errorf("Goroutine %d: Failed to create event: %v", i, errors[i])
-			continue
-		}
-
-		// Verify unique IDs
-		idStr := event.ID().String()
-		if ids[idStr] {
-			t.Errorf("Duplicate event ID: %s", idStr)
-		}
-		ids[idStr] = true
-
-		// Verify data integrity
-		if goroutineID, exists := event.Data["goroutine"]; !exists || goroutineID != i {
-			t.Errorf("Event %d: Data corruption detected", i)
-		}
-	}
-}
-
-// Mock module for event testing
-type mockEventModule struct{}
-
-func (m *mockEventModule) CaddyModule() ModuleInfo {
-	return ModuleInfo{
-		ID:  "test.event.module",
-		New: func() Module { return new(mockEventModule) },
-	}
-}
-
-func TestEvent_TimeAccuracy(t *testing.T) {
-	before := time.Now()
-
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	event, err := NewEvent(ctx, "time.accuracy", nil)
-	if err != nil {
-		t.Fatalf("Failed to create event: %v", err)
-	}
-
-	after := time.Now()
-	eventTime := event.Timestamp()
-
-	// Event timestamp should be between before and after
-	if eventTime.Before(before) || eventTime.After(after) {
-		t.Errorf("Event timestamp %v should be between %v and %v", eventTime, before, after)
-	}
-}
-
-func BenchmarkNewEvent(b *testing.B) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	eventData := map[string]any{
-		"key1": "value1",
-		"key2": 42,
-		"key3": true,
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		NewEvent(ctx, "benchmark.test", eventData)
-	}
-}
-
-func BenchmarkEvent_CloudEvent(b *testing.B) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	event, _ := NewEvent(ctx, "benchmark.cloud", map[string]any{
-		"data": "test",
-		"num":  123,
-	})
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		event.CloudEvent()
-	}
-}
-
-func BenchmarkEvent_CloudEvent_LargeData(b *testing.B) {
-	ctx, cancel := NewContext(Context{Context: context.Background()})
-	defer cancel()
-
-	// Create event with substantial data
-	largeData := make(map[string]any)
-	for i := 0; i < 100; i++ {
-		largeData[fmt.Sprintf("key%d", i)] = fmt.Sprintf("value%d", i)
-	}
-
-	event, _ := NewEvent(ctx, "benchmark.large", largeData)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		event.CloudEvent()
-	}
-}

filepath_test.go

@@ -1,221 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build !windows
-
-package caddy
-
-import (
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestFastAbs(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		checkFunc func(result string, err error) error
-	}{
-		{
-			name:  "absolute path",
-			input: "/usr/local/bin",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				if result != "/usr/local/bin" {
-					t.Errorf("expected /usr/local/bin, got %s", result)
-				}
-				return nil
-			},
-		},
-		{
-			name:  "absolute path with dots",
-			input: "/usr/local/../bin",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				if result != "/usr/bin" {
-					t.Errorf("expected /usr/bin, got %s", result)
-				}
-				return nil
-			},
-		},
-		{
-			name:  "relative path",
-			input: "relative/path",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				if !filepath.IsAbs(result) {
-					t.Errorf("expected absolute path, got %s", result)
-				}
-				if !strings.HasSuffix(result, "relative/path") {
-					t.Errorf("expected path to end with 'relative/path', got %s", result)
-				}
-				return nil
-			},
-		},
-		{
-			name:  "dot",
-			input: ".",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				if !filepath.IsAbs(result) {
-					t.Errorf("expected absolute path, got %s", result)
-				}
-				return nil
-			},
-		},
-		{
-			name:  "dot dot",
-			input: "..",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				if !filepath.IsAbs(result) {
-					t.Errorf("expected absolute path, got %s", result)
-				}
-				return nil
-			},
-		},
-		{
-			name:  "empty string",
-			input: "",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				// Empty string should resolve to current directory
-				if !filepath.IsAbs(result) {
-					t.Errorf("expected absolute path, got %s", result)
-				}
-				return nil
-			},
-		},
-		{
-			name:  "complex relative path",
-			input: "./foo/../bar/./baz",
-			checkFunc: func(result string, err error) error {
-				if err != nil {
-					t.Errorf("expected no error, got %v", err)
-				}
-				if !filepath.IsAbs(result) {
-					t.Errorf("expected absolute path, got %s", result)
-				}
-				if !strings.HasSuffix(result, "bar/baz") {
-					t.Errorf("expected path to end with 'bar/baz', got %s", result)
-				}
-				return nil
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := FastAbs(tt.input)
-			tt.checkFunc(result, err)
-		})
-	}
-}
-
-// TestFastAbsVsFilepathAbs compares FastAbs with filepath.Abs to ensure consistent behavior
-func TestFastAbsVsFilepathAbs(t *testing.T) {
-	// Skip if working directory cannot be determined
-	if wderr != nil {
-		t.Skip("working directory error, skipping comparison test")
-	}
-
-	testPaths := []string{
-		".",
-		"..",
-		"foo",
-		"foo/bar",
-		"./foo",
-		"../foo",
-		"/absolute/path",
-		"/usr/local/bin",
-	}
-
-	for _, path := range testPaths {
-		t.Run(path, func(t *testing.T) {
-			fast, fastErr := FastAbs(path)
-			std, stdErr := filepath.Abs(path)
-
-			// Both should succeed or fail together
-			if (fastErr != nil) != (stdErr != nil) {
-				t.Errorf("error mismatch: FastAbs=%v, filepath.Abs=%v", fastErr, stdErr)
-			}
-
-			// If both succeed, results should be the same
-			if fastErr == nil && stdErr == nil && fast != std {
-				t.Errorf("result mismatch for %q: FastAbs=%s, filepath.Abs=%s", path, fast, std)
-			}
-		})
-	}
-}
-
-// TestFastAbsErrorHandling tests error handling when working directory is unavailable
-func TestFastAbsErrorHandling(t *testing.T) {
-	// This tests the cached wderr behavior
-	if wderr != nil {
-		// Test that FastAbs properly returns the cached error for relative paths
-		_, err := FastAbs("relative/path")
-		if err == nil {
-			t.Error("expected error for relative path when working directory is unavailable")
-		}
-		if err != wderr {
-			t.Errorf("expected cached wderr, got different error: %v", err)
-		}
-	}
-}
-
-// BenchmarkFastAbs benchmarks FastAbs
-func BenchmarkFastAbs(b *testing.B) {
-	paths := []string{
-		"relative/path",
-		"/absolute/path",
-		".",
-		"..",
-		"./foo/bar",
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		FastAbs(paths[i%len(paths)])
-	}
-}
-
-// BenchmarkFastAbsVsStdLib compares performance of FastAbs vs filepath.Abs
-func BenchmarkFastAbsVsStdLib(b *testing.B) {
-	path := "relative/path/to/file"
-
-	b.Run("FastAbs", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			FastAbs(path)
-		}
-	})
-
-	b.Run("filepath.Abs", func(b *testing.B) {
-		for i := 0; i < b.N; i++ {
-			filepath.Abs(path)
-		}
-	})
-}

filesystem_test.go

@@ -1,351 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"fmt"
-	"io/fs"
-	"sync"
-	"testing"
-	"time"
-)
-
-// Mock filesystem implementation for testing
-type mockFileSystem struct {
-	name  string
-	files map[string]string
-}
-
-func (m *mockFileSystem) Open(name string) (fs.File, error) {
-	if content, exists := m.files[name]; exists {
-		return &mockFile{name: name, content: content}, nil
-	}
-	return nil, fs.ErrNotExist
-}
-
-type mockFile struct {
-	name    string
-	content string
-	pos     int
-}
-
-func (m *mockFile) Stat() (fs.FileInfo, error) {
-	return &mockFileInfo{name: m.name, size: int64(len(m.content))}, nil
-}
-
-func (m *mockFile) Read(b []byte) (int, error) {
-	if m.pos >= len(m.content) {
-		return 0, fs.ErrClosed
-	}
-	n := copy(b, m.content[m.pos:])
-	m.pos += n
-	return n, nil
-}
-
-func (m *mockFile) Close() error {
-	return nil
-}
-
-type mockFileInfo struct {
-	name string
-	size int64
-}
-
-func (m *mockFileInfo) Name() string      { return m.name }
-func (m *mockFileInfo) Size() int64       { return m.size }
-func (m *mockFileInfo) Mode() fs.FileMode { return 0o644 }
-func (m *mockFileInfo) ModTime() time.Time {
-	return time.Time{}
-}
-func (m *mockFileInfo) IsDir() bool { return false }
-func (m *mockFileInfo) Sys() any    { return nil }
-
-// Mock FileSystems implementation for testing
-type mockFileSystems struct {
-	mu          sync.RWMutex
-	filesystems map[string]fs.FS
-	defaultFS   fs.FS
-}
-
-func newMockFileSystems() *mockFileSystems {
-	return &mockFileSystems{
-		filesystems: make(map[string]fs.FS),
-		defaultFS:   &mockFileSystem{name: "default", files: map[string]string{"default.txt": "default content"}},
-	}
-}
-
-func (m *mockFileSystems) Register(k string, v fs.FS) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.filesystems[k] = v
-}
-
-func (m *mockFileSystems) Unregister(k string) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	delete(m.filesystems, k)
-}
-
-func (m *mockFileSystems) Get(k string) (fs.FS, bool) {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-	v, ok := m.filesystems[k]
-	return v, ok
-}
-
-func (m *mockFileSystems) Default() fs.FS {
-	return m.defaultFS
-}
-
-func TestFileSystems_Register_Get(t *testing.T) {
-	fsys := newMockFileSystems()
-	mockFS := &mockFileSystem{
-		name:  "test",
-		files: map[string]string{"test.txt": "test content"},
-	}
-
-	// Register filesystem
-	fsys.Register("test", mockFS)
-
-	// Retrieve filesystem
-	retrieved, exists := fsys.Get("test")
-	if !exists {
-		t.Error("Expected filesystem to exist after registration")
-	}
-	if retrieved != mockFS {
-		t.Error("Retrieved filesystem is not the same as registered")
-	}
-}
-
-func TestFileSystems_Unregister(t *testing.T) {
-	fsys := newMockFileSystems()
-	mockFS := &mockFileSystem{name: "test"}
-
-	// Register then unregister
-	fsys.Register("test", mockFS)
-	fsys.Unregister("test")
-
-	// Should not exist after unregistration
-	_, exists := fsys.Get("test")
-	if exists {
-		t.Error("Filesystem should not exist after unregistration")
-	}
-}
-
-func TestFileSystems_Default(t *testing.T) {
-	fsys := newMockFileSystems()
-
-	defaultFS := fsys.Default()
-	if defaultFS == nil {
-		t.Error("Default filesystem should not be nil")
-	}
-
-	// Test that default filesystem works
-	file, err := defaultFS.Open("default.txt")
-	if err != nil {
-		t.Fatalf("Failed to open default file: %v", err)
-	}
-	defer file.Close()
-
-	data := make([]byte, 100)
-	n, err := file.Read(data)
-	if err != nil && err != fs.ErrClosed {
-		t.Fatalf("Failed to read default file: %v", err)
-	}
-
-	content := string(data[:n])
-	if content != "default content" {
-		t.Errorf("Expected 'default content', got '%s'", content)
-	}
-}
-
-func TestFileSystems_Concurrent_Access(t *testing.T) {
-	fsys := newMockFileSystems()
-
-	const numGoroutines = 50
-	const numOperations = 10
-
-	var wg sync.WaitGroup
-
-	// Concurrent register/unregister/get operations
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-
-			key := fmt.Sprintf("fs-%d", id)
-			mockFS := &mockFileSystem{
-				name:  key,
-				files: map[string]string{key + ".txt": "content"},
-			}
-
-			for j := 0; j < numOperations; j++ {
-				// Register
-				fsys.Register(key, mockFS)
-
-				// Get
-				retrieved, exists := fsys.Get(key)
-				if !exists {
-					t.Errorf("Filesystem %s should exist", key)
-					continue
-				}
-				if retrieved != mockFS {
-					t.Errorf("Retrieved filesystem for %s is not correct", key)
-				}
-
-				// Test file access
-				file, err := retrieved.Open(key + ".txt")
-				if err != nil {
-					t.Errorf("Failed to open file in %s: %v", key, err)
-					continue
-				}
-				file.Close()
-
-				// Unregister
-				fsys.Unregister(key)
-
-				// Should not exist after unregister
-				_, stillExists := fsys.Get(key)
-				if stillExists {
-					t.Errorf("Filesystem %s should not exist after unregister", key)
-				}
-			}
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func TestFileSystems_Get_NonExistent(t *testing.T) {
-	fsys := newMockFileSystems()
-
-	_, exists := fsys.Get("non-existent")
-	if exists {
-		t.Error("Non-existent filesystem should not exist")
-	}
-}
-
-func TestFileSystems_Register_Overwrite(t *testing.T) {
-	fsys := newMockFileSystems()
-	key := "overwrite-test"
-
-	// Register first filesystem
-	fs1 := &mockFileSystem{name: "fs1"}
-	fsys.Register(key, fs1)
-
-	// Register second filesystem with same key (should overwrite)
-	fs2 := &mockFileSystem{name: "fs2"}
-	fsys.Register(key, fs2)
-
-	// Should get the second filesystem
-	retrieved, exists := fsys.Get(key)
-	if !exists {
-		t.Error("Filesystem should exist")
-	}
-	if retrieved != fs2 {
-		t.Error("Should get the overwritten filesystem")
-	}
-	if retrieved == fs1 {
-		t.Error("Should not get the original filesystem")
-	}
-}
-
-func TestFileSystems_Concurrent_RegisterUnregister_SameKey(t *testing.T) {
-	fsys := newMockFileSystems()
-	key := "concurrent-key"
-
-	const numGoroutines = 20
-	var wg sync.WaitGroup
-
-	// Half the goroutines register, half unregister
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		if i%2 == 0 {
-			go func(id int) {
-				defer wg.Done()
-				mockFS := &mockFileSystem{name: fmt.Sprintf("fs-%d", id)}
-				fsys.Register(key, mockFS)
-			}(i)
-		} else {
-			go func() {
-				defer wg.Done()
-				fsys.Unregister(key)
-			}()
-		}
-	}
-
-	wg.Wait()
-
-	// The final state is unpredictable due to race conditions,
-	// but the operations should not panic or cause corruption
-	// Test passes if we reach here without issues
-}
-
-func TestFileSystems_StressTest(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping stress test in short mode")
-	}
-
-	fsys := newMockFileSystems()
-
-	const numGoroutines = 100
-	const duration = 100 * time.Millisecond
-
-	var wg sync.WaitGroup
-	stopChan := make(chan struct{})
-
-	// Start timer
-	go func() {
-		time.Sleep(duration)
-		close(stopChan)
-	}()
-
-	// Stress test with continuous operations
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-
-			key := fmt.Sprintf("stress-fs-%d", id%10) // Use limited set of keys
-			mockFS := &mockFileSystem{
-				name:  key,
-				files: map[string]string{key + ".txt": "stress content"},
-			}
-
-			for {
-				select {
-				case <-stopChan:
-					return
-				default:
-					// Rapid register/get/unregister cycles
-					fsys.Register(key, mockFS)
-
-					if retrieved, exists := fsys.Get(key); exists {
-						// Try to use the filesystem
-						if file, err := retrieved.Open(key + ".txt"); err == nil {
-							file.Close()
-						}
-					}
-
-					fsys.Unregister(key)
-				}
-			}
-		}(i)
-	}
-
-	wg.Wait()
-
-	// Test passes if we reach here without panics or deadlocks
-}

go.mod

@@ -1,15 +1,15 @@
 module github.com/caddyserver/caddy/v2
 
-go 1.25.1
+go 1.25.0
 
 require (
 	github.com/BurntSushi/toml v1.6.0
-	github.com/DeRuina/timberjack v1.4.2
+	github.com/DeRuina/timberjack v1.4.1
 	github.com/KimMachineGun/automemlimit v0.7.5
 	github.com/Masterminds/sprig/v3 v3.3.0
 	github.com/alecthomas/chroma/v2 v2.23.1
 	github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b
-	github.com/caddyserver/certmagic v0.25.3
+	github.com/caddyserver/certmagic v0.25.2
 	github.com/caddyserver/zerossl v0.1.5
 	github.com/cloudflare/circl v1.6.3
 	github.com/dustin/go-humanize v1.0.1
@@ -20,7 +20,7 @@ require (
 	github.com/klauspost/cpuid/v2 v2.3.0
 	github.com/mholt/acmez/v3 v3.1.6
 	github.com/prometheus/client_golang v1.23.2
-	github.com/quic-go/quic-go v0.59.1
+	github.com/quic-go/quic-go v0.59.0
 	github.com/smallstep/certificates v0.30.2
 	github.com/smallstep/nosql v0.8.0
 	github.com/smallstep/truststore v0.13.0
@@ -30,29 +30,27 @@ require (
 	github.com/tailscale/tscert v0.0.0-20251216020129-aea342f6d747
 	github.com/yuin/goldmark v1.8.2
 	github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
-	go.opentelemetry.io/contrib/bridges/prometheus v0.68.0
-	go.opentelemetry.io/contrib/exporters/autoexport v0.65.0
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0
-	go.opentelemetry.io/contrib/propagators/autoprop v0.65.0
+	go.opentelemetry.io/contrib/exporters/autoexport v0.68.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0
+	go.opentelemetry.io/contrib/propagators/autoprop v0.68.0
 	go.opentelemetry.io/otel v1.43.0
 	go.opentelemetry.io/otel/sdk v1.43.0
-	go.opentelemetry.io/otel/sdk/metric v1.43.0
-	go.step.sm/crypto v0.81.0
+	go.step.sm/crypto v0.77.2
 	go.uber.org/automaxprocs v1.6.0
 	go.uber.org/zap v1.27.1
 	go.uber.org/zap/exp v0.3.0
-	golang.org/x/crypto v0.51.0
-	golang.org/x/crypto/x509roots/fallback v0.0.0-20260213171211-a408498e5541
+	golang.org/x/crypto v0.50.0
+	golang.org/x/crypto/x509roots/fallback v0.0.0-20260323153451-8400f4a93807
 	golang.org/x/net v0.53.0
 	golang.org/x/sync v0.20.0
-	golang.org/x/term v0.43.0
+	golang.org/x/term v0.42.0
 	golang.org/x/time v0.15.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	cel.dev/expr v0.25.1 // indirect
-	cloud.google.com/go/auth v0.20.0 // indirect
+	cloud.google.com/go/auth v0.18.2 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	dario.cat/mergo v1.0.2 // indirect
@@ -63,16 +61,16 @@ require (
 	github.com/coreos/go-oidc/v3 v3.17.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-	github.com/go-jose/go-jose/v3 v3.0.5 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
 	github.com/go-jose/go-jose/v4 v4.1.4 // indirect
 	github.com/google/certificate-transparency-go v1.1.8-0.20240110162603-74a5dd331745 // indirect
 	github.com/google/go-tpm v0.9.8 // indirect
 	github.com/google/go-tspi v0.3.0 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.15 // indirect
-	github.com/googleapis/gax-go/v2 v2.22.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
+	github.com/googleapis/gax-go/v2 v2.19.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
-	github.com/jackc/pgx/v5 v5.9.2 // indirect
+	github.com/jackc/pgx/v5 v5.8.0 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -89,6 +87,7 @@ require (
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/zeebo/blake3 v0.2.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/bridges/prometheus v0.68.0 // indirect
 	go.opentelemetry.io/contrib/propagators/aws v1.43.0 // indirect
 	go.opentelemetry.io/contrib/propagators/b3 v1.43.0 // indirect
 	go.opentelemetry.io/contrib/propagators/jaeger v1.43.0 // indirect
@@ -105,13 +104,14 @@ require (
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.43.0 // indirect
 	go.opentelemetry.io/otel/log v0.19.0 // indirect
 	go.opentelemetry.io/otel/sdk/log v0.19.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
 	golang.org/x/oauth2 v0.36.0 // indirect
-	google.golang.org/api v0.277.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
+	google.golang.org/api v0.272.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d // indirect
 	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
 )
 
@@ -168,11 +168,11 @@ require (
 	go.opentelemetry.io/otel/trace v1.43.0
 	go.opentelemetry.io/proto/otlp v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.35.0 // indirect
-	golang.org/x/sys v0.44.0
-	golang.org/x/text v0.37.0 // indirect
-	golang.org/x/tools v0.44.0 // indirect
-	google.golang.org/grpc v1.81.0 // indirect
+	golang.org/x/mod v0.34.0 // indirect
+	golang.org/x/sys v0.43.0
+	golang.org/x/text v0.36.0
+	golang.org/x/tools v0.43.0 // indirect
+	google.golang.org/grpc v1.80.0 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	howett.net/plist v1.0.0 // indirect
 )

go.sum

@@ -2,18 +2,18 @@ cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
 cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
 cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
 cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
-cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=
-cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=
+cloud.google.com/go/auth v0.18.2 h1:+Nbt5Ev0xEqxlNjd6c+yYUeosQ5TtEUaNcN/3FozlaM=
+cloud.google.com/go/auth v0.18.2/go.mod h1:xD+oY7gcahcu7G2SG2DsBerfFxgPAJz17zz2joOFF3M=
 cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
 cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
 cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
 cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-cloud.google.com/go/iam v1.7.0 h1:JD3zh0C6LHl16aCn5Akff0+GELdp1+4hmh6ndoFLl8U=
-cloud.google.com/go/iam v1.7.0/go.mod h1:tetWZW1PD/m6vcuY2Zj/aU0eCHNPuxedbnbRTyKXvdY=
-cloud.google.com/go/kms v1.31.0 h1:LS8N92OxFDgOLg5NCo3OmbvjtQAIVT5gUHVLKIDHaFE=
-cloud.google.com/go/kms v1.31.0/go.mod h1:YIyXZym11R5uovJJt4oN5eUL3oPmirF3yKeIh6QAf4U=
-cloud.google.com/go/longrunning v0.9.0 h1:0EzbDEGsAvOZNbqXopgniY0w0a1phvu5IdUFq8grmqY=
-cloud.google.com/go/longrunning v0.9.0/go.mod h1:pkTz846W7bF4o2SzdWJ40Hu0Re+UoNT6Q5t+igIcb8E=
+cloud.google.com/go/iam v1.5.3 h1:+vMINPiDF2ognBJ97ABAYYwRgsaqxPbQDlMnbHMjolc=
+cloud.google.com/go/iam v1.5.3/go.mod h1:MR3v9oLkZCTlaqljW6Eb2d3HGDGK5/bDv93jhfISFvU=
+cloud.google.com/go/kms v1.26.0 h1:cK9mN2cf+9V63D3H1f6koxTatWy39aTI/hCjz1I+adU=
+cloud.google.com/go/kms v1.26.0/go.mod h1:pHKOdFJm63hxBsiPkYtowZPltu9dW0MWvBa6IA4HM58=
+cloud.google.com/go/longrunning v0.8.0 h1:LiKK77J3bx5gDLi4SMViHixjD2ohlkwBi+mKA7EhfW8=
+cloud.google.com/go/longrunning v0.8.0/go.mod h1:UmErU2Onzi+fKDg2gR7dusz11Pe26aknR4kHmJJqIfk=
 code.pfad.fr/check v1.1.0 h1:GWvjdzhSEgHvEHe2uJujDcpmZoySKuHQNrZMfzfO0bE=
 code.pfad.fr/check v1.1.0/go.mod h1:NiUH13DtYsb7xp5wll0U4SXx7KhXQVCtRgdC96IPfoM=
 dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
@@ -28,8 +28,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
 github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=
 github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/DeRuina/timberjack v1.4.2 h1:4bKlzhKdsR+2oNkgef9mqb4n11ICow8VK88RfzJPzN8=
-github.com/DeRuina/timberjack v1.4.2/go.mod h1:RLoeQrwrCGIEF8gO5nV5b/gMD0QIy7bzQhBUgpp1EqE=
+github.com/DeRuina/timberjack v1.4.1 h1:JftM5HN/ITKehAXjtdbGqN5XZIS1biHm7VSjU0Qbtqg=
+github.com/DeRuina/timberjack v1.4.1/go.mod h1:RLoeQrwrCGIEF8gO5nV5b/gMD0QIy7bzQhBUgpp1EqE=
 github.com/KimMachineGun/automemlimit v0.7.5 h1:RkbaC0MwhjL1ZuBKunGDjE/ggwAX43DwZrJqVwyveTk=
 github.com/KimMachineGun/automemlimit v0.7.5/go.mod h1:QZxpHaGOQoYvFhv/r4u3U0JTC2ZcOwbSr11UZF46UBM=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -53,40 +53,40 @@ github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmO
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b h1:uUXgbcPDK3KpW29o4iy7GtuappbWT0l5NaMo9H9pJDw=
 github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
-github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8=
-github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc=
-github.com/aws/aws-sdk-go-v2/config v1.32.17 h1:FpL4/758/diKwqbytU0prpuiu60fgXKUWCpDJtApclU=
-github.com/aws/aws-sdk-go-v2/config v1.32.17/go.mod h1:OXqUMzgXytfoF9JaKkhrOYsyh72t9G+MJH8mMRaexOE=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.16 h1:r3RJBuU7X9ibt8RHbMjWE6y60QbKBiII6wSrXnapxSU=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.16/go.mod h1:6cx7zqDENJDbBIIWX6P8s0h6hqHC8Avbjh9Dseo27ug=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23 h1:UuSfcORqNSz/ey3VPRS8TcVH2Ikf0/sC+Hdj400QI6U=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.23/go.mod h1:+G/OSGiOFnSOkYloKj/9M35s74LgVAdJBSD5lsFfqKg=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23 h1:GpT/TrnBYuE5gan2cZbTtvP+JlHsutdmlV2YfEyNde0=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.23/go.mod h1:xYWD6BS9ywC5bS3sz9Xh04whO/hzK2plt2Zkyrp4JuA=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23 h1:bpd8vxhlQi2r1hiueOw02f/duEPTMK59Q4QMAoTTtTo=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.23/go.mod h1:15DfR2nw+CRHIk0tqNyifu3G1YdAOy68RftkhMDDwYk=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24 h1:OQqn11BtaYv1WLUowvcA30MpzIu8Ti4pcLPIIyoKZrA=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.24/go.mod h1:X5ZJyfwVrWA96GzPmUCWFQaEARPR7gCrpq2E92PJwAE=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9 h1:FLudkZLt5ci0ozzgkVo8BJGwvqNaZbTWb3UcucAateA=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.9/go.mod h1:w7wZ/s9qK7c8g4al+UyoF1Sp/Z45UwMGcqIzLWVQHWk=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23 h1:pbrxO/kuIwgEsOPLkaHu0O+m4fNgLU8B3vxQ+72jTPw=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.23/go.mod h1:/CMNUqoj46HpS3MNRDEDIwcgEnrtZlKRaHNaHxIFpNA=
-github.com/aws/aws-sdk-go-v2/service/kms v1.51.1 h1:zuSf4olLKZW8cF/W9Y5wvGT+/0raY/3kVp49KsGs0QY=
-github.com/aws/aws-sdk-go-v2/service/kms v1.51.1/go.mod h1:Y0+uxvxz6ib4KktRdK0V4X45Vcs/JyYoz8H71pO8xeI=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.11 h1:TdJ+HdzOBhU8+iVAOGUTU63VXopcumCOF1paFulHWZc=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.11/go.mod h1:R82ZRExE/nheo0N+T8zHPcLRTcH8MGsnR3BiVGX0TwI=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.17 h1:7byT8HUWrgoRp6sXjxtZwgOKfhss5fW6SkLBtqzgRoE=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.17/go.mod h1:xNWknVi4Ezm1vg1QsB/5EWpAJURq22uqd38U8qKvOJc=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21 h1:+1Kl1zx6bWi4X7cKi3VYh29h8BvsCoHQEQ6ST9X8w7w=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.21/go.mod h1:4vIRDq+CJB2xFAXZ+YgGUTiEft7oAQlhIs71xcSeuVg=
-github.com/aws/aws-sdk-go-v2/service/sts v1.42.1 h1:F/M5Y9I3nwr2IEpshZgh1GeHpOItExNM9L1euNuh/fk=
-github.com/aws/aws-sdk-go-v2/service/sts v1.42.1/go.mod h1:mTNxImtovCOEEuD65mKW7DCsL+2gjEH+RPEAexAzAio=
-github.com/aws/smithy-go v1.25.1 h1:J8ERsGSU7d+aCmdQur5Txg6bVoYelvQJgtZehD12GkI=
-github.com/aws/smithy-go v1.25.1/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
+github.com/aws/aws-sdk-go-v2 v1.41.4 h1:10f50G7WyU02T56ox1wWXq+zTX9I1zxG46HYuG1hH/k=
+github.com/aws/aws-sdk-go-v2 v1.41.4/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
+github.com/aws/aws-sdk-go-v2/config v1.32.12 h1:O3csC7HUGn2895eNrLytOJQdoL2xyJy0iYXhoZ1OmP0=
+github.com/aws/aws-sdk-go-v2/config v1.32.12/go.mod h1:96zTvoOFR4FURjI+/5wY1vc1ABceROO4lWgWJuxgy0g=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.12 h1:oqtA6v+y5fZg//tcTWahyN9PEn5eDU/Wpvc2+kJ4aY8=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.12/go.mod h1:U3R1RtSHx6NB0DvEQFGyf/0sbrpJrluENHdPy1j/3TE=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 h1:zOgq3uezl5nznfoK3ODuqbhVg1JzAGDUhXOsU0IDCAo=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20/go.mod h1:z/MVwUARehy6GAg/yQ1GO2IMl0k++cu1ohP9zo887wE=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 h1:CNXO7mvgThFGqOFgbNAP2nol2qAWBOGfqR/7tQlvLmc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20/go.mod h1:oydPDJKcfMhgfcgBUZaG+toBbwy8yPWubJXBVERtI4o=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 h1:tN6W/hg+pkM+tf9XDkWUbDEjGLb+raoBMFsTodcoYKw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20/go.mod h1:YJ898MhD067hSHA6xYCx5ts/jEd8BSOLtQDL3iZsvbc=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 h1:qYQ4pzQ2Oz6WpQ8T3HvGHnZydA72MnLuFK9tJwmrbHw=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 h1:2HvVAIq+YqgGotK6EkMf+KIEqTISmTYh5zLpYyeTo1Y=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20/go.mod h1:V4X406Y666khGa8ghKmphma/7C0DAtEQYhkq9z4vpbk=
+github.com/aws/aws-sdk-go-v2/service/kms v1.50.3 h1:s/zDSG/a/Su9aX+v0Ld9cimUCdkr5FWPmBV8owaEbZY=
+github.com/aws/aws-sdk-go-v2/service/kms v1.50.3/go.mod h1:/iSgiUor15ZuxFGQSTf3lA2FmKxFsQoc2tADOarQBSw=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 h1:0GFOLzEbOyZABS3PhYfBIx2rNBACYcKty+XGkTgw1ow=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.8/go.mod h1:LXypKvk85AROkKhOG6/YEcHFPoX+prKTowKnVdcaIxE=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.13 h1:kiIDLZ005EcKomYYITtfsjn7dtOwHDOFy7IbPXKek2o=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.13/go.mod h1:2h/xGEowcW/g38g06g3KpRWDlT+OTfxxI0o1KqayAB8=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17 h1:jzKAXIlhZhJbnYwHbvUQZEB8KfgAEuG0dc08Bkda7NU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17/go.mod h1:Al9fFsXjv4KfbzQHGe6V4NZSZQXecFcvaIF4e70FoRA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.9 h1:Cng+OOwCHmFljXIxpEVXAGMnBia8MSU6Ch5i9PgBkcU=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.9/go.mod h1:LrlIndBDdjA/EeXeyNBle+gyCwTlizzW5ycgWnvIxkk=
+github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=
+github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/caddyserver/certmagic v0.25.3 h1:mGf5ba8F7xA4c5jfDZZbK2buY1VEkbnwpMDixaju94A=
-github.com/caddyserver/certmagic v0.25.3/go.mod h1:YVs43D5+H/Dckt4bTga1KSO/xYfFBfVZainGDywYPAA=
+github.com/caddyserver/certmagic v0.25.2 h1:D7xcS7ggX/WEY54x0czj7ioTkmDWKIgxtIi2OcQclUc=
+github.com/caddyserver/certmagic v0.25.2/go.mod h1:llW/CvsNmza8S6hmsuggsZeiX+uS27dkqY27wDIuBWg=
 github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE=
 github.com/caddyserver/zerossl v0.1.5/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
 github.com/ccoveille/go-safecast/v2 v2.0.0 h1:+5eyITXAUj3wMjad6cRVJKGnC7vDS55zk0INzJagub0=
@@ -149,8 +149,8 @@ github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sa
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
 github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
-github.com/go-jose/go-jose/v3 v3.0.5 h1:BLLJWbC4nMZOfuPVxoZIxeYsn6Nl2r1fITaJ78UQlVQ=
-github.com/go-jose/go-jose/v3 v3.0.5/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
+github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY=
+github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
 github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
 github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -187,10 +187,10 @@ github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
 github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/enterprise-certificate-proxy v0.3.15 h1:xolVQTEXusUcAA5UgtyRLjelpFFHWlPQ4XfWGc7MBas=
-github.com/googleapis/enterprise-certificate-proxy v0.3.15/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
-github.com/googleapis/gax-go/v2 v2.22.0 h1:PjIWBpgGIVKGoCXuiCoP64altEJCj3/Ei+kSU5vlZD4=
-github.com/googleapis/gax-go/v2 v2.22.0/go.mod h1:irWBbALSr0Sk3qlqb9SyJ1h68WjgeFuiOzI4Rqw5+aY=
+github.com/googleapis/enterprise-certificate-proxy v0.3.14 h1:yh8ncqsbUY4shRD5dA6RlzjJaT4hi3kII+zYw8wmLb8=
+github.com/googleapis/enterprise-certificate-proxy v0.3.14/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
+github.com/googleapis/gax-go/v2 v2.19.0 h1:fYQaUOiGwll0cGj7jmHT/0nPlcrZDFPrZRhTsoCr8hE=
+github.com/googleapis/gax-go/v2 v2.19.0/go.mod h1:w2ROXVdfGEVFXzmlciUU4EdjHgWvB5h2n6x/8XSTTJA=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0/go.mod h1:JfhWUomR1baixubs02l85lZYYOm7LV6om4ceouMv45c=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -205,8 +205,8 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.9.2 h1:3ZhOzMWnR4yJ+RW1XImIPsD1aNSz4T4fyP7zlQb56hw=
-github.com/jackc/pgx/v5 v5.9.2/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
+github.com/jackc/pgx/v5 v5.8.0 h1:TYPDoleBBme0xGSAX3/+NujXXtpZn9HBONkQC7IEZSo=
+github.com/jackc/pgx/v5 v5.8.0/go.mod h1:QVeDInX2m9VyzvNeiCJVjCkNFqzsNb43204HshNSZKw=
 github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -280,8 +280,8 @@ github.com/prometheus/procfs v0.20.1 h1:XwbrGOIplXW/AU3YhIhLODXMJYyC1isLFfYCsTEy
 github.com/prometheus/procfs v0.20.1/go.mod h1:o9EMBZGRyvDrSPH1RqdxhojkuXstoe4UlK79eF5TGGo=
 github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
 github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
-github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic=
-github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
+github.com/quic-go/quic-go v0.59.0 h1:OLJkp1Mlm/aS7dpKgTc6cnpynnD2Xg7C1pwL6vy/SAw=
+github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
@@ -375,14 +375,14 @@ go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/bridges/prometheus v0.68.0 h1:w3zlHYETbDwXyWHZlyyR58ZC39XGi8rAhkBgUgJ9d5w=
 go.opentelemetry.io/contrib/bridges/prometheus v0.68.0/go.mod h1:GR/mClR2nn7vE8RLwxKjoBNg+QtgdDhRzxVa93koy5o=
-go.opentelemetry.io/contrib/exporters/autoexport v0.65.0 h1:2gApdml7SznX9szEKFjKjM4qGcGSvAybYLBY319XG3g=
-go.opentelemetry.io/contrib/exporters/autoexport v0.65.0/go.mod h1:0QqAGlbHXhmPYACG3n5hNzO5DnEqqtg4VcK5pr22RI0=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 h1:yI1/OhfEPy7J9eoa6Sj051C7n5dvpj0QX8g4sRchg04=
-go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
-go.opentelemetry.io/contrib/propagators/autoprop v0.65.0 h1:kTaCycF9Xkm8VBBvH0rJ4wFeRjtIV55Erk3uuVsIs5s=
-go.opentelemetry.io/contrib/propagators/autoprop v0.65.0/go.mod h1:rooPzAbXfxMX9fsPJjmOBg2SN4RhFEV8D7cfGK+N3tE=
+go.opentelemetry.io/contrib/exporters/autoexport v0.68.0 h1:0D3GFvELGIwQGfC6agLsbrEYSGWZTRTxIXxcQUqrOuk=
+go.opentelemetry.io/contrib/exporters/autoexport v0.68.0/go.mod h1:DM2NV7Zb8CcGeVPt6glouY0FAiwZQ/iqgcWExhgWeN8=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0/go.mod h1:snMWehoOh2wsEwnvvwtDyFCxVeDAODenXHtn5vzrKjo=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 h1:CqXxU8VOmDefoh0+ztfGaymYbhdB/tT3zs79QaZTNGY=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0/go.mod h1:BuhAPThV8PBHBvg8ZzZ/Ok3idOdhWIodywz2xEcRbJo=
+go.opentelemetry.io/contrib/propagators/autoprop v0.68.0 h1:wLGFvNBPqQhzBn0QRBZjrriH8lZ9gqtTz8ufHEjLg7k=
+go.opentelemetry.io/contrib/propagators/autoprop v0.68.0/go.mod h1:evWK9nCqCzH8nhclTlpkdUzmxrmJQ2mrWCdKIvyOYec=
 go.opentelemetry.io/contrib/propagators/aws v1.43.0 h1:EwnsB3cXRLAh7/Nr/9rMuGw73nfb3z6uAvVDjRrbeUg=
 go.opentelemetry.io/contrib/propagators/aws v1.43.0/go.mod h1:CJjTym6F87tEdm61Qvnz5xrV8vKlH4C92djiqcn62k8=
 go.opentelemetry.io/contrib/propagators/b3 v1.43.0 h1:CETqV3QLLPTy5yNrqyMr41VnAOOD4lsRved7n4QG00A=
@@ -431,8 +431,8 @@ go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09
 go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
 go.opentelemetry.io/proto/otlp v1.10.0 h1:IQRWgT5srOCYfiWnpqUYz9CVmbO8bFmKcwYxpuCSL2g=
 go.opentelemetry.io/proto/otlp v1.10.0/go.mod h1:/CV4QoCR/S9yaPj8utp3lvQPoqMtxXdzn7ozvvozVqk=
-go.step.sm/crypto v0.81.0 h1:e+ouzpNt3Xm4dp7HGXhgYB5y4iFik3vh3phHKWmvugU=
-go.step.sm/crypto v0.81.0/go.mod h1:fsTizqQeASjTXnbv9O00XtRlIuXRkCdoRiJNyXGQujc=
+go.step.sm/crypto v0.77.2 h1:qFjjei+RHc5kP5R7NW9OUWT7SqWIuAOvOkXqg4fNWj8=
+go.step.sm/crypto v0.77.2/go.mod h1:W0YJb9onM5l78qgkXIJ2Up6grnwW8EtpCKIza/NCg0o=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -456,10 +456,10 @@ golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliY
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
 golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
-golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
-golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
-golang.org/x/crypto/x509roots/fallback v0.0.0-20260213171211-a408498e5541 h1:FmKxj9ocLKn45jiR2jQMwCVhDvaK7fKQFzfuT9GvyK8=
-golang.org/x/crypto/x509roots/fallback v0.0.0-20260213171211-a408498e5541/go.mod h1:+UoQFNBq2p2wO+Q6ddVtYc25GZ6VNdOMyyrd4nrqrKs=
+golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
+golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
+golang.org/x/crypto/x509roots/fallback v0.0.0-20260323153451-8400f4a93807 h1:sQVhWLXbNsa8CTzHOX3IHc7C4Q2JyxI5AweuMQZ/5H0=
+golang.org/x/crypto/x509roots/fallback v0.0.0-20260323153451-8400f4a93807/go.mod h1:+UoQFNBq2p2wO+Q6ddVtYc25GZ6VNdOMyyrd4nrqrKs=
 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 h1:mgKeJMpvi0yx/sU5GsxQ7p6s2wtOnGAHZWCHUM4KGzY=
 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -467,8 +467,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.35.0 h1:Ww1D637e6Pg+Zb2KrWfHQUnH2dQRLBQyAtpr/haaJeM=
-golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU=
+golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
+golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
@@ -506,8 +506,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
-golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -517,8 +517,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
 golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
-golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4=
-golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk=
+golang.org/x/term v0.42.0 h1:UiKe+zDFmJobeJ5ggPwOshJIVt6/Ft0rcfrXZDLWAWY=
+golang.org/x/term v0.42.0/go.mod h1:Dq/D+snpsbazcBG5+F9Q1n2rXV8Ma+71xEjTRufARgY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -528,8 +528,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
-golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc=
-golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38=
+golang.org/x/text v0.36.0 h1:JfKh3XmcRPqZPKevfXVpI1wXPTqbkE5f7JA92a55Yxg=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
 golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -538,21 +538,21 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
-golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c=
-golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI=
+golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
+golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
 gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/api v0.277.0 h1:HJfyJUiNeBBUMai7ez8u14wkp/gH/I4wpGbbO9o+cSk=
-google.golang.org/api v0.277.0/go.mod h1:B9TqLBwJqVjp1mtt7WeoQwWRwvu/400y5lETOql+giQ=
-google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgnawEVsOn6OFsnpyxNPRY9QV01dNB0=
-google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 h1:VPWxll4HlMw1Vs/qXtN7BvhZqsS9cdAittCNvVENElA=
-google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:7QBABkRtR8z+TEnmXTqIqwJLlzrZKVfAUm7tY3yGv0M=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 h1:tEkOQcXgF6dH1G+MVKZrfpYvozGrzb91k6ha7jireSM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.81.0 h1:W3G9N3KQf3BU+YuCtGKJk0CmxQNbAISICD/9AORxLIw=
-google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I=
+google.golang.org/api v0.272.0 h1:eLUQZGnAS3OHn31URRf9sAmRk3w2JjMx37d2k8AjJmA=
+google.golang.org/api v0.272.0/go.mod h1:wKjowi5LNJc5qarNvDCvNQBn3rVK8nSy6jg2SwRwzIA=
+google.golang.org/genproto v0.0.0-20260316180232-0b37fe3546d5 h1:JNfk58HZ8lfmXbYK2vx/UvsqIL59TzByCxPIX4TDmsE=
+google.golang.org/genproto v0.0.0-20260316180232-0b37fe3546d5/go.mod h1:x5julN69+ED4PcFk/XWayw35O0lf/nGa4aNgODCmNmw=
+google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d h1:/aDRtSZJjyLQzm75d+a1wOJaqyKBMvIAfeQmoa3ORiI=
+google.golang.org/genproto/googleapis/api v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:etfGUgejTiadZAUaEP14NP97xi1RGeawqkjDARA/UOs=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d h1:wT2n40TBqFY6wiwazVK9/iTWbsQrgk5ZfCSVFLO9LQA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260406210006-6f92a3bedf2d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
+google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 h1:F29+wU6Ee6qgu9TddPgooOdaqsxTMunOoj8KA5yuS5A=
 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1/go.mod h1:5KF+wpkbTSbGcR9zteSqZV6fqFOWBl4Yde8En8MryZA=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=

internal/filesystems/filesystems_test.go

@@ -1,173 +0,0 @@
-package filesystems
-
-import (
-	"io/fs"
-	"testing"
-	"testing/fstest"
-)
-
-func TestFileSystemMapDefaultKey(t *testing.T) {
-	m := &FileSystemMap{}
-
-	// Empty key should map to default
-	if m.key("") != DefaultFileSystemKey {
-		t.Errorf("empty key should map to %q, got %q", DefaultFileSystemKey, m.key(""))
-	}
-
-	// Non-empty key should be returned as-is
-	if m.key("custom") != "custom" {
-		t.Errorf("non-empty key should be returned as-is, got %q", m.key("custom"))
-	}
-}
-
-func TestFileSystemMapRegisterAndGet(t *testing.T) {
-	m := &FileSystemMap{}
-	testFS := fstest.MapFS{
-		"hello.txt": &fstest.MapFile{Data: []byte("hello")},
-	}
-
-	m.Register("test", testFS)
-
-	got, ok := m.Get("test")
-	if !ok {
-		t.Fatal("expected to find registered filesystem")
-	}
-	if got == nil {
-		t.Fatal("expected non-nil filesystem")
-	}
-
-	// Verify the filesystem works
-	f, err := got.Open("hello.txt")
-	if err != nil {
-		t.Fatalf("Open() error = %v", err)
-	}
-	f.Close()
-}
-
-func TestFileSystemMapGetNonExistent(t *testing.T) {
-	m := &FileSystemMap{}
-
-	_, ok := m.Get("nonexistent")
-	if ok {
-		t.Error("expected Get to return false for nonexistent key")
-	}
-}
-
-func TestFileSystemMapDefault(t *testing.T) {
-	m := &FileSystemMap{}
-
-	d := m.Default()
-	if d == nil {
-		t.Fatal("Default() should never return nil")
-	}
-}
-
-func TestFileSystemMapGetDefaultLazyInit(t *testing.T) {
-	m := &FileSystemMap{}
-
-	// Getting the default key before any registration should
-	// auto-initialize to DefaultFileSystem
-	got, ok := m.Get(DefaultFileSystemKey)
-	if !ok {
-		t.Fatal("expected default filesystem to be auto-initialized")
-	}
-	if got == nil {
-		t.Fatal("expected non-nil default filesystem")
-	}
-}
-
-func TestFileSystemMapUnregister(t *testing.T) {
-	m := &FileSystemMap{}
-	testFS := fstest.MapFS{}
-
-	m.Register("test", testFS)
-	m.Unregister("test")
-
-	_, ok := m.Get("test")
-	if ok {
-		t.Error("expected filesystem to be unregistered")
-	}
-}
-
-func TestFileSystemMapUnregisterDefault(t *testing.T) {
-	m := &FileSystemMap{}
-	customFS := fstest.MapFS{}
-
-	// Override default
-	m.Register("", customFS)
-	// Unregister default should reset to OsFS, not delete
-	m.Unregister("")
-
-	d := m.Default()
-	if d == nil {
-		t.Fatal("unregistering default should reset it, not delete it")
-	}
-}
-
-func TestFileSystemMapRegisterNil(t *testing.T) {
-	m := &FileSystemMap{}
-	testFS := fstest.MapFS{}
-
-	// Register then register nil (should unregister)
-	m.Register("test", testFS)
-	m.Register("test", nil)
-
-	_, ok := m.Get("test")
-	if ok {
-		t.Error("registering nil should unregister the filesystem")
-	}
-}
-
-func TestFileSystemMapEmptyKeyIsDefault(t *testing.T) {
-	m := &FileSystemMap{}
-	testFS := fstest.MapFS{
-		"test.txt": &fstest.MapFile{Data: []byte("test")},
-	}
-
-	// Register with empty key should register as default
-	m.Register("", testFS)
-
-	got, ok := m.Get("")
-	if !ok {
-		t.Fatal("expected to find filesystem registered with empty key")
-	}
-
-	// Should also be accessible via default key
-	got2, ok := m.Get(DefaultFileSystemKey)
-	if !ok {
-		t.Fatal("expected to find filesystem via default key")
-	}
-
-	// Both should work
-	if got == nil || got2 == nil {
-		t.Fatal("expected non-nil filesystems")
-	}
-}
-
-func TestFileSystemMapGetTrimsWhitespace(t *testing.T) {
-	m := &FileSystemMap{}
-	testFS := fstest.MapFS{}
-
-	m.Register("test", testFS)
-
-	// Get with whitespace-padded key should match
-	got, ok := m.Get("test ")
-	if !ok {
-		t.Fatal("expected Get to trim whitespace from key")
-	}
-	if got == nil {
-		t.Fatal("expected non-nil filesystem")
-	}
-}
-
-func TestOsFSInterfaces(t *testing.T) {
-	var osFS OsFS
-
-	// Verify interface compliance at compile time (already done with var _ checks)
-	// but test that the methods exist and are callable
-	var _ fs.FS = osFS
-	var _ fs.StatFS = osFS
-	var _ fs.GlobFS = osFS
-	var _ fs.ReadDirFS = osFS
-	var _ fs.ReadFileFS = osFS
-}

internal/logbuffer_test.go

@@ -1,147 +0,0 @@
-package internal
-
-import (
-	"testing"
-
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"go.uber.org/zap/zaptest/observer"
-)
-
-func TestLogBufferCoreEnabled(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-
-	if !core.Enabled(zapcore.InfoLevel) {
-		t.Error("expected InfoLevel to be enabled")
-	}
-	if !core.Enabled(zapcore.ErrorLevel) {
-		t.Error("expected ErrorLevel to be enabled")
-	}
-	if core.Enabled(zapcore.DebugLevel) {
-		t.Error("expected DebugLevel to be disabled")
-	}
-}
-
-func TestLogBufferCoreWriteAndFlush(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-
-	// Write entries
-	entry1 := zapcore.Entry{Level: zapcore.InfoLevel, Message: "message1"}
-	entry2 := zapcore.Entry{Level: zapcore.WarnLevel, Message: "message2"}
-
-	if err := core.Write(entry1, []zapcore.Field{zap.String("key1", "val1")}); err != nil {
-		t.Fatalf("Write() error = %v", err)
-	}
-	if err := core.Write(entry2, []zapcore.Field{zap.String("key2", "val2")}); err != nil {
-		t.Fatalf("Write() error = %v", err)
-	}
-
-	// Verify entries are buffered
-	if len(core.entries) != 2 {
-		t.Errorf("expected 2 entries, got %d", len(core.entries))
-	}
-	if len(core.fields) != 2 {
-		t.Errorf("expected 2 field sets, got %d", len(core.fields))
-	}
-
-	// Set up an observed logger to capture flushed entries
-	observedCore, logs := observer.New(zapcore.InfoLevel)
-	logger := zap.New(observedCore)
-
-	core.FlushTo(logger)
-
-	// Verify entries were flushed
-	if logs.Len() != 2 {
-		t.Errorf("expected 2 flushed log entries, got %d", logs.Len())
-	}
-
-	// Verify buffer is cleared after flush
-	if len(core.entries) != 0 {
-		t.Errorf("expected entries to be cleared after flush, got %d", len(core.entries))
-	}
-	if len(core.fields) != 0 {
-		t.Errorf("expected fields to be cleared after flush, got %d", len(core.fields))
-	}
-}
-
-func TestLogBufferCoreSync(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-	if err := core.Sync(); err != nil {
-		t.Errorf("Sync() error = %v", err)
-	}
-}
-
-func TestLogBufferCoreWith(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-
-	// With() currently returns the same core (known limitation)
-	result := core.With([]zapcore.Field{zap.String("test", "val")})
-	if result != core {
-		t.Error("With() should return the same core instance")
-	}
-}
-
-func TestLogBufferCoreCheck(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-
-	// Check for enabled level should add core
-	entry := zapcore.Entry{Level: zapcore.InfoLevel, Message: "test"}
-	ce := &zapcore.CheckedEntry{}
-	result := core.Check(entry, ce)
-	if result == nil {
-		t.Error("Check() should return non-nil for enabled level")
-	}
-
-	// Check for disabled level should not add core
-	debugEntry := zapcore.Entry{Level: zapcore.DebugLevel, Message: "test"}
-	ce2 := &zapcore.CheckedEntry{}
-	result2 := core.Check(debugEntry, ce2)
-	// The ce2 should be returned unchanged (no core added)
-	if result2 != ce2 {
-		t.Error("Check() should return unchanged CheckedEntry for disabled level")
-	}
-}
-
-func TestLogBufferCoreEmptyFlush(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-
-	// Flushing with no entries should not panic
-	observedCore, logs := observer.New(zapcore.InfoLevel)
-	logger := zap.New(observedCore)
-
-	core.FlushTo(logger)
-
-	if logs.Len() != 0 {
-		t.Errorf("expected 0 flushed entries for empty buffer, got %d", logs.Len())
-	}
-}
-
-func TestLogBufferCoreConcurrentWrites(t *testing.T) {
-	core := NewLogBufferCore(zapcore.InfoLevel)
-
-	done := make(chan struct{})
-	const numWriters = 10
-	const numWrites = 100
-
-	for i := 0; i < numWriters; i++ {
-		go func() {
-			defer func() { done <- struct{}{} }()
-			for j := 0; j < numWrites; j++ {
-				entry := zapcore.Entry{Level: zapcore.InfoLevel, Message: "concurrent"}
-				_ = core.Write(entry, nil)
-			}
-		}()
-	}
-
-	for i := 0; i < numWriters; i++ {
-		<-done
-	}
-
-	core.mu.Lock()
-	count := len(core.entries)
-	core.mu.Unlock()
-
-	if count != numWriters*numWrites {
-		t.Errorf("expected %d entries, got %d", numWriters*numWrites, count)
-	}
-}

internal/logmarshalers.go

@@ -1,54 +0,0 @@
-package internal
-
-import (
-	"net/http"
-	"strings"
-
-	"go.uber.org/zap/zapcore"
-)
-
-// LoggableHTTPHeader makes an HTTP header loggable with zap.Object().
-// Headers with potentially sensitive information (Cookie, Set-Cookie,
-// Authorization, and Proxy-Authorization) are logged with empty values.
-type LoggableHTTPHeader struct {
-	http.Header
-
-	ShouldLogCredentials bool
-}
-
-// MarshalLogObject satisfies the zapcore.ObjectMarshaler interface.
-func (h LoggableHTTPHeader) MarshalLogObject(enc zapcore.ObjectEncoder) error {
-	if h.Header == nil {
-		return nil
-	}
-	for key, val := range h.Header {
-		if !h.ShouldLogCredentials {
-			switch strings.ToLower(key) {
-			case "cookie", "set-cookie", "authorization", "proxy-authorization":
-				val = []string{"REDACTED"} // see #5669. I still think ▒▒▒▒ would be cool.
-			}
-		}
-		enc.AddArray(key, LoggableStringArray(val))
-	}
-	return nil
-}
-
-// LoggableStringArray makes a slice of strings marshalable for logging.
-type LoggableStringArray []string
-
-// MarshalLogArray satisfies the zapcore.ArrayMarshaler interface.
-func (sa LoggableStringArray) MarshalLogArray(enc zapcore.ArrayEncoder) error {
-	if sa == nil {
-		return nil
-	}
-	for _, s := range sa {
-		enc.AppendString(s)
-	}
-	return nil
-}
-
-// Interface guards
-var (
-	_ zapcore.ObjectMarshaler = (*LoggableHTTPHeader)(nil)
-	_ zapcore.ArrayMarshaler  = (*LoggableStringArray)(nil)
-)

internal/metrics/metrics_test.go

@@ -17,37 +17,6 @@ func TestSanitizeMethod(t *testing.T) {
 		{method: "trace", expected: "TRACE"},
 		{method: "UNKNOWN", expected: "OTHER"},
 		{method: strings.Repeat("ohno", 9999), expected: "OTHER"},
-
-		// Test all standard HTTP methods in uppercase
-		{method: "GET", expected: "GET"},
-		{method: "HEAD", expected: "HEAD"},
-		{method: "POST", expected: "POST"},
-		{method: "PUT", expected: "PUT"},
-		{method: "DELETE", expected: "DELETE"},
-		{method: "CONNECT", expected: "CONNECT"},
-		{method: "OPTIONS", expected: "OPTIONS"},
-		{method: "TRACE", expected: "TRACE"},
-		{method: "PATCH", expected: "PATCH"},
-
-		// Test all standard HTTP methods in lowercase
-		{method: "get", expected: "GET"},
-		{method: "head", expected: "HEAD"},
-		{method: "post", expected: "POST"},
-		{method: "put", expected: "PUT"},
-		{method: "delete", expected: "DELETE"},
-		{method: "connect", expected: "CONNECT"},
-		{method: "options", expected: "OPTIONS"},
-		{method: "trace", expected: "TRACE"},
-		{method: "patch", expected: "PATCH"},
-
-		// Test mixed case and non-standard methods
-		{method: "Get", expected: "OTHER"},
-		{method: "gEt", expected: "OTHER"},
-		{method: "UNKNOWN", expected: "OTHER"},
-		{method: "PROPFIND", expected: "OTHER"},
-		{method: "MKCOL", expected: "OTHER"},
-		{method: "", expected: "OTHER"},
-		{method: " ", expected: "OTHER"},
 	}
 
 	for _, d := range tests {
@@ -57,79 +26,3 @@ func TestSanitizeMethod(t *testing.T) {
 		}
 	}
 }
-
-func TestSanitizeCode(t *testing.T) {
-	tests := []struct {
-		name     string
-		code     int
-		expected string
-	}{
-		{
-			name:     "zero returns 200",
-			code:     0,
-			expected: "200",
-		},
-		{
-			name:     "200 returns 200",
-			code:     200,
-			expected: "200",
-		},
-		{
-			name:     "404 returns 404",
-			code:     404,
-			expected: "404",
-		},
-		{
-			name:     "500 returns 500",
-			code:     500,
-			expected: "500",
-		},
-		{
-			name:     "301 returns 301",
-			code:     301,
-			expected: "301",
-		},
-		{
-			name:     "418 teapot returns 418",
-			code:     418,
-			expected: "418",
-		},
-		{
-			name:     "999 custom code",
-			code:     999,
-			expected: "999",
-		},
-		{
-			name:     "negative code",
-			code:     -1,
-			expected: "-1",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := SanitizeCode(tt.code)
-			if result != tt.expected {
-				t.Errorf("SanitizeCode(%d) = %s; want %s", tt.code, result, tt.expected)
-			}
-		})
-	}
-}
-
-// BenchmarkSanitizeCode benchmarks the SanitizeCode function
-func BenchmarkSanitizeCode(b *testing.B) {
-	codes := []int{0, 200, 404, 500, 301, 418}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		SanitizeCode(codes[i%len(codes)])
-	}
-}
-
-// BenchmarkSanitizeMethod benchmarks the SanitizeMethod function
-func BenchmarkSanitizeMethod(b *testing.B) {
-	methods := []string{"GET", "POST", "PUT", "DELETE", "UNKNOWN"}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		SanitizeMethod(methods[i%len(methods)])
-	}
-}

internal/ranges_test.go

@@ -1,125 +0,0 @@
-package internal
-
-import (
-	"testing"
-)
-
-func TestPrivateRangesCIDR(t *testing.T) {
-	ranges := PrivateRangesCIDR()
-
-	// Should include standard private IP ranges
-	expected := map[string]bool{
-		"192.168.0.0/16": false,
-		"172.16.0.0/12":  false,
-		"10.0.0.0/8":     false,
-		"127.0.0.1/8":    false,
-		"fd00::/8":       false,
-		"::1":            false,
-	}
-
-	for _, r := range ranges {
-		if _, ok := expected[r]; ok {
-			expected[r] = true
-		}
-	}
-
-	for cidr, found := range expected {
-		if !found {
-			t.Errorf("expected private range %q not found in PrivateRangesCIDR()", cidr)
-		}
-	}
-
-	if len(ranges) < 6 {
-		t.Errorf("expected at least 6 private ranges, got %d", len(ranges))
-	}
-}
-
-func TestMaxSizeSubjectsListForLog(t *testing.T) {
-	tests := []struct {
-		name         string
-		subjects     map[string]struct{}
-		maxToDisplay int
-		wantLen      int
-		wantSuffix   bool // whether "(and N more...)" is expected
-	}{
-		{
-			name:         "empty map",
-			subjects:     map[string]struct{}{},
-			maxToDisplay: 5,
-			wantLen:      0,
-			wantSuffix:   false,
-		},
-		{
-			name: "fewer than max",
-			subjects: map[string]struct{}{
-				"example.com": {},
-				"example.org": {},
-			},
-			maxToDisplay: 5,
-			wantLen:      2,
-			wantSuffix:   false,
-		},
-		{
-			name: "equal to max",
-			subjects: map[string]struct{}{
-				"a.com": {},
-				"b.com": {},
-				"c.com": {},
-			},
-			maxToDisplay: 3,
-			wantLen:      3,
-			wantSuffix:   false,
-		},
-		{
-			name: "more than max",
-			subjects: map[string]struct{}{
-				"a.com": {},
-				"b.com": {},
-				"c.com": {},
-				"d.com": {},
-				"e.com": {},
-			},
-			maxToDisplay: 2,
-			wantLen:      3, // 2 domains + suffix
-			wantSuffix:   true,
-		},
-		{
-			name: "max is zero",
-			subjects: map[string]struct{}{
-				"a.com": {},
-				"b.com": {},
-			},
-			maxToDisplay: 0,
-			// BUG: When maxToDisplay is 0, code still appends one domain
-			// because append happens before the break check in the loop.
-			// Expected behavior: 1 item (just suffix). Actual: 2 items
-			// (1 leaked domain + suffix).
-			wantLen:    2,
-			wantSuffix: true,
-		},
-		{
-			name: "single subject with max 1",
-			subjects: map[string]struct{}{
-				"example.com": {},
-			},
-			maxToDisplay: 1,
-			wantLen:      1,
-			wantSuffix:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := MaxSizeSubjectsListForLog(tt.subjects, tt.maxToDisplay)
-			if len(result) != tt.wantLen {
-				t.Errorf("MaxSizeSubjectsListForLog() returned %d items, want %d; got: %v", len(result), tt.wantLen, result)
-			}
-			if tt.wantSuffix {
-				last := result[len(result)-1]
-				if len(last) < 4 || last[:4] != "(and" {
-					t.Errorf("expected suffix '(and N more...)' but got %q", last)
-				}
-			}
-		})
-	}
-}

internal/sockets_test.go

@@ -1,146 +0,0 @@
-package internal
-
-import (
-	"io/fs"
-	"testing"
-)
-
-func TestSplitUnixSocketPermissionsBits(t *testing.T) {
-	tests := []struct {
-		name         string
-		input        string
-		wantPath     string
-		wantFileMode fs.FileMode
-		wantErr      bool
-	}{
-		{
-			name:         "no permission bits defaults to 0200",
-			input:        "/run/caddy.sock",
-			wantPath:     "/run/caddy.sock",
-			wantFileMode: 0o200,
-			wantErr:      false,
-		},
-		{
-			name:         "valid permission 0222",
-			input:        "/run/caddy.sock|0222",
-			wantPath:     "/run/caddy.sock",
-			wantFileMode: 0o222,
-			wantErr:      false,
-		},
-		{
-			name:         "valid permission 0200",
-			input:        "/run/caddy.sock|0200",
-			wantPath:     "/run/caddy.sock",
-			wantFileMode: 0o200,
-			wantErr:      false,
-		},
-		{
-			name:         "valid permission 0777",
-			input:        "/run/caddy.sock|0777",
-			wantPath:     "/run/caddy.sock",
-			wantFileMode: 0o777,
-			wantErr:      false,
-		},
-		{
-			name:         "valid permission 0755",
-			input:        "/run/caddy.sock|0755",
-			wantPath:     "/run/caddy.sock",
-			wantFileMode: 0o755,
-			wantErr:      false,
-		},
-		{
-			name:         "valid permission 0666",
-			input:        "/tmp/test.sock|0666",
-			wantPath:     "/tmp/test.sock",
-			wantFileMode: 0o666,
-			wantErr:      false,
-		},
-		{
-			name:    "missing owner write permission 0444",
-			input:   "/run/caddy.sock|0444",
-			wantErr: true,
-		},
-		{
-			name:    "missing owner write permission 0044",
-			input:   "/run/caddy.sock|0044",
-			wantErr: true,
-		},
-		{
-			name:    "missing owner write permission 0100",
-			input:   "/run/caddy.sock|0100",
-			wantErr: true,
-		},
-		{
-			name:    "missing owner write permission 0500",
-			input:   "/run/caddy.sock|0500",
-			wantErr: true,
-		},
-		{
-			name:    "invalid octal digits",
-			input:   "/run/caddy.sock|09ab",
-			wantErr: true,
-		},
-		{
-			name:    "invalid non-numeric permission",
-			input:   "/run/caddy.sock|rwxrwxrwx",
-			wantErr: true,
-		},
-		{
-			name:    "empty permission string",
-			input:   "/run/caddy.sock|",
-			wantErr: true,
-		},
-		{
-			name:         "multiple pipes only splits on first",
-			input:        "/run/caddy|sock|0222",
-			wantPath:     "/run/caddy",
-			wantFileMode: 0, // "sock|0222" is not valid octal
-			wantErr:      true,
-		},
-		{
-			name:         "empty path with valid permission",
-			input:        "|0222",
-			wantPath:     "",
-			wantFileMode: 0o222,
-			wantErr:      false,
-		},
-		{
-			name:         "path only with no pipe",
-			input:        "/var/run/my-app.sock",
-			wantPath:     "/var/run/my-app.sock",
-			wantFileMode: 0o200,
-			wantErr:      false,
-		},
-		{
-			name:         "permission 0300 has write bit",
-			input:        "/run/caddy.sock|0300",
-			wantPath:     "/run/caddy.sock",
-			wantFileMode: 0o300,
-			wantErr:      false,
-		},
-		{
-			name:    "permission 0422 missing owner write",
-			input:   "/run/caddy.sock|0422",
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotPath, gotMode, err := SplitUnixSocketPermissionsBits(tt.input)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("SplitUnixSocketPermissionsBits(%q) error = %v, wantErr %v", tt.input, err, tt.wantErr)
-				return
-			}
-			if err != nil {
-				return
-			}
-			if gotPath != tt.wantPath {
-				t.Errorf("SplitUnixSocketPermissionsBits(%q) path = %q, want %q", tt.input, gotPath, tt.wantPath)
-			}
-			if gotMode != tt.wantFileMode {
-				t.Errorf("SplitUnixSocketPermissionsBits(%q) mode = %04o, want %04o", tt.input, gotMode, tt.wantFileMode)
-			}
-		})
-	}
-}

listen.go

@@ -30,6 +30,10 @@ import (
 	"go.uber.org/zap"
 )
 
+func reuseUnixSocket(_, _ string) (any, error) {
+	return nil, nil
+}
+
 func listenReusable(ctx context.Context, lnKey string, network, address string, config net.ListenConfig) (any, error) {
 	var socketFile *os.File
 
@@ -116,8 +120,8 @@ func listenReusable(ctx context.Context, lnKey string, network, address string,
 // re-wrapped in a new fakeCloseListener each time the listener
 // is reused. This type is atomic and values must not be copied.
 type fakeCloseListener struct {
-	closed          atomic.Bool
-	*sharedListener // embedded, so we also become a net.Listener
+	closed          int32 // accessed atomically; belongs to this struct only
+	*sharedListener       // embedded, so we also become a net.Listener
 	keepAliveConfig net.KeepAliveConfig
 }
 
@@ -127,7 +131,7 @@ type canSetKeepAliveConfig interface {
 
 func (fcl *fakeCloseListener) Accept() (net.Conn, error) {
 	// if the listener is already "closed", return error
-	if fcl.closed.Load() {
+	if atomic.LoadInt32(&fcl.closed) == 1 {
 		return nil, fakeClosedErr(fcl)
 	}
 
@@ -151,7 +155,7 @@ func (fcl *fakeCloseListener) Accept() (net.Conn, error) {
 	// that we set when Close() was called, and return a non-temporary and
 	// non-timeout error value to the caller, masking the "true" error, so
 	// that server loops / goroutines won't retry, linger, and leak
-	if fcl.closed.Load() {
+	if atomic.LoadInt32(&fcl.closed) == 1 {
 		// we dereference the sharedListener explicitly even though it's embedded
 		// so that it's clear in the code that side-effects are shared with other
 		// users of this listener, not just our own reference to it; we also don't
@@ -171,7 +175,7 @@ func (fcl *fakeCloseListener) Accept() (net.Conn, error) {
 // underlying listener. The underlying listener is only closed
 // if the caller is the last known user of the socket.
 func (fcl *fakeCloseListener) Close() error {
-	if fcl.closed.CompareAndSwap(false, true) {
+	if atomic.CompareAndSwapInt32(&fcl.closed, 0, 1) {
 		// There are two ways I know of to get an Accept()
 		// function to return to the server loop that called
 		// it: close the listener, or set a deadline in the
@@ -234,13 +238,13 @@ func (sl *sharedListener) Destruct() error {
 // fakeClosePacketConn is like fakeCloseListener, but for PacketConns,
 // or more specifically, *net.UDPConn
 type fakeClosePacketConn struct {
-	closed            atomic.Bool
-	*sharedPacketConn // embedded, so we also become a net.PacketConn; its key is used in Close
+	closed            int32 // accessed atomically; belongs to this struct only
+	*sharedPacketConn       // embedded, so we also become a net.PacketConn; its key is used in Close
 }
 
 func (fcpc *fakeClosePacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
 	// if the listener is already "closed", return error
-	if fcpc.closed.Load() {
+	if atomic.LoadInt32(&fcpc.closed) == 1 {
 		return 0, nil, &net.OpError{
 			Op:   "readfrom",
 			Net:  fcpc.LocalAddr().Network(),
@@ -254,7 +258,7 @@ func (fcpc *fakeClosePacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err e
 	if err != nil {
 		// this server was stopped, so clear the deadline and let
 		// any new server continue reading; but we will exit
-		if fcpc.closed.Load() {
+		if atomic.LoadInt32(&fcpc.closed) == 1 {
 			if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
 				if err = fcpc.SetReadDeadline(time.Time{}); err != nil {
 					return n, addr, err
@@ -269,7 +273,7 @@ func (fcpc *fakeClosePacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err e
 
 // Close won't close the underlying socket unless there is no more reference, then listenerPool will close it.
 func (fcpc *fakeClosePacketConn) Close() error {
-	if fcpc.closed.CompareAndSwap(false, true) {
+	if atomic.CompareAndSwapInt32(&fcpc.closed, 0, 1) {
 		_ = fcpc.SetReadDeadline(time.Now()) // unblock ReadFrom() calls to kick old servers out of their loops
 		_, _ = listenerPool.Delete(fcpc.sharedPacketConn.key)
 	}

listen_reuseUnixSocket.go

@@ -1,21 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build (!unix || solaris) && !windows
-
-package caddy
-
-func reuseUnixSocket(_, _ string) (any, error) {
-	return nil, nil
-}

listen_reuseUnixSocket_windows.go

@@ -1,89 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//go:build windows
-
-package caddy
-
-import (
-	"errors"
-	"fmt"
-	"io/fs"
-	"net"
-	"os"
-	"strings"
-	"syscall"
-	"time"
-)
-
-var errUnixSocketAlreadyInUse = errors.New("unix socket is already in use by another process")
-
-func reuseUnixSocket(network, addr string) (any, error) {
-	if !IsUnixNetwork(network) {
-		return nil, nil
-	}
-
-	// Note: This is here mainly for proper compatibility, because Unix sockets with abstract names are in an interesting limbo state on Windows:
-	// Go already translates `@` characters to `\0` for Windows: https://github.com/golang/go/blob/65d5c5f6dd8aa7b221cff6ec3f5101ea2e5f3efa/src/syscall/syscall_windows.go#L910
-	// ...but there still is an open issue about the fact that this is not properly supported: https://github.com/microsoft/WSL/issues/4240#issuecomment-620805115
-	// The main issue is that the original announcement proclaimed support for this feature, but it was (apparently) never implemented: https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/
-	isAbstractUnixSocket := strings.HasPrefix(addr, "@")
-
-	if isAbstractUnixSocket {
-		// Abstract Unix sockets do not require us to remove stale socket files.
-		return nil, nil
-	}
-
-	// On Windows, we're using the `fakeCloseListener` wrappers around a single, ever-living listener.
-	// So, if there's an active listener entry in the pool, we're the current owner of the Unix socket file.
-	_, socketBelongsToCurrentProcess := listenerPool.References(listenerKey(network, addr))
-
-	if socketBelongsToCurrentProcess {
-		// Reuse/cleanup is entirely handled by the refcounting mechanism in `listenerPool`.
-		return nil, nil
-	}
-
-	// If the socket file does not exist or has no backing server process, this will fail instantly.
-	connection, err := net.DialTimeout("unix", addr, 10*time.Millisecond)
-
-	if err == nil {
-		connection.Close()
-		return nil, fmt.Errorf("cannot reuse socket %v: %w", addr, errUnixSocketAlreadyInUse)
-	}
-
-	// Windows returns this error code both if the socket file does not exist and if it isn't backed by a server process anymore.
-	// See: https://learn.microsoft.com/en-us/windows/win32/winsock/windows-sockets-error-codes-2#wsaeconnrefused
-	const WSAECONNREFUSED syscall.Errno = 10061
-
-	var errno syscall.Errno
-	hasNoListeningServerProcess := errors.As(err, &errno) && errno == WSAECONNREFUSED
-
-	if !hasNoListeningServerProcess {
-		return nil, fmt.Errorf("cannot reuse socket %v: %w", addr, errUnixSocketAlreadyInUse)
-	}
-
-	// If the socket file exists, it hasn't been created by our process, and it seemingly
-	// isn't backed by a server process anymore. Try to delete it so we can bind to it later.
-	err = os.Remove(addr)
-
-	if err == nil {
-		return nil, nil
-	} else if errors.Is(err, fs.ErrNotExist) {
-		// Either the file didn't exist in the first place, or it was deleted before we were able to.
-		return nil, nil
-	} else {
-		// We failed to delete the file. Likely, it belongs to another (active) process.
-		return nil, err
-	}
-}

listen_unix.go

@@ -63,7 +63,7 @@ func reuseUnixSocket(network, addr string) (any, error) {
 			if err != nil {
 				return nil, err
 			}
-			unixSocket.count.Add(1)
+			atomic.AddInt32(unixSocket.count, 1)
 			unixSockets[socketKey] = &unixListener{ln.(*net.UnixListener), socketKey, unixSocket.count}
 
 		case *unixConn:
@@ -71,7 +71,7 @@ func reuseUnixSocket(network, addr string) (any, error) {
 			if err != nil {
 				return nil, err
 			}
-			unixSocket.count.Add(1)
+			atomic.AddInt32(unixSocket.count, 1)
 			unixSockets[socketKey] = &unixConn{pc.(*net.UnixConn), socketKey, unixSocket.count}
 		}
 
@@ -165,9 +165,8 @@ func listenReusable(ctx context.Context, lnKey string, network, address string,
 		if !fd {
 			// TODO: Not 100% sure this is necessary, but we do this for net.UnixListener, so...
 			if unix, ok := ln.(*net.UnixConn); ok {
-				cnt := new(atomic.Int32)
-				cnt.Store(1)
-				ln = &unixConn{unix, lnKey, cnt}
+				one := int32(1)
+				ln = &unixConn{unix, lnKey, &one}
 				unixSockets[lnKey] = ln.(*unixConn)
 			}
 		}
@@ -182,9 +181,8 @@ func listenReusable(ctx context.Context, lnKey string, network, address string,
 			// (we do our own "unlink on close" -- not required, but more tidy)
 			if unix, ok := ln.(*net.UnixListener); ok {
 				unix.SetUnlinkOnClose(false)
-				cnt := new(atomic.Int32)
-				cnt.Store(1)
-				ln = &unixListener{unix, lnKey, cnt}
+				one := int32(1)
+				ln = &unixListener{unix, lnKey, &one}
 				unixSockets[lnKey] = ln.(*unixListener)
 			}
 		}
@@ -218,11 +216,11 @@ func reusePort(network, address string, conn syscall.RawConn) error {
 type unixListener struct {
 	*net.UnixListener
 	mapKey string
-	count  *atomic.Int32
+	count  *int32 // accessed atomically
 }
 
 func (uln *unixListener) Close() error {
-	newCount := uln.count.Add(-1)
+	newCount := atomic.AddInt32(uln.count, -1)
 	if newCount == 0 {
 		file, err := uln.File()
 		var name string
@@ -244,11 +242,11 @@ func (uln *unixListener) Close() error {
 type unixConn struct {
 	*net.UnixConn
 	mapKey string
-	count  *atomic.Int32
+	count  *int32 // accessed atomically
 }
 
 func (uc *unixConn) Close() error {
-	newCount := uc.count.Add(-1)
+	newCount := atomic.AddInt32(uc.count, -1)
 	if newCount == 0 {
 		file, err := uc.File()
 		var name string

listeners.go

@@ -361,7 +361,7 @@ func ParseNetworkAddressWithDefaults(addr, defaultNetwork string, defaultPort ui
 		if end < start {
 			return NetworkAddress{}, fmt.Errorf("end port must not be less than start port")
 		}
-		if (end-start)+1 > maxPortSpan {
+		if (end - start) > maxPortSpan {
 			return NetworkAddress{}, fmt.Errorf("port range exceeds %d ports", maxPortSpan)
 		}
 	}
@@ -462,10 +462,7 @@ func (na NetworkAddress) ListenQUIC(ctx context.Context, portOffset uint, config
 		sqs := newSharedQUICState(tlsConf)
 		// http3.ConfigureTLSConfig only uses this field and tls App sets this field as well
 		//nolint:gosec
-		quicTlsConfig := &tls.Config{
-			GetConfigForClient:          sqs.getConfigForClient,
-			GetEncryptedClientHelloKeys: sqs.getEncryptedClientHelloKeys,
-		}
+		quicTlsConfig := &tls.Config{GetConfigForClient: sqs.getConfigForClient}
 		// Require clients to verify their source address when we're handling more than 1000 handshakes per second.
 		// TODO: make tunable?
 		limiter := rate.NewLimiter(1000, 1000)
@@ -543,16 +540,6 @@ func (sqs *sharedQUICState) getConfigForClient(ch *tls.ClientHelloInfo) (*tls.Co
 	return sqs.activeTlsConf.GetConfigForClient(ch)
 }
 
-// getEncryptedClientHelloKeys is used as tls.Config's GetEncryptedClientHelloKeys field.
-func (sqs *sharedQUICState) getEncryptedClientHelloKeys(ch *tls.ClientHelloInfo) ([]tls.EncryptedClientHelloKey, error) {
-	sqs.rmu.RLock()
-	defer sqs.rmu.RUnlock()
-	if sqs.activeTlsConf.GetEncryptedClientHelloKeys == nil {
-		return nil, nil
-	}
-	return sqs.activeTlsConf.GetEncryptedClientHelloKeys(ch)
-}
-
 // addState adds tls.Config and activeRequests to the map if not present and returns the corresponding context and its cancelFunc
 // so that when cancelled, the active tls.Config will change
 func (sqs *sharedQUICState) addState(tlsConfig *tls.Config) (context.Context, context.CancelCauseFunc) {
@@ -624,8 +611,8 @@ func fakeClosedErr(l interface{ Addr() net.Addr }) error {
 var errFakeClosed = fmt.Errorf("QUIC listener 'closed' 😉")
 
 type fakeCloseQuicListener struct {
-	closed              atomic.Int32
-	*sharedQuicListener // embedded, so we also become a quic.EarlyListener
+	closed              int32 // accessed atomically; belongs to this struct only
+	*sharedQuicListener       // embedded, so we also become a quic.EarlyListener
 	context             context.Context
 	contextCancel       context.CancelCauseFunc
 }
@@ -642,16 +629,16 @@ func (fcql *fakeCloseQuicListener) Accept(_ context.Context) (*quic.Conn, error)
 	}
 
 	// if the listener is "closed", return a fake closed error instead
-	if fcql.closed.Load() == 1 && errors.Is(err, context.Canceled) {
+	if atomic.LoadInt32(&fcql.closed) == 1 && errors.Is(err, context.Canceled) {
 		return nil, fakeClosedErr(fcql)
 	}
 	return nil, err
 }
 
 func (fcql *fakeCloseQuicListener) Close() error {
-	if fcql.closed.CompareAndSwap(0, 1) {
+	if atomic.CompareAndSwapInt32(&fcql.closed, 0, 1) {
 		fcql.contextCancel(errFakeClosed)
-	} else if fcql.closed.CompareAndSwap(1, 2) {
+	} else if atomic.CompareAndSwapInt32(&fcql.closed, 1, 2) {
 		_, _ = listenerPool.Delete(fcql.sharedQuicListener.key)
 	}
 	return nil

listeners_test.go

@@ -15,7 +15,6 @@
 package caddy
 
 import (
-	"crypto/tls"
 	"reflect"
 	"testing"
 
@@ -176,63 +175,6 @@ func TestJoinNetworkAddress(t *testing.T) {
 	}
 }
 
-func TestSharedQUICStateGetEncryptedClientHelloKeys(t *testing.T) {
-	hello := &tls.ClientHelloInfo{ServerName: "example.com"}
-	initialKeys := []tls.EncryptedClientHelloKey{{Config: []byte("initial"), PrivateKey: []byte("initial-key")}}
-	updatedKeys := []tls.EncryptedClientHelloKey{{Config: []byte("updated"), PrivateKey: []byte("updated-key")}}
-
-	initialConfig := &tls.Config{
-		GetConfigForClient: func(*tls.ClientHelloInfo) (*tls.Config, error) {
-			return nil, nil
-		},
-		GetEncryptedClientHelloKeys: func(*tls.ClientHelloInfo) ([]tls.EncryptedClientHelloKey, error) {
-			return initialKeys, nil
-		},
-	}
-
-	sqs := newSharedQUICState(initialConfig)
-
-	keys, err := sqs.getEncryptedClientHelloKeys(hello)
-	if err != nil {
-		t.Fatalf("getting initial ECH keys: %v", err)
-	}
-	if !reflect.DeepEqual(keys, initialKeys) {
-		t.Fatalf("unexpected initial ECH keys: got %#v, want %#v", keys, initialKeys)
-	}
-
-	updatedConfig := &tls.Config{
-		GetConfigForClient: func(*tls.ClientHelloInfo) (*tls.Config, error) {
-			return nil, nil
-		},
-		GetEncryptedClientHelloKeys: func(*tls.ClientHelloInfo) ([]tls.EncryptedClientHelloKey, error) {
-			return updatedKeys, nil
-		},
-	}
-
-	_, cancel := sqs.addState(updatedConfig)
-	sqs.rmu.Lock()
-	sqs.activeTlsConf = updatedConfig
-	sqs.rmu.Unlock()
-
-	keys, err = sqs.getEncryptedClientHelloKeys(hello)
-	if err != nil {
-		t.Fatalf("getting updated ECH keys: %v", err)
-	}
-	if !reflect.DeepEqual(keys, updatedKeys) {
-		t.Fatalf("unexpected updated ECH keys: got %#v, want %#v", keys, updatedKeys)
-	}
-
-	cancel(nil)
-
-	keys, err = sqs.getEncryptedClientHelloKeys(hello)
-	if err != nil {
-		t.Fatalf("getting restored ECH keys: %v", err)
-	}
-	if !reflect.DeepEqual(keys, initialKeys) {
-		t.Fatalf("unexpected restored ECH keys: got %#v, want %#v", keys, initialKeys)
-	}
-}
-
 func TestParseNetworkAddress(t *testing.T) {
 	for i, tc := range []struct {
 		input          string

metrics_test.go

@@ -1,394 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	dto "github.com/prometheus/client_model/go"
-)
-
-func TestGlobalMetrics_ConfigSuccess(t *testing.T) {
-	// Test setting config success metric
-	originalValue := getMetricValue(globalMetrics.configSuccess)
-
-	// Set to success
-	globalMetrics.configSuccess.Set(1)
-	newValue := getMetricValue(globalMetrics.configSuccess)
-
-	if newValue != 1 {
-		t.Errorf("Expected config success metric to be 1, got %f", newValue)
-	}
-
-	// Set to failure
-	globalMetrics.configSuccess.Set(0)
-	failureValue := getMetricValue(globalMetrics.configSuccess)
-
-	if failureValue != 0 {
-		t.Errorf("Expected config success metric to be 0, got %f", failureValue)
-	}
-
-	// Restore original value if it existed
-	if originalValue != 0 {
-		globalMetrics.configSuccess.Set(originalValue)
-	}
-}
-
-func TestGlobalMetrics_ConfigSuccessTime(t *testing.T) {
-	// Set success time
-	globalMetrics.configSuccessTime.SetToCurrentTime()
-
-	// Get the metric value
-	metricValue := getMetricValue(globalMetrics.configSuccessTime)
-
-	// Should be a reasonable Unix timestamp (not zero)
-	if metricValue == 0 {
-		t.Error("Config success time should not be zero")
-	}
-
-	// Should be recent (within last minute)
-	now := time.Now().Unix()
-	if int64(metricValue) < now-60 || int64(metricValue) > now {
-		t.Errorf("Config success time %f should be recent (now: %d)", metricValue, now)
-	}
-}
-
-func TestAdminMetrics_RequestCount(t *testing.T) {
-	// Initialize admin metrics for testing
-	initAdminMetrics()
-
-	labels := prometheus.Labels{
-		"handler": "test",
-		"path":    "/config",
-		"method":  "GET",
-		"code":    "200",
-	}
-
-	// Get initial value
-	initialValue := getCounterValue(adminMetrics.requestCount, labels)
-
-	// Increment counter
-	adminMetrics.requestCount.With(labels).Inc()
-
-	// Verify increment
-	newValue := getCounterValue(adminMetrics.requestCount, labels)
-	if newValue != initialValue+1 {
-		t.Errorf("Expected counter to increment by 1, got %f -> %f", initialValue, newValue)
-	}
-}
-
-func TestAdminMetrics_RequestErrors(t *testing.T) {
-	// Initialize admin metrics for testing
-	initAdminMetrics()
-
-	labels := prometheus.Labels{
-		"handler": "test",
-		"path":    "/test",
-		"method":  "POST",
-	}
-
-	// Get initial value
-	initialValue := getCounterValue(adminMetrics.requestErrors, labels)
-
-	// Increment error counter
-	adminMetrics.requestErrors.With(labels).Inc()
-
-	// Verify increment
-	newValue := getCounterValue(adminMetrics.requestErrors, labels)
-	if newValue != initialValue+1 {
-		t.Errorf("Expected error counter to increment by 1, got %f -> %f", initialValue, newValue)
-	}
-}
-
-func TestMetrics_ConcurrentAccess(t *testing.T) {
-	// Initialize admin metrics
-	initAdminMetrics()
-
-	const numGoroutines = 100
-	const incrementsPerGoroutine = 10
-
-	var wg sync.WaitGroup
-
-	labels := prometheus.Labels{
-		"handler": "concurrent",
-		"path":    "/concurrent",
-		"method":  "GET",
-		"code":    "200",
-	}
-
-	initialCount := getCounterValue(adminMetrics.requestCount, labels)
-
-	// Concurrent increments
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			for j := 0; j < incrementsPerGoroutine; j++ {
-				adminMetrics.requestCount.With(labels).Inc()
-			}
-		}()
-	}
-
-	wg.Wait()
-
-	// Verify final count
-	finalCount := getCounterValue(adminMetrics.requestCount, labels)
-	expectedIncrement := float64(numGoroutines * incrementsPerGoroutine)
-
-	if finalCount-initialCount != expectedIncrement {
-		t.Errorf("Expected counter to increase by %f, got %f",
-			expectedIncrement, finalCount-initialCount)
-	}
-}
-
-func TestMetrics_LabelValidation(t *testing.T) {
-	// Test various label combinations
-	tests := []struct {
-		name   string
-		labels prometheus.Labels
-		metric string
-	}{
-		{
-			name: "valid request count labels",
-			labels: prometheus.Labels{
-				"handler": "test",
-				"path":    "/api/test",
-				"method":  "GET",
-				"code":    "200",
-			},
-			metric: "requestCount",
-		},
-		{
-			name: "valid error labels",
-			labels: prometheus.Labels{
-				"handler": "test",
-				"path":    "/api/error",
-				"method":  "POST",
-			},
-			metric: "requestErrors",
-		},
-		{
-			name: "empty path",
-			labels: prometheus.Labels{
-				"handler": "test",
-				"path":    "",
-				"method":  "GET",
-				"code":    "404",
-			},
-			metric: "requestCount",
-		},
-		{
-			name: "special characters in path",
-			labels: prometheus.Labels{
-				"handler": "test",
-				"path":    "/api/test%20with%20spaces",
-				"method":  "PUT",
-				"code":    "201",
-			},
-			metric: "requestCount",
-		},
-	}
-
-	initAdminMetrics()
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			// This should not panic or error
-			switch test.metric {
-			case "requestCount":
-				adminMetrics.requestCount.With(test.labels).Inc()
-			case "requestErrors":
-				adminMetrics.requestErrors.With(test.labels).Inc()
-			}
-		})
-	}
-}
-
-func TestMetrics_Initialization_Idempotent(t *testing.T) {
-	// Test that initializing admin metrics multiple times is safe
-	for i := 0; i < 5; i++ {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					t.Errorf("Iteration %d: initAdminMetrics panicked: %v", i, r)
-				}
-			}()
-			initAdminMetrics()
-		}()
-	}
-}
-
-func TestInstrumentHandlerCounter(t *testing.T) {
-	// Create a test counter with the expected labels
-	counter := prometheus.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "test_counter",
-			Help: "Test counter for instrumentation",
-		},
-		[]string{"code", "method"},
-	)
-
-	// Create instrumented handler
-	testHandler := instrumentHandlerCounter(
-		counter,
-		&mockHTTPHandler{statusCode: 200},
-	)
-
-	// Create test request
-	req := httptest.NewRequest("GET", "/test", nil)
-	rr := httptest.NewRecorder()
-
-	// Get initial counter value
-	initialValue := getCounterValue(counter, prometheus.Labels{"code": "200", "method": "GET"})
-
-	// Serve request
-	testHandler.ServeHTTP(rr, req)
-
-	// Verify counter was incremented
-	finalValue := getCounterValue(counter, prometheus.Labels{"code": "200", "method": "GET"})
-	if finalValue != initialValue+1 {
-		t.Errorf("Expected counter to increment by 1, got %f -> %f", initialValue, finalValue)
-	}
-}
-
-func TestInstrumentHandlerCounter_ErrorStatus(t *testing.T) {
-	counter := prometheus.NewCounterVec(
-		prometheus.CounterOpts{
-			Name: "test_error_counter",
-			Help: "Test counter for error status",
-		},
-		[]string{"code", "method"},
-	)
-
-	// Test different status codes
-	statusCodes := []int{200, 404, 500, 301, 401}
-
-	for _, status := range statusCodes {
-		t.Run(fmt.Sprintf("status_%d", status), func(t *testing.T) {
-			handler := instrumentHandlerCounter(
-				counter,
-				&mockHTTPHandler{statusCode: status},
-			)
-
-			req := httptest.NewRequest("GET", "/test", nil)
-			rr := httptest.NewRecorder()
-
-			statusLabels := prometheus.Labels{"code": fmt.Sprintf("%d", status), "method": "GET"}
-			initialValue := getCounterValue(counter, statusLabels)
-
-			handler.ServeHTTP(rr, req)
-
-			finalValue := getCounterValue(counter, statusLabels)
-			if finalValue != initialValue+1 {
-				t.Errorf("Status %d: Expected counter increment", status)
-			}
-		})
-	}
-}
-
-// Helper functions
-func getMetricValue(gauge prometheus.Gauge) float64 {
-	metric := &dto.Metric{}
-	gauge.Write(metric)
-	return metric.GetGauge().GetValue()
-}
-
-func getCounterValue(counter *prometheus.CounterVec, labels prometheus.Labels) float64 {
-	metric, err := counter.GetMetricWith(labels)
-	if err != nil {
-		return 0
-	}
-
-	pb := &dto.Metric{}
-	metric.Write(pb)
-	return pb.GetCounter().GetValue()
-}
-
-type mockHTTPHandler struct {
-	statusCode int
-}
-
-func (m *mockHTTPHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(m.statusCode)
-}
-
-func TestMetrics_Memory_Usage(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping memory test in short mode")
-	}
-
-	// Initialize metrics
-	initAdminMetrics()
-
-	// Create many different label combinations
-	const numLabels = 1000
-
-	for i := 0; i < numLabels; i++ {
-		labels := prometheus.Labels{
-			"handler": fmt.Sprintf("handler_%d", i%10),
-			"path":    fmt.Sprintf("/path_%d", i),
-			"method":  []string{"GET", "POST", "PUT", "DELETE"}[i%4],
-			"code":    []string{"200", "404", "500"}[i%3],
-		}
-
-		adminMetrics.requestCount.With(labels).Inc()
-
-		// Also increment error counter occasionally
-		if i%10 == 0 {
-			errorLabels := prometheus.Labels{
-				"handler": labels["handler"],
-				"path":    labels["path"],
-				"method":  labels["method"],
-			}
-			adminMetrics.requestErrors.With(errorLabels).Inc()
-		}
-	}
-
-	// Test passes if we don't run out of memory or panic
-}
-
-func BenchmarkGlobalMetrics_ConfigSuccess(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		globalMetrics.configSuccess.Set(float64(i % 2))
-	}
-}
-
-func BenchmarkGlobalMetrics_ConfigSuccessTime(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		globalMetrics.configSuccessTime.SetToCurrentTime()
-	}
-}
-
-func BenchmarkAdminMetrics_RequestCount_WithLabels(b *testing.B) {
-	initAdminMetrics()
-
-	labels := prometheus.Labels{
-		"handler": "benchmark",
-		"path":    "/benchmark",
-		"method":  "GET",
-		"code":    "200",
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		adminMetrics.requestCount.With(labels).Inc()
-	}
-}

modules/caddyhttp/app.go

@@ -20,6 +20,7 @@ import (
 	"crypto/tls"
 	"errors"
 	"fmt"
+	"maps"
 	"net"
 	"net/http"
 	"strconv"
@@ -68,7 +69,6 @@ func init() {
 // `{http.request.orig_uri.path.dir}` | The request's original directory
 // `{http.request.orig_uri.path.file}` | The request's original filename
 // `{http.request.orig_uri.query}` | The request's original query string (without `?`)
-// `{http.request.orig_uri.prefixed_query}` | The request's original query string with a `?` prefix, if non-empty
 // `{http.request.port}` | The port part of the request's Host header
 // `{http.request.proto}` | The protocol of the request
 // `{http.request.local.host}` | The host (IP) part of the local address the connection arrived on
@@ -98,15 +98,11 @@ func init() {
 // `{http.request.tls.client.san.ips.*}` | SAN IP addresses (index optional)
 // `{http.request.tls.client.san.uris.*}` | SAN URIs (index optional)
 // `{http.request.uri}` | The full request URI
-// `{http.request.uri_escaped}` | The full request URI with query-style URL encoding applied (using url.QueryEscape)
 // `{http.request.uri.path}` | The path component of the request URI
-// `{http.request.uri.path_escaped}` | The path component of the request URI with query-style URL encoding applied (using url.QueryEscape)
 // `{http.request.uri.path.*}` | Parts of the path, split by `/` (0-based from left)
 // `{http.request.uri.path.dir}` | The directory, excluding leaf filename
 // `{http.request.uri.path.file}` | The filename of the path, excluding directory
 // `{http.request.uri.query}` | The query string (without `?`)
-// `{http.request.uri.query_escaped}` | The query string with query-style URL encoding applied (using url.QueryEscape)
-// `{http.request.uri.prefixed_query}` | The query string with a `?` prefix, if non-empty
 // `{http.request.uri.query.*}` | Individual query string value
 // `{http.response.header.*}` | Specific response header field
 // `{http.vars.*}` | Custom variables in the HTTP handler chain
@@ -207,9 +203,6 @@ func (app *App) Provision(ctx caddy.Context) error {
 		app.Metrics.httpMetrics = &httpMetrics{}
 		// Scan config for allowed hosts to prevent cardinality explosion
 		app.Metrics.scanConfigForHosts(app)
-		if err := app.Metrics.provisionOTLP(ctx); err != nil {
-			return err
-		}
 	}
 	// prepare each server
 	oldContext := ctx.Context
@@ -221,6 +214,8 @@ func (app *App) Provision(ctx caddy.Context) error {
 		srv.ctx = ctx
 		srv.logger = app.logger.Named("log")
 		srv.errorLogger = app.logger.Named("log.error")
+		srv.shutdownAtMu = new(sync.RWMutex)
+
 		if srv.Metrics != nil {
 			srv.logger.Warn("per-server 'metrics' is deprecated; use 'metrics' in the root 'http' app instead")
 			app.Metrics = cmp.Or(app.Metrics, &Metrics{
@@ -240,7 +235,12 @@ func (app *App) Provision(ctx caddy.Context) error {
 
 		// if no protocols configured explicitly, enable all except h2c
 		if len(srv.Protocols) == 0 {
-			srv.Protocols = srv.protocolsWithDefaults()
+			srv.Protocols = []string{"h1", "h2", "h3"}
+		}
+
+		srvProtocolsUnique := map[string]struct{}{}
+		for _, srvProtocol := range srv.Protocols {
+			srvProtocolsUnique[srvProtocol] = struct{}{}
 		}
 
 		if srv.ListenProtocols != nil {
@@ -251,7 +251,31 @@ func (app *App) Provision(ctx caddy.Context) error {
 
 			for i, lnProtocols := range srv.ListenProtocols {
 				if lnProtocols != nil {
-					srv.ListenProtocols[i] = srv.listenerProtocolsWithDefaults(lnProtocols)
+					// populate empty listen protocols with server protocols
+					lnProtocolsDefault := false
+					var lnProtocolsInclude []string
+					srvProtocolsInclude := maps.Clone(srvProtocolsUnique)
+
+					// keep existing listener protocols unless they are empty
+					for _, lnProtocol := range lnProtocols {
+						if lnProtocol == "" {
+							lnProtocolsDefault = true
+						} else {
+							lnProtocolsInclude = append(lnProtocolsInclude, lnProtocol)
+							delete(srvProtocolsInclude, lnProtocol)
+						}
+					}
+
+					// append server protocols to listener protocols if any listener protocols were empty
+					if lnProtocolsDefault {
+						for _, srvProtocol := range srv.Protocols {
+							if _, ok := srvProtocolsInclude[srvProtocol]; ok {
+								lnProtocolsInclude = append(lnProtocolsInclude, srvProtocol)
+							}
+						}
+					}
+
+					srv.ListenProtocols[i] = lnProtocolsInclude
 				}
 			}
 		}
@@ -665,7 +689,9 @@ func (app *App) Stop() error {
 				for _, addr := range na.Expand() {
 					if caddy.ListenerUsage(addr.Network, addr.JoinHostPort(0)) < 2 {
 						app.logger.Debug("listener closing and shutdown delay is configured", zap.String("address", addr.String()))
-						server.shutdownAt.Store(&scheduledTime)
+						server.shutdownAtMu.Lock()
+						server.shutdownAt = scheduledTime
+						server.shutdownAtMu.Unlock()
 						delay = true
 					} else {
 						app.logger.Debug("shutdown delay configured but listener will remain open", zap.String("address", addr.String()))
@@ -790,12 +816,6 @@ func (app *App) Stop() error {
 		}
 	}
 
-	// flush and shut down the OTLP metrics exporter (if configured) so any
-	// last data point reaches the collector before the process exits
-	if err := app.Metrics.shutdown(ctx); err != nil {
-		app.logger.Error("shutting down OTLP metrics", zap.Error(err))
-	}
-
 	app.stopped = true
 	return nil
 }

modules/caddyhttp/autohttps.go

@@ -173,7 +173,7 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
 		for d := range serverDomainSet {
 			echDomains = append(echDomains, d)
 		}
-		app.tlsApp.RegisterServerNames(echDomains, httpsRRALPNs(srv))
+		app.tlsApp.RegisterServerNames(echDomains)
 
 		// nothing more to do here if there are no domains that qualify for
 		// automatic HTTPS and there are no explicit TLS connection policies:
@@ -258,13 +258,18 @@ func (app *App) automaticHTTPSPhase1(ctx caddy.Context, repl *caddy.Replacer) er
 			// an empty string to indicate a catch-all, which we have to
 			// treat special later
 			if len(serverDomainSet) == 0 {
-				app.recordAutoHTTPSRedirectAddress(redirDomains, "", addr)
+				redirDomains[""] = append(redirDomains[""], addr)
 				continue
 			}
 
 			// ...and associate it with each domain in this server
 			for d := range serverDomainSet {
-				app.recordAutoHTTPSRedirectAddress(redirDomains, d, addr)
+				// if this domain is used on more than one HTTPS-enabled
+				// port, we'll have to choose one, so prefer the HTTPS port
+				if _, ok := redirDomains[d]; !ok ||
+					addr.StartPort == uint(app.httpsPort()) {
+					redirDomains[d] = append(redirDomains[d], addr)
+				}
 			}
 		}
 	}
@@ -512,35 +517,6 @@ redirServersLoop:
 	return nil
 }
 
-// recordAutoHTTPSRedirectAddress stores redirect destinations for one domain
-// using a single winning port while keeping all bind addresses on that port.
-//
-// This is needed to avoid two opposite regressions in auto-HTTPS redirects:
-// preserve all listener addresses when a site binds multiple addresses on the
-// same HTTPS port, but do not mix in alternate HTTPS ports when the canonical
-// app HTTPS port is also available.
-func (app *App) recordAutoHTTPSRedirectAddress(redirDomains map[string][]caddy.NetworkAddress, domain string, addr caddy.NetworkAddress) {
-	existing := redirDomains[domain]
-	if len(existing) == 0 {
-		redirDomains[domain] = []caddy.NetworkAddress{addr}
-		return
-	}
-
-	existingPort := existing[0].StartPort
-	if addr.StartPort != existingPort {
-		if addr.StartPort == uint(app.httpsPort()) && existingPort != uint(app.httpsPort()) {
-			redirDomains[domain] = []caddy.NetworkAddress{addr}
-		}
-		return
-	}
-
-	if slices.Contains(existing, addr) {
-		return
-	}
-
-	redirDomains[domain] = append(existing, addr)
-}
-
 func (app *App) makeRedirRoute(redirToPort uint, matcherSet MatcherSet) Route {
 	redirTo := "https://{http.request.host}"
 
@@ -574,20 +550,6 @@ func (app *App) makeRedirRoute(redirToPort uint, matcherSet MatcherSet) Route {
 	}
 }
 
-func httpsRRALPNs(srv *Server) []string {
-	alpn := make(map[string]struct{}, 3)
-	if srv.protocol("h3") {
-		alpn["h3"] = struct{}{}
-	}
-	if srv.protocol("h2") {
-		alpn["h2"] = struct{}{}
-	}
-	if srv.protocol("h1") {
-		alpn["http/1.1"] = struct{}{}
-	}
-	return caddytls.OrderedHTTPSRRALPN(alpn)
-}
-
 // createAutomationPolicies ensures that automated certificates for this
 // app are managed properly. This adds up to two automation policies:
 // one for the public names, and one for the internal names. If a catch-all

modules/caddyhttp/autohttps_test.go

@@ -1,47 +0,0 @@
-package caddyhttp
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestHTTPSRRALPNsDefaultProtocols(t *testing.T) {
-	srv := &Server{}
-
-	got := httpsRRALPNs(srv)
-	want := []string{"h3", "h2", "http/1.1"}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("unexpected ALPN values: got %v want %v", got, want)
-	}
-}
-
-func TestHTTPSRRALPNsListenProtocolOverrides(t *testing.T) {
-	srv := &Server{
-		Protocols: []string{"h1", "h2"},
-		ListenProtocols: [][]string{
-			{"h1"},
-			nil,
-			{},
-			{"h3", ""},
-		},
-	}
-
-	got := httpsRRALPNs(srv)
-	want := []string{"h3", "h2", "http/1.1"}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("unexpected ALPN values: got %v want %v", got, want)
-	}
-}
-
-func TestHTTPSRRALPNsIgnoresH2COnly(t *testing.T) {
-	srv := &Server{
-		Protocols: []string{"h2c"},
-	}
-
-	got := httpsRRALPNs(srv)
-	if len(got) != 0 {
-		t.Fatalf("unexpected ALPN values: got %v want none", got)
-	}
-}

modules/caddyhttp/errors.go

@@ -85,11 +85,8 @@ func (e HandlerError) Unwrap() error { return e.Err }
 // randString returns a string of n random characters.
 // It is not even remotely secure OR a proper distribution.
 // But it's good enough for some things. It excludes certain
-// confusing characters like I, l, 1, 0, O. If sameCase
-// is true, then uppercase letters are excluded as well as
-// the characters l and o. If sameCase is false, both uppercase
-// and lowercase letters are used, and the characters I, l, 1, 0, O
-// are excluded.
+// confusing characters like I, l, 1, 0, O, etc. If sameCase
+// is true, then uppercase letters are excluded.
 func randString(n int, sameCase bool) string {
 	if n <= 0 {
 		return ""

modules/caddyhttp/errors_test.go

@@ -1,168 +0,0 @@
-package caddyhttp
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func TestHandlerErrorError(t *testing.T) {
-	tests := []struct {
-		name     string
-		err      HandlerError
-		contains []string
-	}{
-		{
-			name: "full error",
-			err: HandlerError{
-				ID:         "abc123",
-				StatusCode: 404,
-				Err:        fmt.Errorf("not found"),
-				Trace:      "pkg.Func (file.go:10)",
-			},
-			contains: []string{"abc123", "404", "not found", "pkg.Func"},
-		},
-		{
-			name:     "empty error",
-			err:      HandlerError{},
-			contains: []string{},
-		},
-		{
-			name: "error with only status code",
-			err: HandlerError{
-				StatusCode: 500,
-			},
-			contains: []string{"500"},
-		},
-		{
-			name: "error with only message",
-			err: HandlerError{
-				Err: fmt.Errorf("something broke"),
-			},
-			contains: []string{"something broke"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := tt.err.Error()
-			for _, needle := range tt.contains {
-				if !strings.Contains(result, needle) {
-					t.Errorf("Error() = %q, should contain %q", result, needle)
-				}
-			}
-		})
-	}
-}
-
-func TestHandlerErrorUnwrap(t *testing.T) {
-	originalErr := fmt.Errorf("original error")
-	he := HandlerError{Err: originalErr}
-
-	unwrapped := he.Unwrap()
-	if unwrapped != originalErr {
-		t.Errorf("Unwrap() = %v, want %v", unwrapped, originalErr)
-	}
-}
-
-func TestError(t *testing.T) {
-	t.Run("creates error with ID and trace", func(t *testing.T) {
-		err := fmt.Errorf("test error")
-		he := Error(500, err)
-
-		if he.StatusCode != 500 {
-			t.Errorf("StatusCode = %d, want 500", he.StatusCode)
-		}
-		if he.ID == "" {
-			t.Error("ID should not be empty")
-		}
-		if len(he.ID) != 9 {
-			t.Errorf("ID length = %d, want 9", len(he.ID))
-		}
-		if he.Trace == "" {
-			t.Error("Trace should not be empty")
-		}
-		if he.Err != err {
-			t.Error("Err should be the original error")
-		}
-	})
-
-	t.Run("unwraps existing HandlerError", func(t *testing.T) {
-		inner := HandlerError{
-			ID:         "existing_id",
-			StatusCode: 404,
-			Err:        fmt.Errorf("not found"),
-			Trace:      "existing trace",
-		}
-
-		he := Error(500, inner)
-
-		// Should keep existing ID
-		if he.ID != "existing_id" {
-			t.Errorf("ID = %q, want 'existing_id'", he.ID)
-		}
-		// Should keep existing StatusCode
-		if he.StatusCode != 404 {
-			t.Errorf("StatusCode = %d, want 404 (existing)", he.StatusCode)
-		}
-		// Should keep existing Trace
-		if he.Trace != "existing trace" {
-			t.Errorf("Trace = %q, want 'existing trace'", he.Trace)
-		}
-	})
-
-	t.Run("fills missing fields in existing HandlerError", func(t *testing.T) {
-		inner := HandlerError{
-			Err: fmt.Errorf("inner error"),
-			// ID, StatusCode, and Trace are all empty
-		}
-
-		he := Error(503, inner)
-
-		if he.ID == "" {
-			t.Error("should fill missing ID")
-		}
-		if he.StatusCode != 503 {
-			t.Errorf("should fill missing StatusCode with %d, got %d", 503, he.StatusCode)
-		}
-		if he.Trace == "" {
-			t.Error("should fill missing Trace")
-		}
-	})
-
-	t.Run("generates unique IDs", func(t *testing.T) {
-		ids := make(map[string]struct{})
-		for i := 0; i < 100; i++ {
-			he := Error(500, fmt.Errorf("error %d", i))
-			if _, exists := ids[he.ID]; exists {
-				t.Errorf("duplicate ID generated: %s", he.ID)
-			}
-			ids[he.ID] = struct{}{}
-		}
-	})
-}
-
-func TestErrorAsHandlerError(t *testing.T) {
-	he := Error(404, fmt.Errorf("not found"))
-	var target HandlerError
-	if !errors.As(he, &target) {
-		t.Error("Error() result should be assertable as HandlerError via errors.As")
-	}
-}
-
-func TestHandlerErrorWithWrappedError(t *testing.T) {
-	// Test that errors.As can unwrap a wrapped HandlerError
-	inner := HandlerError{
-		ID:         "inner",
-		StatusCode: 404,
-		Err:        fmt.Errorf("inner error"),
-	}
-	wrapped := fmt.Errorf("wrapped: %w", inner)
-
-	he := Error(500, wrapped)
-	// Since wrapped contains a HandlerError, it should be unwrapped
-	if he.ID != "inner" {
-		t.Errorf("should unwrap to inner ID 'inner', got %q", he.ID)
-	}
-}

modules/caddyhttp/errors_utils_test.go

@@ -1,279 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddyhttp
-
-import (
-	"strings"
-	"testing"
-	"unicode"
-)
-
-func TestRandString(t *testing.T) {
-	tests := []struct {
-		name      string
-		length    int
-		sameCase  bool
-		wantLen   int
-		checkCase func(string) bool
-	}{
-		{
-			name:     "zero length",
-			length:   0,
-			sameCase: false,
-			wantLen:  0,
-			checkCase: func(s string) bool {
-				return s == ""
-			},
-		},
-		{
-			name:     "negative length",
-			length:   -5,
-			sameCase: false,
-			wantLen:  0,
-			checkCase: func(s string) bool {
-				return s == ""
-			},
-		},
-		{
-			name:     "single character mixed case",
-			length:   1,
-			sameCase: false,
-			wantLen:  1,
-			checkCase: func(s string) bool {
-				// Should be alphanumeric
-				return len(s) == 1 && (unicode.IsLetter(rune(s[0])) || unicode.IsDigit(rune(s[0])))
-			},
-		},
-		{
-			name:     "single character same case",
-			length:   1,
-			sameCase: true,
-			wantLen:  1,
-			checkCase: func(s string) bool {
-				// Should be lowercase or digit
-				return len(s) == 1 && (unicode.IsLower(rune(s[0])) || unicode.IsDigit(rune(s[0])))
-			},
-		},
-		{
-			name:     "short string mixed case",
-			length:   5,
-			sameCase: false,
-			wantLen:  5,
-			checkCase: func(s string) bool {
-				// All characters should be alphanumeric
-				for _, c := range s {
-					if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-						return false
-					}
-				}
-				return true
-			},
-		},
-		{
-			name:     "short string same case",
-			length:   5,
-			sameCase: true,
-			wantLen:  5,
-			checkCase: func(s string) bool {
-				// All characters should be lowercase or digits
-				for _, c := range s {
-					if unicode.IsUpper(c) {
-						return false
-					}
-					if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-						return false
-					}
-				}
-				return true
-			},
-		},
-		{
-			name:     "medium string mixed case",
-			length:   20,
-			sameCase: false,
-			wantLen:  20,
-			checkCase: func(s string) bool {
-				for _, c := range s {
-					if !unicode.IsLetter(c) && !unicode.IsDigit(c) {
-						return false
-					}
-				}
-				return true
-			},
-		},
-		{
-			name:     "long string same case",
-			length:   100,
-			sameCase: true,
-			wantLen:  100,
-			checkCase: func(s string) bool {
-				for _, c := range s {
-					if unicode.IsUpper(c) {
-						return false
-					}
-				}
-				return true
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := randString(tt.length, tt.sameCase)
-
-			// Check length
-			if len(result) != tt.wantLen {
-				t.Errorf("randString(%d, %v) length = %d, want %d",
-					tt.length, tt.sameCase, len(result), tt.wantLen)
-			}
-
-			// Check case requirements
-			if !tt.checkCase(result) {
-				t.Errorf("randString(%d, %v) = %q failed case check",
-					tt.length, tt.sameCase, result)
-			}
-		})
-	}
-}
-
-// TestRandString_NoConfusingChars ensures that confusing characters
-// like I, l, 1, 0, O are excluded from the generated strings
-func TestRandString_NoConfusingChars(t *testing.T) {
-	tests := []struct {
-		name     string
-		sameCase bool
-		excluded []rune
-	}{
-		{
-			name:     "mixed case excludes I,l,1,0,O",
-			sameCase: false,
-			excluded: []rune{'I', 'l', '1', '0', 'O'},
-		},
-		{
-			name:     "same case excludes l,0",
-			sameCase: true,
-			excluded: []rune{'l', 'o'},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Generate multiple strings to increase confidence
-			for i := 0; i < 100; i++ {
-				result := randString(50, tt.sameCase)
-
-				for _, char := range tt.excluded {
-					if strings.ContainsRune(result, char) {
-						t.Errorf("randString(50, %v) contains excluded character %q in %q",
-							tt.sameCase, char, result)
-					}
-				}
-			}
-		})
-	}
-}
-
-// TestRandString_Uniqueness verifies that consecutive calls produce
-// different strings (with high probability)
-func TestRandString_Uniqueness(t *testing.T) {
-	const iterations = 100
-	const length = 16
-
-	tests := []struct {
-		name     string
-		sameCase bool
-	}{
-		{"mixed case", false},
-		{"same case", true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			seen := make(map[string]bool)
-			duplicates := 0
-
-			for i := 0; i < iterations; i++ {
-				result := randString(length, tt.sameCase)
-				if seen[result] {
-					duplicates++
-				}
-				seen[result] = true
-			}
-
-			// With a 16-character string from a large alphabet, duplicates should be extremely rare
-			// Allow at most 1 duplicate in 100 iterations
-			if duplicates > 1 {
-				t.Errorf("randString(%d, %v) produced %d duplicates in %d iterations (expected ≤1)",
-					length, tt.sameCase, duplicates, iterations)
-			}
-		})
-	}
-}
-
-// TestRandString_CharacterDistribution checks that the generated strings
-// contain a reasonable mix of characters (not just one character)
-func TestRandString_CharacterDistribution(t *testing.T) {
-	const length = 1000
-	const minUniqueChars = 15 // Should have at least 15 different characters in 1000 chars
-
-	tests := []struct {
-		name     string
-		sameCase bool
-	}{
-		{"mixed case", false},
-		{"same case", true},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := randString(length, tt.sameCase)
-
-			uniqueChars := make(map[rune]bool)
-			for _, c := range result {
-				uniqueChars[c] = true
-			}
-
-			if len(uniqueChars) < minUniqueChars {
-				t.Errorf("randString(%d, %v) produced only %d unique characters (expected ≥%d)",
-					length, tt.sameCase, len(uniqueChars), minUniqueChars)
-			}
-		})
-	}
-}
-
-// BenchmarkRandString measures the performance of random string generation
-func BenchmarkRandString(b *testing.B) {
-	benchmarks := []struct {
-		name     string
-		length   int
-		sameCase bool
-	}{
-		{"short_mixed", 8, false},
-		{"short_same", 8, true},
-		{"medium_mixed", 32, false},
-		{"medium_same", 32, true},
-		{"long_mixed", 128, false},
-		{"long_same", 128, true},
-	}
-
-	for _, bm := range benchmarks {
-		b.Run(bm.name, func(b *testing.B) {
-			b.ReportAllocs()
-			for i := 0; i < b.N; i++ {
-				_ = randString(bm.length, bm.sameCase)
-			}
-		})
-	}
-}

modules/caddyhttp/fileserver/browse.go

@@ -281,13 +281,7 @@ func (fsrv *FileServer) browseApplyQueryParams(w http.ResponseWriter, r *http.Re
 			sortParam = sortCookie.Value
 		}
 	case sortByName, sortByNameDirFirst, sortBySize, sortByTime:
-		http.SetCookie(w, &http.Cookie{ //nolint:gosec // Secure depends on whether the request itself used TLS
-			Name:     "sort",
-			Value:    sortParam,
-			Secure:   r.TLS != nil,
-			HttpOnly: true,
-			SameSite: http.SameSiteLaxMode,
-		})
+		http.SetCookie(w, &http.Cookie{Name: "sort", Value: sortParam, Secure: r.TLS != nil})
 	}
 
 	// then figure out the order
@@ -298,13 +292,7 @@ func (fsrv *FileServer) browseApplyQueryParams(w http.ResponseWriter, r *http.Re
 			orderParam = orderCookie.Value
 		}
 	case sortOrderAsc, sortOrderDesc:
-		http.SetCookie(w, &http.Cookie{ //nolint:gosec // Secure depends on whether the request itself used TLS
-			Name:     "order",
-			Value:    orderParam,
-			Secure:   r.TLS != nil,
-			HttpOnly: true,
-			SameSite: http.SameSiteLaxMode,
-		})
+		http.SetCookie(w, &http.Cookie{Name: "order", Value: orderParam, Secure: r.TLS != nil})
 	}
 
 	// finally, apply the sorting and limiting

modules/caddyhttp/fileserver/matcher_test.go

@@ -28,7 +28,6 @@ import (
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/internal/filesystems"
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
-	"github.com/caddyserver/caddy/v2/modules/caddyhttp/rewrite"
 )
 
 type testCase struct {
@@ -189,105 +188,6 @@ func fileMatcherTest(t *testing.T, i int, tc testCase) {
 	}
 }
 
-func TestTryFilesRewriteEscapesMatchedPath(t *testing.T) {
-	root := t.TempDir()
-
-	tests := []struct {
-		name           string
-		requestTarget  string
-		filename       string
-		extraFiles     []string
-		wantPath       string
-		wantRequestURI string
-		skipWindows    bool
-	}{
-		{
-			name:           "question mark in path",
-			requestTarget:  "/%3F.html",
-			filename:       "?.html",
-			wantPath:       "/?.html",
-			wantRequestURI: "/%3F.html",
-			skipWindows:    true,
-		},
-		{
-			name:           "percent in path",
-			requestTarget:  "/%25.html",
-			filename:       "%.html",
-			wantPath:       "/%.html",
-			wantRequestURI: "/%25.html",
-		},
-		{
-			name:           "encoded question mark remains percent-encoded",
-			requestTarget:  "/%253F.html",
-			filename:       "%3F.html",
-			wantPath:       "/%3F.html",
-			wantRequestURI: "/%253F.html",
-		},
-		{
-			name:           "question mark in nested path",
-			requestTarget:  "/nested/%3F.html",
-			filename:       filepath.Join("nested", "?.html"),
-			wantPath:       "/nested/?.html",
-			wantRequestURI: "/nested/%3F.html",
-			skipWindows:    true,
-		},
-		{
-			name:           "encoded slash in filename does not conflict with nesting",
-			requestTarget:  "/nested%252Ffile.html",
-			filename:       "nested%2Ffile.html",
-			extraFiles:     []string{filepath.Join("nested", "file.html")},
-			wantPath:       "/nested%2Ffile.html",
-			wantRequestURI: "/nested%252Ffile.html",
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			if tc.skipWindows && runtime.GOOS == "windows" {
-				t.Skip("Windows file names cannot contain question marks")
-			}
-
-			for _, name := range append([]string{tc.filename}, tc.extraFiles...) {
-				filename := filepath.Join(root, name)
-				if err := os.MkdirAll(filepath.Dir(filename), 0o700); err != nil {
-					t.Fatalf("creating test file parent directory: %v", err)
-				}
-				if err := os.WriteFile(filename, []byte(name), 0o600); err != nil {
-					t.Fatalf("writing test file: %v", err)
-				}
-			}
-
-			m := &MatchFile{
-				fsmap:    &filesystems.FileSystemMap{},
-				Root:     root,
-				TryFiles: []string{"{http.request.uri.path}"},
-			}
-			req := httptest.NewRequest(http.MethodGet, "http://example.com"+tc.requestTarget, nil)
-			repl := caddyhttp.NewTestReplacer(req)
-
-			matched, err := m.MatchWithError(req)
-			if err != nil {
-				t.Fatalf("matching file: %v", err)
-			}
-			if !matched {
-				t.Fatalf("expected request %s to match %s", tc.requestTarget, tc.filename)
-			}
-
-			rewrite.Rewrite{URI: "{http.matchers.file.relative}"}.Rewrite(req, repl)
-
-			if req.URL.Path != tc.wantPath {
-				t.Errorf("rewritten path = %q, want %q", req.URL.Path, tc.wantPath)
-			}
-			if req.RequestURI != tc.wantRequestURI {
-				t.Errorf("rewritten request URI = %q, want %q", req.RequestURI, tc.wantRequestURI)
-			}
-			if req.URL.RawQuery != "" {
-				t.Errorf("rewritten raw query = %q, want empty", req.URL.RawQuery)
-			}
-		})
-	}
-}
-
 func TestPHPFileMatcher(t *testing.T) {
 	for i, tc := range []struct {
 		path         string

modules/caddyhttp/fileserver/staticfiles.go

@@ -785,7 +785,7 @@ func redirect(w http.ResponseWriter, r *http.Request, toPath string) error {
 	if r.URL.RawQuery != "" {
 		toPath += "?" + r.URL.RawQuery
 	}
-	http.Redirect(w, r, toPath, http.StatusPermanentRedirect) //nolint:gosec // toPath is a same-origin path and leading // is stripped above
+	http.Redirect(w, r, toPath, http.StatusPermanentRedirect)
 	return nil
 }
 

modules/caddyhttp/ip_range_test.go

@@ -1,201 +0,0 @@
-package caddyhttp
-
-import (
-	"net/netip"
-	"testing"
-)
-
-func TestCIDRExpressionToPrefix(t *testing.T) {
-	tests := []struct {
-		name    string
-		expr    string
-		want    netip.Prefix
-		wantErr bool
-	}{
-		{
-			name: "valid CIDR IPv4",
-			expr: "192.168.0.0/16",
-			want: netip.MustParsePrefix("192.168.0.0/16"),
-		},
-		{
-			name: "valid CIDR IPv6",
-			expr: "fd00::/8",
-			want: netip.MustParsePrefix("fd00::/8"),
-		},
-		{
-			name: "single IPv4 becomes /32",
-			expr: "192.168.1.1",
-			want: netip.MustParsePrefix("192.168.1.1/32"),
-		},
-		{
-			name: "single IPv6 becomes /128",
-			expr: "::1",
-			want: netip.MustParsePrefix("::1/128"),
-		},
-		{
-			name: "loopback IPv4",
-			expr: "127.0.0.1",
-			want: netip.MustParsePrefix("127.0.0.1/32"),
-		},
-		{
-			name: "full IPv6 address",
-			expr: "2001:db8::1",
-			want: netip.MustParsePrefix("2001:db8::1/128"),
-		},
-		{
-			name:    "invalid CIDR",
-			expr:    "192.168.0.0/33",
-			wantErr: true,
-		},
-		{
-			name:    "invalid IP",
-			expr:    "not-an-ip",
-			wantErr: true,
-		},
-		{
-			name:    "empty string",
-			expr:    "",
-			wantErr: true,
-		},
-		{
-			name:    "CIDR with invalid IP",
-			expr:    "999.999.999.999/24",
-			wantErr: true,
-		},
-		{
-			name: "CIDR /0 matches everything",
-			expr: "0.0.0.0/0",
-			want: netip.MustParsePrefix("0.0.0.0/0"),
-		},
-		{
-			name: "CIDR /32 single host",
-			expr: "10.0.0.1/32",
-			want: netip.MustParsePrefix("10.0.0.1/32"),
-		},
-		{
-			name:    "malformed CIDR with extra slash",
-			expr:    "10.0.0.0/8/16",
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := CIDRExpressionToPrefix(tt.expr)
-			if (err != nil) != tt.wantErr {
-				t.Errorf("CIDRExpressionToPrefix(%q) error = %v, wantErr %v", tt.expr, err, tt.wantErr)
-				return
-			}
-			if !tt.wantErr && got != tt.want {
-				t.Errorf("CIDRExpressionToPrefix(%q) = %v, want %v", tt.expr, got, tt.want)
-			}
-		})
-	}
-}
-
-func TestStaticIPRangeProvision(t *testing.T) {
-	tests := []struct {
-		name    string
-		ranges  []string
-		wantLen int
-		wantErr bool
-	}{
-		{
-			name:    "valid CIDR ranges",
-			ranges:  []string{"192.168.0.0/16", "10.0.0.0/8"},
-			wantLen: 2,
-		},
-		{
-			name:    "single IPs",
-			ranges:  []string{"192.168.1.1", "10.0.0.1"},
-			wantLen: 2,
-		},
-		{
-			name:    "mixed CIDR and single IP",
-			ranges:  []string{"192.168.0.0/16", "10.0.0.1"},
-			wantLen: 2,
-		},
-		{
-			name:    "invalid range",
-			ranges:  []string{"not-valid"},
-			wantErr: true,
-		},
-		{
-			name:    "empty ranges",
-			ranges:  []string{},
-			wantLen: 0,
-		},
-		{
-			name:    "nil ranges",
-			ranges:  nil,
-			wantLen: 0,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			s := &StaticIPRange{Ranges: tt.ranges}
-			// We can't easily create a caddy.Context here without full module setup,
-			// but Provision only uses the ranges field, so we test the logic directly.
-			// The Provision method calls CIDRExpressionToPrefix which we test separately.
-			var parsedCount int
-			var gotErr bool
-			for _, r := range s.Ranges {
-				_, err := CIDRExpressionToPrefix(r)
-				if err != nil {
-					gotErr = true
-					break
-				}
-				parsedCount++
-			}
-
-			if gotErr != tt.wantErr {
-				t.Errorf("provision error = %v, wantErr %v", gotErr, tt.wantErr)
-			}
-			if !tt.wantErr && parsedCount != tt.wantLen {
-				t.Errorf("parsed %d ranges, want %d", parsedCount, tt.wantLen)
-			}
-		})
-	}
-}
-
-func TestStaticIPRangeGetIPRanges(t *testing.T) {
-	s := &StaticIPRange{
-		ranges: []netip.Prefix{
-			netip.MustParsePrefix("192.168.0.0/16"),
-			netip.MustParsePrefix("10.0.0.0/8"),
-		},
-	}
-
-	result := s.GetIPRanges(nil) // request is unused
-	if len(result) != 2 {
-		t.Errorf("GetIPRanges() returned %d prefixes, want 2", len(result))
-	}
-}
-
-func TestStaticIPRangeCaddyModule(t *testing.T) {
-	s := StaticIPRange{}
-	info := s.CaddyModule()
-	if info.ID != "http.ip_sources.static" {
-		t.Errorf("CaddyModule().ID = %v, want 'http.ip_sources.static'", info.ID)
-	}
-	mod := info.New()
-	if mod == nil {
-		t.Error("New() should not return nil")
-	}
-}
-
-func TestPrivateRangesCIDRWrapper(t *testing.T) {
-	ranges := PrivateRangesCIDR()
-	if len(ranges) == 0 {
-		t.Error("PrivateRangesCIDR() should return non-empty list")
-	}
-
-	// Verify all ranges are valid CIDR or IP expressions
-	for _, r := range ranges {
-		_, err := CIDRExpressionToPrefix(r)
-		if err != nil {
-			t.Errorf("PrivateRangesCIDR() returned invalid range %q: %v", r, err)
-		}
-	}
-}

modules/caddyhttp/marshalers.go

@@ -18,10 +18,9 @@ import (
 	"crypto/tls"
 	"net"
 	"net/http"
+	"strings"
 
 	"go.uber.org/zap/zapcore"
-
-	"github.com/caddyserver/caddy/v2/internal"
 )
 
 // LoggableHTTPRequest makes an HTTP request loggable with zap.Object().
@@ -48,12 +47,12 @@ func (r LoggableHTTPRequest) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 	enc.AddString("method", r.Method)
 	enc.AddString("host", r.Host)
 	enc.AddString("uri", r.RequestURI)
-	enc.AddObject("headers", internal.LoggableHTTPHeader{
+	enc.AddObject("headers", LoggableHTTPHeader{
 		Header:               r.Header,
 		ShouldLogCredentials: r.ShouldLogCredentials,
 	})
 	if r.TransferEncoding != nil {
-		enc.AddArray("transfer_encoding", internal.LoggableStringArray(r.TransferEncoding))
+		enc.AddArray("transfer_encoding", LoggableStringArray(r.TransferEncoding))
 	}
 	if r.TLS != nil {
 		enc.AddObject("tls", LoggableTLSConnState(*r.TLS))
@@ -62,10 +61,44 @@ func (r LoggableHTTPRequest) MarshalLogObject(enc zapcore.ObjectEncoder) error {
 }
 
 // LoggableHTTPHeader makes an HTTP header loggable with zap.Object().
-type LoggableHTTPHeader = internal.LoggableHTTPHeader
+// Headers with potentially sensitive information (Cookie, Set-Cookie,
+// Authorization, and Proxy-Authorization) are logged with empty values.
+type LoggableHTTPHeader struct {
+	http.Header
+
+	ShouldLogCredentials bool
+}
+
+// MarshalLogObject satisfies the zapcore.ObjectMarshaler interface.
+func (h LoggableHTTPHeader) MarshalLogObject(enc zapcore.ObjectEncoder) error {
+	if h.Header == nil {
+		return nil
+	}
+	for key, val := range h.Header {
+		if !h.ShouldLogCredentials {
+			switch strings.ToLower(key) {
+			case "cookie", "set-cookie", "authorization", "proxy-authorization":
+				val = []string{"REDACTED"} // see #5669. I still think ▒▒▒▒ would be cool.
+			}
+		}
+		enc.AddArray(key, LoggableStringArray(val))
+	}
+	return nil
+}
 
 // LoggableStringArray makes a slice of strings marshalable for logging.
-type LoggableStringArray = internal.LoggableStringArray
+type LoggableStringArray []string
+
+// MarshalLogArray satisfies the zapcore.ArrayMarshaler interface.
+func (sa LoggableStringArray) MarshalLogArray(enc zapcore.ArrayEncoder) error {
+	if sa == nil {
+		return nil
+	}
+	for _, s := range sa {
+		enc.AppendString(s)
+	}
+	return nil
+}
 
 // LoggableTLSConnState makes a TLS connection state loggable with zap.Object().
 type LoggableTLSConnState tls.ConnectionState
@@ -88,5 +121,7 @@ func (t LoggableTLSConnState) MarshalLogObject(enc zapcore.ObjectEncoder) error
 // Interface guards
 var (
 	_ zapcore.ObjectMarshaler = (*LoggableHTTPRequest)(nil)
+	_ zapcore.ObjectMarshaler = (*LoggableHTTPHeader)(nil)
+	_ zapcore.ArrayMarshaler  = (*LoggableStringArray)(nil)
 	_ zapcore.ObjectMarshaler = (*LoggableTLSConnState)(nil)
 )

modules/caddyhttp/marshalers_test.go

@@ -1,316 +0,0 @@
-package caddyhttp
-
-import (
-	"context"
-	"crypto/tls"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"go.uber.org/zap/zapcore"
-)
-
-func TestLoggableHTTPRequestMarshal(t *testing.T) {
-	req, _ := http.NewRequest("GET", "https://example.com/path?q=1", nil)
-	req.RemoteAddr = "192.168.1.1:12345"
-	req.Header.Set("User-Agent", "test-agent")
-	req.Header.Set("Accept", "text/html")
-
-	ctx := context.WithValue(req.Context(), VarsCtxKey, map[string]any{
-		ClientIPVarKey: "192.168.1.1",
-	})
-	req = req.WithContext(ctx)
-
-	lr := LoggableHTTPRequest{Request: req}
-
-	enc := zapcore.NewMapObjectEncoder()
-	err := lr.MarshalLogObject(enc)
-	if err != nil {
-		t.Fatalf("MarshalLogObject() error = %v", err)
-	}
-
-	if enc.Fields["remote_ip"] != "192.168.1.1" {
-		t.Errorf("remote_ip = %v, want '192.168.1.1'", enc.Fields["remote_ip"])
-	}
-	if enc.Fields["remote_port"] != "12345" {
-		t.Errorf("remote_port = %v, want '12345'", enc.Fields["remote_port"])
-	}
-	if enc.Fields["client_ip"] != "192.168.1.1" {
-		t.Errorf("client_ip = %v, want '192.168.1.1'", enc.Fields["client_ip"])
-	}
-	if enc.Fields["method"] != "GET" {
-		t.Errorf("method = %v, want 'GET'", enc.Fields["method"])
-	}
-	if enc.Fields["host"] != "example.com" {
-		t.Errorf("host = %v, want 'example.com'", enc.Fields["host"])
-	}
-}
-
-func TestLoggableHTTPRequestNoPort(t *testing.T) {
-	req, _ := http.NewRequest("GET", "http://example.com/", nil)
-	req.RemoteAddr = "192.168.1.1" // no port
-
-	ctx := context.WithValue(req.Context(), VarsCtxKey, map[string]any{})
-	req = req.WithContext(ctx)
-
-	lr := LoggableHTTPRequest{Request: req}
-
-	enc := zapcore.NewMapObjectEncoder()
-	err := lr.MarshalLogObject(enc)
-	if err != nil {
-		t.Fatalf("MarshalLogObject() error = %v", err)
-	}
-
-	if enc.Fields["remote_ip"] != "192.168.1.1" {
-		t.Errorf("remote_ip = %v, want '192.168.1.1'", enc.Fields["remote_ip"])
-	}
-	if enc.Fields["remote_port"] != "" {
-		t.Errorf("remote_port = %v, want empty string", enc.Fields["remote_port"])
-	}
-}
-
-func TestLoggableHTTPHeaderRedaction(t *testing.T) {
-	tests := []struct {
-		name                 string
-		header               http.Header
-		shouldLogCredentials bool
-		expectRedacted       []string
-	}{
-		{
-			name: "redacts sensitive headers",
-			header: http.Header{
-				"Cookie":              {"session=abc123"},
-				"Set-Cookie":          {"session=xyz"},
-				"Authorization":       {"Bearer token123"},
-				"Proxy-Authorization": {"Basic credentials"},
-				"User-Agent":          {"test-agent"},
-			},
-			shouldLogCredentials: false,
-			expectRedacted:       []string{"Cookie", "Set-Cookie", "Authorization", "Proxy-Authorization"},
-		},
-		{
-			name: "logs credentials when enabled",
-			header: http.Header{
-				"Cookie":        {"session=abc123"},
-				"Authorization": {"Bearer token123"},
-			},
-			shouldLogCredentials: true,
-			expectRedacted:       nil, // nothing should be redacted
-		},
-		{
-			name:                 "nil header",
-			header:               nil,
-			shouldLogCredentials: false,
-			expectRedacted:       nil,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			h := LoggableHTTPHeader{Header: tt.header, ShouldLogCredentials: tt.shouldLogCredentials}
-			enc := zapcore.NewMapObjectEncoder()
-			err := h.MarshalLogObject(enc)
-			if err != nil {
-				t.Fatalf("MarshalLogObject() error = %v", err)
-			}
-
-			if tt.header == nil {
-				return
-			}
-
-			for _, key := range tt.expectRedacted {
-				// The encoded value should be an array with ["REDACTED"]
-				if arr, ok := enc.Fields[key]; ok {
-					arrEnc, ok := arr.(zapcore.ArrayMarshaler)
-					if !ok {
-						continue
-					}
-					// Marshal the array to check its contents
-					testEnc := &testArrayEncoder{}
-					_ = arrEnc.MarshalLogArray(testEnc)
-					if len(testEnc.items) != 1 || testEnc.items[0] != "REDACTED" {
-						t.Errorf("header %q should be REDACTED, got %v", key, testEnc.items)
-					}
-				}
-			}
-
-			if tt.shouldLogCredentials && tt.header != nil {
-				for key, vals := range tt.header {
-					if arr, ok := enc.Fields[key]; ok {
-						arrEnc, ok := arr.(zapcore.ArrayMarshaler)
-						if !ok {
-							continue
-						}
-						testEnc := &testArrayEncoder{}
-						_ = arrEnc.MarshalLogArray(testEnc)
-						if len(testEnc.items) > 0 && testEnc.items[0] == "REDACTED" {
-							t.Errorf("header %q should NOT be redacted when credentials logging is enabled, original: %v", key, vals)
-						}
-					}
-				}
-			}
-		})
-	}
-}
-
-// testArrayEncoder is a simple array encoder for testing
-type testArrayEncoder struct {
-	items []string
-}
-
-func (e *testArrayEncoder) AppendString(s string)                      { e.items = append(e.items, s) }
-func (e *testArrayEncoder) AppendBool(bool)                            {}
-func (e *testArrayEncoder) AppendByteString([]byte)                    {}
-func (e *testArrayEncoder) AppendComplex128(complex128)                {}
-func (e *testArrayEncoder) AppendComplex64(complex64)                  {}
-func (e *testArrayEncoder) AppendFloat64(float64)                      {}
-func (e *testArrayEncoder) AppendFloat32(float32)                      {}
-func (e *testArrayEncoder) AppendInt(int)                              {}
-func (e *testArrayEncoder) AppendInt64(int64)                          {}
-func (e *testArrayEncoder) AppendInt32(int32)                          {}
-func (e *testArrayEncoder) AppendInt16(int16)                          {}
-func (e *testArrayEncoder) AppendInt8(int8)                            {}
-func (e *testArrayEncoder) AppendUint(uint)                            {}
-func (e *testArrayEncoder) AppendUint64(uint64)                        {}
-func (e *testArrayEncoder) AppendUint32(uint32)                        {}
-func (e *testArrayEncoder) AppendUint16(uint16)                        {}
-func (e *testArrayEncoder) AppendUint8(uint8)                          {}
-func (e *testArrayEncoder) AppendUintptr(uintptr)                      {}
-func (e *testArrayEncoder) AppendDuration(time.Duration)               {}
-func (e *testArrayEncoder) AppendTime(time.Time)                       {}
-func (e *testArrayEncoder) AppendArray(zapcore.ArrayMarshaler) error   { return nil }
-func (e *testArrayEncoder) AppendObject(zapcore.ObjectMarshaler) error { return nil }
-func (e *testArrayEncoder) AppendReflected(any) error                  { return nil }
-
-func TestLoggableStringArray(t *testing.T) {
-	tests := []struct {
-		name  string
-		input LoggableStringArray
-	}{
-		{
-			name:  "nil array",
-			input: nil,
-		},
-		{
-			name:  "empty array",
-			input: LoggableStringArray{},
-		},
-		{
-			name:  "single element",
-			input: LoggableStringArray{"hello"},
-		},
-		{
-			name:  "multiple elements",
-			input: LoggableStringArray{"a", "b", "c"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			enc := &testArrayEncoder{}
-			err := tt.input.MarshalLogArray(enc)
-			if err != nil {
-				t.Fatalf("MarshalLogArray() error = %v", err)
-			}
-			if tt.input != nil && len(enc.items) != len(tt.input) {
-				t.Errorf("expected %d items, got %d", len(tt.input), len(enc.items))
-			}
-		})
-	}
-}
-
-func TestLoggableTLSConnState(t *testing.T) {
-	t.Run("basic TLS state", func(t *testing.T) {
-		state := LoggableTLSConnState(tls.ConnectionState{
-			Version:            tls.VersionTLS13,
-			CipherSuite:        tls.TLS_AES_128_GCM_SHA256,
-			NegotiatedProtocol: "h2",
-			ServerName:         "example.com",
-		})
-
-		enc := zapcore.NewMapObjectEncoder()
-		err := state.MarshalLogObject(enc)
-		if err != nil {
-			t.Fatalf("MarshalLogObject() error = %v", err)
-		}
-
-		if enc.Fields["proto"] != "h2" {
-			t.Errorf("proto = %v, want 'h2'", enc.Fields["proto"])
-		}
-		if enc.Fields["server_name"] != "example.com" {
-			t.Errorf("server_name = %v, want 'example.com'", enc.Fields["server_name"])
-		}
-	})
-
-	t.Run("TLS state with peer certificates", func(t *testing.T) {
-		// Skipping detailed cert subject test since x509.Certificate creation
-		// for testing requires complex setup; covered by the no-peer-certs test
-		state := LoggableTLSConnState(tls.ConnectionState{
-			Version:     tls.VersionTLS12,
-			CipherSuite: tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-		})
-
-		enc := zapcore.NewMapObjectEncoder()
-		err := state.MarshalLogObject(enc)
-		if err != nil {
-			t.Fatalf("MarshalLogObject() error = %v", err)
-		}
-
-		if enc.Fields["version"] != uint16(tls.VersionTLS12) {
-			t.Errorf("version = %v, want TLS 1.2", enc.Fields["version"])
-		}
-	})
-
-	t.Run("TLS state without peer certificates", func(t *testing.T) {
-		state := LoggableTLSConnState(tls.ConnectionState{
-			Version: tls.VersionTLS12,
-		})
-
-		enc := zapcore.NewMapObjectEncoder()
-		err := state.MarshalLogObject(enc)
-		if err != nil {
-			t.Fatalf("MarshalLogObject() error = %v", err)
-		}
-
-		// Should not contain client cert fields when no peer certs
-		if _, ok := enc.Fields["client_common_name"]; ok {
-			t.Error("should not have client_common_name without peer certificates")
-		}
-	})
-}
-
-func TestLoggableHTTPHeaderCaseInsensitivity(t *testing.T) {
-	// HTTP headers should be case-insensitive for redaction
-	h := LoggableHTTPHeader{
-		Header: http.Header{
-			"AUTHORIZATION":       {"Bearer secret"},
-			"cookie":              {"session=abc"},
-			"Proxy-Authorization": {"Basic creds"},
-		},
-		ShouldLogCredentials: false,
-	}
-
-	enc := zapcore.NewMapObjectEncoder()
-	err := h.MarshalLogObject(enc)
-	if err != nil {
-		t.Fatalf("MarshalLogObject() error = %v", err)
-	}
-
-	// All sensitive headers should be redacted regardless of casing
-	// Note: http.Header canonicalizes keys, so "cookie" becomes "Cookie"
-	for key := range enc.Fields {
-		lk := strings.ToLower(key)
-		if lk == "cookie" || lk == "authorization" || lk == "proxy-authorization" {
-			arr, ok := enc.Fields[key].(zapcore.ArrayMarshaler)
-			if !ok {
-				continue
-			}
-			testEnc := &testArrayEncoder{}
-			_ = arr.MarshalLogArray(testEnc)
-			if len(testEnc.items) != 1 || testEnc.items[0] != "REDACTED" {
-				t.Errorf("header %q should be REDACTED, got %v", key, testEnc.items)
-			}
-		}
-	}
-}

modules/caddyhttp/matchers.go

@@ -1562,14 +1562,6 @@ func ParseCaddyfileNestedMatcherSet(d *caddyfile.Dispenser) (caddy.ModuleMap, er
 	// instances of the matcher in this set
 	tokensByMatcherName := make(map[string][]caddyfile.Token)
 	for nesting := d.Nesting(); d.NextArg() || d.NextBlock(nesting); {
-		// if the token is quoted (backtick), treat it as a shorthand
-		// for an expression matcher, same as @named matcher parsing
-		if d.Token().Quoted() {
-			expressionToken := d.Token().Clone()
-			expressionToken.Text = "expression"
-			tokensByMatcherName["expression"] = append(tokensByMatcherName["expression"], expressionToken, d.Token())
-			continue
-		}
 		matcherName := d.Val()
 		tokensByMatcherName[matcherName] = append(tokensByMatcherName[matcherName], d.NextSegment()...)
 	}

modules/caddyhttp/metrics.go

@@ -3,7 +3,6 @@ package caddyhttp
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"strings"
 	"sync"
@@ -11,14 +10,9 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	otelprom "go.opentelemetry.io/contrib/bridges/prometheus"
-	"go.opentelemetry.io/contrib/exporters/autoexport"
-	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
-	"go.opentelemetry.io/otel/sdk/resource"
-	semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
 
 	"github.com/caddyserver/caddy/v2"
-	caddymetrics "github.com/caddyserver/caddy/v2/internal/metrics"
+	"github.com/caddyserver/caddy/v2/internal/metrics"
 )
 
 // Metrics configures metrics observations.
@@ -73,20 +67,10 @@ type Metrics struct {
 	// for production environments exposed to the internet).
 	ObserveCatchallHosts bool `json:"observe_catchall_hosts,omitempty"`
 
-	// Enable pushing metrics via OTLP in addition to the existing Prometheus
-	// scrape endpoints. When set, a PeriodicReader is attached to the shared
-	// Prometheus registry (via a Prometheus -> OpenTelemetry bridge), and the
-	// exporter is autoconfigured from the standard OTEL_* environment
-	// variables (OTEL_EXPORTER_OTLP_ENDPOINT, OTEL_EXPORTER_OTLP_PROTOCOL,
-	// OTEL_METRICS_EXPORTER, ...). Set OTEL_METRICS_EXPORTER=none or simply
-	// keep this field false to disable OTLP export.
-	OTLP bool `json:"otlp,omitempty"`
-
 	init           sync.Once
 	httpMetrics    *httpMetrics
 	allowedHosts   map[string]struct{}
 	hasHTTPSServer bool
-	meterProvider  *sdkmetric.MeterProvider
 }
 
 type httpMetrics struct {
@@ -163,70 +147,6 @@ func initHTTPMetrics(ctx caddy.Context, metrics *Metrics) {
 	}, httpLabels)
 }
 
-// provisionOTLP wires a MeterProvider that periodically reads the process-wide
-// Prometheus registry and pushes the result via OTLP. The exporter and reader
-// are autoconfigured from the standard OTEL_* environment variables, matching
-// the ergonomics of the existing `tracing` directive. It is a no-op when
-// m.OTLP is false, and honors OTEL_METRICS_EXPORTER=none (autoexport
-// short-circuits to a no-op reader in that case).
-func (m *Metrics) provisionOTLP(ctx caddy.Context) error {
-	if !m.OTLP {
-		return nil
-	}
-
-	// Register a Prometheus -> OpenTelemetry bridge against the process-wide
-	// Prometheus registry as the *default* source the NewMetricReader below
-	// will read from.
-	//
-	// NB: despite the "With*" naming, autoexport.WithFallbackMetricProducer is
-	// a package-level setter (it returns nothing) — it mutates autoexport's
-	// internal producer registry and takes effect on the very next call to
-	// NewMetricReader. It is NOT a MetricOption and must not be passed as one.
-	// Users can still override the source by setting OTEL_METRICS_PRODUCERS.
-	reg := ctx.GetMetricsRegistry()
-	autoexport.WithFallbackMetricProducer(func(context.Context) (sdkmetric.Producer, error) {
-		return otelprom.NewMetricProducer(otelprom.WithGatherer(reg)), nil
-	})
-
-	reader, err := autoexport.NewMetricReader(ctx)
-	if err != nil {
-		return fmt.Errorf("creating OTLP metric reader: %w", err)
-	}
-
-	version, _ := caddy.Version()
-	res, err := resource.Merge(resource.Default(), resource.NewSchemaless(
-		semconv.WebEngineName(ServerHeader),
-		semconv.WebEngineVersion(version),
-	))
-	if err != nil {
-		return fmt.Errorf("building OTLP metrics resource: %w", err)
-	}
-
-	m.meterProvider = sdkmetric.NewMeterProvider(
-		sdkmetric.WithResource(res),
-		sdkmetric.WithReader(reader),
-	)
-
-	return nil
-}
-
-// shutdown flushes and tears down the OTLP MeterProvider if one was provisioned.
-// Both ForceFlush and Shutdown are always attempted so that a flush failure
-// does not prevent the reader goroutines from being stopped; errors from both
-// are returned joined.
-func (m *Metrics) shutdown(ctx context.Context) error {
-	if m == nil || m.meterProvider == nil {
-		return nil
-	}
-
-	// ForceFlush gives the final collection a chance to reach the collector
-	// before the reader goroutine is stopped by Shutdown.
-	return errors.Join(
-		m.meterProvider.ForceFlush(ctx),
-		m.meterProvider.Shutdown(ctx),
-	)
-}
-
 // scanConfigForHosts scans the HTTP app configuration to build a set of allowed hosts
 // for metrics collection, similar to how auto-HTTPS scans for domain names.
 func (m *Metrics) scanConfigForHosts(app *App) {
@@ -314,7 +234,7 @@ func newMetricsInstrumentedRoute(ctx caddy.Context, handler string, next Handler
 func (h *metricsInstrumentedRoute) ServeHTTP(w http.ResponseWriter, r *http.Request) error {
 	server := serverNameFromContext(r.Context())
 	labels := prometheus.Labels{"server": server, "handler": h.handler}
-	method := caddymetrics.SanitizeMethod(r.Method)
+	method := metrics.SanitizeMethod(r.Method)
 	// the "code" value is set later, but initialized here to eliminate the possibility
 	// of a panic
 	statusLabels := prometheus.Labels{"server": server, "handler": h.handler, "method": method, "code": ""}
@@ -344,7 +264,7 @@ func (h *metricsInstrumentedRoute) ServeHTTP(w http.ResponseWriter, r *http.Requ
 	// being called when the headers are written.
 	// Effectively the same behaviour as promhttp.InstrumentHandlerTimeToWriteHeader.
 	writeHeaderRecorder := ShouldBufferFunc(func(status int, header http.Header) bool {
-		statusLabels["code"] = caddymetrics.SanitizeCode(status)
+		statusLabels["code"] = metrics.SanitizeCode(status)
 		ttfb := time.Since(start).Seconds()
 		h.metrics.httpMetrics.responseDuration.With(statusLabels).Observe(ttfb)
 		return false
@@ -360,7 +280,7 @@ func (h *metricsInstrumentedRoute) ServeHTTP(w http.ResponseWriter, r *http.Requ
 		if statusLabels["code"] == "" {
 			// we still sanitize it, even though it's likely to be 0. A 200 is
 			// returned on fallthrough so we want to reflect that.
-			statusLabels["code"] = caddymetrics.SanitizeCode(status)
+			statusLabels["code"] = metrics.SanitizeCode(status)
 		}
 
 		h.metrics.httpMetrics.requestDuration.With(statusLabels).Observe(dur)

modules/caddyhttp/metrics_test.go

@@ -523,56 +523,6 @@ func TestMetricsInstrumentedRoute(t *testing.T) {
 	}
 }
 
-func TestMetricsProvisionOTLPDisabled(t *testing.T) {
-	ctx, _ := caddy.NewContext(caddy.Context{Context: context.Background()})
-
-	m := &Metrics{OTLP: false}
-
-	if err := m.provisionOTLP(ctx); err != nil {
-		t.Fatalf("provisionOTLP returned unexpected error: %v", err)
-	}
-	if m.meterProvider != nil {
-		t.Fatalf("meterProvider should remain nil when OTLP is disabled")
-	}
-
-	// shutdown must be safe on a never-provisioned Metrics.
-	if err := m.shutdown(context.Background()); err != nil {
-		t.Fatalf("shutdown returned unexpected error: %v", err)
-	}
-}
-
-func TestMetricsProvisionOTLPNoopExporter(t *testing.T) {
-	// OTEL_METRICS_EXPORTER=none makes autoexport return its built-in
-	// no-op reader, which avoids any network I/O while still exercising
-	// the full provisionOTLP -> shutdown lifecycle.
-	t.Setenv("OTEL_METRICS_EXPORTER", "none")
-
-	ctx, _ := caddy.NewContext(caddy.Context{Context: context.Background()})
-
-	m := &Metrics{OTLP: true}
-
-	if err := m.provisionOTLP(ctx); err != nil {
-		t.Fatalf("provisionOTLP returned unexpected error: %v", err)
-	}
-	if m.meterProvider == nil {
-		t.Fatalf("provisionOTLP did not create a MeterProvider")
-	}
-
-	if err := m.shutdown(context.Background()); err != nil {
-		t.Fatalf("shutdown returned unexpected error: %v", err)
-	}
-}
-
-// shutdown on a nil receiver is a convenience so App.Stop can call it
-// without guarding against app.Metrics being unset.
-func TestMetricsShutdownNilReceiver(t *testing.T) {
-	var m *Metrics
-
-	if err := m.shutdown(context.Background()); err != nil {
-		t.Fatalf("shutdown on nil Metrics returned unexpected error: %v", err)
-	}
-}
-
 func BenchmarkMetricsInstrumentedRoute(b *testing.B) {
 	ctx, _ := caddy.NewContext(caddy.Context{Context: context.Background()})
 	m := &Metrics{

modules/caddyhttp/replacer.go

@@ -387,14 +387,17 @@ func addHTTPVarsToReplacer(repl *caddy.Replacer, req *http.Request, w http.Respo
 		switch key {
 		case "http.shutting_down":
 			server := req.Context().Value(ServerCtxKey).(*Server)
-			return server.shutdownAt.Load() != nil, true
+			server.shutdownAtMu.RLock()
+			defer server.shutdownAtMu.RUnlock()
+			return !server.shutdownAt.IsZero(), true
 		case "http.time_until_shutdown":
 			server := req.Context().Value(ServerCtxKey).(*Server)
-			t := server.shutdownAt.Load()
-			if t == nil {
+			server.shutdownAtMu.RLock()
+			defer server.shutdownAtMu.RUnlock()
+			if server.shutdownAt.IsZero() {
 				return nil, true
 			}
-			return time.Until(*t), true
+			return time.Until(server.shutdownAt), true
 		}
 
 		return nil, false

modules/caddyhttp/reverseproxy/caddyfile.go

@@ -67,7 +67,7 @@ func parseCaddyfile(h httpcaddyfile.Helper) (caddyhttp.MiddlewareHandler, error)
 //	    lb_retries <retries>
 //	    lb_try_duration <duration>
 //	    lb_try_interval <interval>
-//	    lb_retry_match <matcher>
+//	    lb_retry_match <request-matcher>
 //
 //	    # active health checking
 //	    health_uri          <uri>

modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go

@@ -28,6 +28,8 @@ import (
 
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	"golang.org/x/text/language"
+	"golang.org/x/text/search"
 
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
@@ -416,19 +418,14 @@ func (t Transport) buildEnv(r *http.Request) (envVars, error) {
 	return env, nil
 }
 
+var splitSearchNonASCII = search.New(language.Und, search.IgnoreCase)
+
 // splitPos returns the index where path should
 // be split based on t.SplitPath.
 //
 // example: if splitPath is [".php"]
 // "/path/to/script.php/some/path": ("/path/to/script.php", "/some/path")
 //
-// Matching is strictly ASCII case-insensitive. Bytes >= utf8.RuneSelf in path
-// never match any split entry: split strings are validated ASCII-only and
-// lower-cased in Provision(), so any Unicode equivalence (e.g. fullwidth or
-// mathematical letters folding to ASCII) would let an attacker upload a file
-// whose name contains such code points and have it served as PHP. See
-// FrankenPHP advisories GHSA-3g8v-8r37-cgjm and GHSA-v4h7-cj44-8fc8.
-//
 // Adapted from FrankenPHP's code (copyright 2026 Kévin Dunglas, MIT license)
 func (t Transport) splitPos(path string) int {
 	// TODO: from v1...
@@ -441,18 +438,31 @@ func (t Transport) splitPos(path string) int {
 
 	pathLen := len(path)
 
+	// We are sure that split strings are all ASCII-only and lower-case because of validation and normalization in Provision().
 	for _, split := range t.SplitPath {
 		splitLen := len(split)
-		if splitLen == 0 || splitLen > pathLen {
-			continue
-		}
 
-		for i := 0; i <= pathLen-splitLen; i++ {
+		for i := range pathLen {
+			if path[i] >= utf8.RuneSelf {
+				if _, end := splitSearchNonASCII.IndexString(path, split); end > -1 {
+					return end
+				}
+
+				break
+			}
+
+			if i+splitLen > pathLen {
+				continue
+			}
+
 			match := true
 			for j := range splitLen {
 				c := path[i+j]
+
 				if c >= utf8.RuneSelf {
-					match = false
+					if _, end := splitSearchNonASCII.IndexString(path, split); end > -1 {
+						return end
+					}
 
 					break
 				}

modules/caddyhttp/reverseproxy/fastcgi/fastcgi_test.go

@@ -191,65 +191,6 @@ func TestSplitPos(t *testing.T) {
 			splitPath: []string{".php"},
 			wantPos:   9,
 		},
-		// Regression tests adapted from FrankenPHP advisories
-		// GHSA-3g8v-8r37-cgjm and GHSA-v4h7-cj44-8fc8: search.IgnoreCase
-		// matched Unicode equivalents of ASCII letters as ".php", and an
-		// inner non-ASCII byte path could leave the match flag stale.
-		{
-			name:      "non-ascii byte after dot must not match",
-			path:      "/PoC-match-unset.¡.txt",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "non-ascii byte mid-extension must not match",
-			path:      "/script.p\xc2\xa1p",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "small full stop ﹒ in extension must not match",
-			path:      "/shell﹒php",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "fullwidth full stop ． in extension must not match",
-			path:      "/shell．php",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "fullwidth p in extension must not match",
-			path:      "/shell.ｐhp",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "circled php must not match",
-			path:      "/shell.ⓟⓗⓟ",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "mathematical sans-serif bold php must not match",
-			path:      "/shell.\U0001D5FD\U0001D5F5\U0001D5FD",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "mathematical script php must not match",
-			path:      "/shell.\U0001D4C5\U0001D4BD\U0001D4C5",
-			splitPath: []string{".php"},
-			wantPos:   -1,
-		},
-		{
-			name:      "circled php with later real php still picks the real one",
-			path:      "/shell.ⓟⓗⓟ.anything-after-payload.php",
-			splitPath: []string{".php"},
-			// "/shell." (7) + "ⓟⓗⓟ" (3*3 bytes) + ".anything-after-payload.php" (27) = 43
-			wantPos: 43,
-		},
 	}
 
 	for _, tt := range tests {
@@ -303,31 +244,3 @@ func TestSplitPosUnicodeSecurityRegression(t *testing.T) {
 		assert.Equal(t, ".txt.php", pathInfo, "path info should be the remainder after first .php")
 	}
 }
-
-// TestSplitPosSecurityRegressionUnicodeBypass guards against the FrankenPHP
-// advisories GHSA-3g8v-8r37-cgjm (uninitialized match flag on inner non-ASCII
-// byte) and GHSA-v4h7-cj44-8fc8 (Unicode equivalence via search.IgnoreCase
-// folding fullwidth/mathematical/circled letters onto ASCII). Every payload
-// below produced a false positive in the vulnerable implementation; none
-// must match here.
-func TestSplitPosSecurityRegressionUnicodeBypass(t *testing.T) {
-	t.Parallel()
-
-	tr := Transport{SplitPath: []string{".php"}}
-	payloads := []string{
-		"/PoC-match-unset.¡.txt",                // GHSA-3g8v: stale match=true on IndexString fallback
-		"/shell﹒php",                            // U+FE52 small full stop
-		"/shell．php",                            // U+FF0E fullwidth full stop
-		"/shell.ｐhp",                            // U+FF50 fullwidth p
-		"/shell.pｈp",                            // U+FF48 fullwidth h
-		"/shell.phｐ",                            // U+FF50 fullwidth p (trailing)
-		"/shell.\U0001D5C1\U0001D5B5\U0001D5C1", // mathematical sans-serif p/h
-		"/shell.\U0001D5FD\U0001D5F5\U0001D5FD", // mathematical sans-serif bold p/h
-		"/shell.\U0001D4C5\U0001D4BD\U0001D4C5", // mathematical script p/h
-		"/shell.ⓟⓗⓟ",                            // circled latin small
-	}
-
-	for _, p := range payloads {
-		assert.Equalf(t, -1, tr.splitPos(p), "payload %q must not be detected as .php", p)
-	}
-}

modules/caddyhttp/reverseproxy/hosts.go

@@ -174,7 +174,7 @@ func (u *Upstream) fillDynamicHost() {
 // Host is the basic, in-memory representation of the state of a remote host.
 // Its fields are accessed atomically and Host values must not be copied.
 type Host struct {
-	numRequests  atomic.Int64
+	numRequests  atomic.Int64 // atomic.Int64 is automatically aligned for us (see https://golang.org/pkg/sync/atomic/#pkg-note-BUG)
 	fails        atomic.Int64
 	activePasses atomic.Int64
 	activeFails  atomic.Int64
@@ -250,6 +250,7 @@ func (h *Host) resetHealth() {
 // (This returns the status only from the "active" health checks.)
 func (u *Upstream) healthy() bool {
 	return u.unhealthy.Load() == 0
+	// return atomic.LoadInt32(&u.unhealthy) == 0
 }
 
 // SetHealthy sets the upstream has healthy or unhealthy

modules/caddyhttp/reverseproxy/retries_test.go

@@ -1,7 +1,6 @@
 package reverseproxy
 
 import (
-	"context"
 	"errors"
 	"io"
 	"net"
@@ -9,13 +8,11 @@ import (
 	"net/http/httptest"
 	"strings"
 	"sync"
-	"sync/atomic"
 	"testing"
 
 	"go.uber.org/zap"
 
 	"github.com/caddyserver/caddy/v2"
-	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
 	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
 )
 
@@ -258,530 +255,3 @@ func TestDialErrorBodyRetry(t *testing.T) {
 		})
 	}
 }
-
-// newExpressionMatcher provisions a MatchExpression for use in tests
-func newExpressionMatcher(t *testing.T, expr string) *caddyhttp.MatchExpression {
-	t.Helper()
-	ctx, cancel := caddy.NewContext(caddy.Context{Context: context.Background()})
-	t.Cleanup(cancel)
-	m := &caddyhttp.MatchExpression{Expr: expr}
-	if err := m.Provision(ctx); err != nil {
-		t.Fatalf("failed to provision expression %q: %v", expr, err)
-	}
-	return m
-}
-
-// minimalHandlerWithRetryMatch is like minimalHandler but also configures
-// RetryMatch so that response-based retry can be tested
-func minimalHandlerWithRetryMatch(retries int, retryMatch caddyhttp.MatcherSets, upstreams ...*Upstream) *Handler {
-	h := minimalHandler(retries, upstreams...)
-	h.LoadBalancing.RetryMatch = retryMatch
-	return h
-}
-
-// TestResponseRetryStatusCode verifies that when an upstream returns a status
-// code matching a retry_match expression, the request is retried on the next
-// upstream
-func TestResponseRetryStatusCode(t *testing.T) {
-	// Bad upstream: returns 502
-	badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusBadGateway)
-	}))
-	t.Cleanup(badServer.Close)
-
-	// Good upstream: returns 200
-	goodServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("ok"))
-	}))
-	t.Cleanup(goodServer.Close)
-
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, "{http.reverse_proxy.status_code} in [502, 503]"),
-		},
-	}
-
-	// RoundRobin picks index 1 first, then 0
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: goodServer.Listener.Addr().String()},
-		{Host: new(Host), Dial: badServer.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(1, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	err := h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-
-	gotStatus := rec.Code
-	if err != nil {
-		if herr, ok := err.(caddyhttp.HandlerError); ok {
-			gotStatus = herr.StatusCode
-		}
-	}
-
-	if gotStatus != http.StatusOK {
-		t.Errorf("status: got %d, want %d (err=%v)", gotStatus, http.StatusOK, err)
-	}
-}
-
-// TestResponseRetryHeader verifies that response header matching triggers
-// retries via a CEL expression checking {rp.header.*}
-func TestResponseRetryHeader(t *testing.T) {
-	// Bad upstream: returns 200 but with X-Upstream-Retry header
-	badServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("X-Upstream-Retry", "true")
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("bad"))
-	}))
-	t.Cleanup(badServer.Close)
-
-	// Good upstream: returns 200 without retry header
-	goodServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("good"))
-	}))
-	t.Cleanup(goodServer.Close)
-
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, `{http.reverse_proxy.header.X-Upstream-Retry} == "true"`),
-		},
-	}
-
-	// RoundRobin picks index 1 first, then 0
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: goodServer.Listener.Addr().String()},
-		{Host: new(Host), Dial: badServer.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(1, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	err := h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	if rec.Code != http.StatusOK {
-		t.Errorf("status: got %d, want %d", rec.Code, http.StatusOK)
-	}
-	if rec.Body.String() != "good" {
-		t.Errorf("body: got %q, want %q (retried to wrong upstream)", rec.Body.String(), "good")
-	}
-}
-
-// TestResponseRetryNoMatchNoRetry verifies that when no retry_match entries
-// match the response, the original response is returned without retrying
-func TestResponseRetryNoMatchNoRetry(t *testing.T) {
-	var hits atomic.Int32
-
-	// Server that returns 500 - but retry_match only matches 502/503
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hits.Add(1)
-		w.WriteHeader(http.StatusInternalServerError)
-	}))
-	t.Cleanup(server.Close)
-
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, "{http.reverse_proxy.status_code} in [502, 503]"),
-		},
-	}
-
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(2, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	_ = h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-
-	// Only one hit - no retry since 500 doesn't match [502, 503]
-	if hits.Load() != 1 {
-		t.Errorf("upstream hits: got %d, want 1 (should not have retried)", hits.Load())
-	}
-}
-
-// TestResponseRetryExhaustedPreservesStatusCode verifies that when retries
-// are exhausted, the actual upstream status code (e.g. 503) is reported
-// to the client, not a generic 502
-func TestResponseRetryExhaustedPreservesStatusCode(t *testing.T) {
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusServiceUnavailable) // 503
-	}))
-	t.Cleanup(server.Close)
-
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, "{http.reverse_proxy.status_code} == 503"),
-		},
-	}
-
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(1, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	err := h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-
-	gotStatus := rec.Code
-	if err != nil {
-		if herr, ok := err.(caddyhttp.HandlerError); ok {
-			gotStatus = herr.StatusCode
-		}
-	}
-
-	// Must return 503 (actual upstream status), not 502 (generic proxy error)
-	if gotStatus != http.StatusServiceUnavailable {
-		t.Errorf("status: got %d, want %d (status code not preserved)", gotStatus, http.StatusServiceUnavailable)
-	}
-}
-
-// TestResponseRetryHeaderCleanup verifies that stale response header
-// placeholders from a previous upstream attempt are cleaned up before the
-// next retry evaluation. Without cleanup, a header like X-Retry: true from
-// upstream A would leak into the retry match for upstream B even if B does
-// not set that header
-func TestResponseRetryHeaderCleanup(t *testing.T) {
-	// First upstream: returns 200 with X-Retry header (triggers retry)
-	firstServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("X-Retry", "true")
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("first"))
-	}))
-	t.Cleanup(firstServer.Close)
-
-	// Second upstream: returns 200 WITHOUT X-Retry header (should NOT retry)
-	secondServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("second"))
-	}))
-	t.Cleanup(secondServer.Close)
-
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, `{http.reverse_proxy.header.X-Retry} == "true"`),
-		},
-	}
-
-	// RoundRobin picks index 1 first, then 0
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: secondServer.Listener.Addr().String()},
-		{Host: new(Host), Dial: firstServer.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(2, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	err := h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Should get "second" - the first upstream's X-Retry header must not
-	// leak into the second upstream's retry evaluation
-	if rec.Body.String() != "second" {
-		t.Errorf("body: got %q, want %q (stale header leaked between retries)", rec.Body.String(), "second")
-	}
-}
-
-// TestRequestOnlyMatcherDoesNotRetryResponses verifies that a pure request
-// matcher like method PUT in lb_retry_match does NOT trigger response-based
-// retries. Only expression matchers (which can reference response data)
-// should trigger response retries
-func TestRequestOnlyMatcherDoesNotRetryResponses(t *testing.T) {
-	var hits atomic.Int32
-
-	// Server returns 200 OK for all requests
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hits.Add(1)
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("ok"))
-	}))
-	t.Cleanup(server.Close)
-
-	// method PUT matcher - should NOT trigger response retries
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			caddyhttp.MatchMethod{"PUT"},
-		},
-	}
-
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(2, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodPut, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	err := h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	// Should hit only once - no retry for 200 OK even though method matches
-	if hits.Load() != 1 {
-		t.Errorf("upstream hits: got %d, want 1 (should not retry successful responses)", hits.Load())
-	}
-	if rec.Code != http.StatusOK {
-		t.Errorf("status: got %d, want %d", rec.Code, http.StatusOK)
-	}
-}
-
-// brokenUpstreamAddr returns the address of a TCP listener that accepts
-// connections but immediately closes them, causing a transport error (not
-// a dial error). This simulates an upstream that is reachable but broken
-func brokenUpstreamAddr(t *testing.T) string {
-	t.Helper()
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to listen: %v", err)
-	}
-	t.Cleanup(func() { ln.Close() })
-	go func() {
-		for {
-			conn, err := ln.Accept()
-			if err != nil {
-				return
-			}
-			conn.Close()
-		}
-	}()
-	return ln.Addr().String()
-}
-
-// TestTransportErrorPlaceholder verifies that the is_transport_error
-// placeholder is set to true during transport error evaluation in tryAgain()
-// and that expression matchers using {rp.is_transport_error} can match it
-func TestTransportErrorPlaceholder(t *testing.T) {
-	broken := brokenUpstreamAddr(t)
-
-	goodServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.Write([]byte("ok"))
-	}))
-	t.Cleanup(goodServer.Close)
-
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, "{http.reverse_proxy.is_transport_error} == true"),
-		},
-	}
-
-	// RoundRobin picks index 1 first (broken), then 0 (good)
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: goodServer.Listener.Addr().String()},
-		{Host: new(Host), Dial: broken},
-	}
-
-	h := minimalHandlerWithRetryMatch(1, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodPost, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	err := h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-
-	gotStatus := rec.Code
-	if err != nil {
-		if herr, ok := err.(caddyhttp.HandlerError); ok {
-			gotStatus = herr.StatusCode
-		}
-	}
-
-	// POST transport error should be retried because is_transport_error matched
-	if gotStatus != http.StatusOK {
-		t.Errorf("status: got %d, want %d (transport error should have been retried)", gotStatus, http.StatusOK)
-	}
-}
-
-// TestTransportErrorPlaceholderNotSetForResponses verifies that the
-// is_transport_error placeholder is NOT set when evaluating response
-// matchers, so {rp.is_transport_error} is false for response retries
-func TestTransportErrorPlaceholderNotSetForResponses(t *testing.T) {
-	var hits atomic.Int32
-
-	// Server returns 502 - but the matcher only checks is_transport_error
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hits.Add(1)
-		w.WriteHeader(http.StatusBadGateway)
-	}))
-	t.Cleanup(server.Close)
-
-	// Only matches transport errors, not response errors
-	retryMatch := caddyhttp.MatcherSets{
-		caddyhttp.MatcherSet{
-			newExpressionMatcher(t, "{http.reverse_proxy.is_transport_error} == true"),
-		},
-	}
-
-	upstreams := []*Upstream{
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-		{Host: new(Host), Dial: server.Listener.Addr().String()},
-	}
-
-	h := minimalHandlerWithRetryMatch(2, retryMatch, upstreams...)
-
-	req := httptest.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-
-	_ = h.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-
-	// Should hit only once - is_transport_error is false during response
-	// evaluation so the 502 is NOT retried
-	if hits.Load() != 1 {
-		t.Errorf("upstream hits: got %d, want 1 (is_transport_error should be false for responses)", hits.Load())
-	}
-}
-
-// TestRetryMatchAllowsExpressionMixedWithOtherMatchers verifies that
-// lb_retry_match accepts a block mixing expression with other matchers
-func TestRetryMatchAllowsExpressionMixedWithOtherMatchers(t *testing.T) {
-	tests := []struct {
-		name  string
-		input string
-	}{
-		{
-			name: "expression alone",
-			input: `reverse_proxy localhost:9080 {
-				lb_retry_match {
-					expression ` + "`{rp.status_code} in [502, 503]`" + `
-				}
-			}`,
-		},
-		{
-			name: "method alone",
-			input: `reverse_proxy localhost:9080 {
-				lb_retry_match {
-					method PUT
-				}
-			}`,
-		},
-		{
-			name: "expression mixed with method",
-			input: `reverse_proxy localhost:9080 {
-				lb_retry_match {
-					method POST
-					expression ` + "`{rp.status_code} in [502, 503]`" + `
-				}
-			}`,
-		},
-		{
-			name: "expression mixed with path",
-			input: `reverse_proxy localhost:9080 {
-				lb_retry_match {
-					path /api*
-					expression ` + "`{rp.status_code} == 502`" + `
-				}
-			}`,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			h := &Handler{}
-			d := caddyfile.NewTestDispenser(tc.input)
-			err := h.UnmarshalCaddyfile(d)
-			if err != nil {
-				t.Errorf("unexpected error: %v", err)
-			}
-		})
-	}
-}
-
-// TestSubrouteErrorFallbackWithBody is similar to TestDialErrorBodyRetry but
-// mimics Subroute's Error handler rather than testing retries specifically
-func TestSubrouteErrorFallbackWithBody(t *testing.T) {
-	// Good upstream: echoes the request body with 200 OK.
-	goodServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		body, err := io.ReadAll(r.Body)
-		if err != nil {
-			http.Error(w, "read body: "+err.Error(), http.StatusInternalServerError)
-			return
-		}
-		w.WriteHeader(http.StatusOK)
-		_, err = w.Write(body)
-		if err != nil {
-			t.Errorf("error writing in good server: %v", err)
-		}
-	}))
-	t.Cleanup(goodServer.Close)
-
-	// Handler which will dial error
-	badProxy := minimalHandler(0, &Upstream{Host: new(Host), Dial: deadUpstreamAddr(t)})
-
-	bodyReader := newCloseOnCloseReader("hello world")
-	req := httptest.NewRequest("POST", "http://localhost/", bodyReader)
-	// httptest.NewRequest wraps the reader in NopCloser; replace
-	// it with our close-aware reader so Close() is propagated.
-	req.Body = bodyReader
-
-	req = prepareTestRequest(req)
-	rec := httptest.NewRecorder()
-	err := badProxy.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-	if err == nil {
-		t.Fatalf("Expected error from badProxy.ServeHTTP")
-	}
-
-	// Simulate the Subroute's Error handler by calling another handler with the
-	// same request and recorder
-	goodProxy := minimalHandler(0, &Upstream{Host: new(Host), Dial: goodServer.Listener.Addr().String()})
-	err = goodProxy.ServeHTTP(rec, req, caddyhttp.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
-		return nil
-	}))
-
-	if err != nil {
-		t.Fatalf("Expected no error from goodProxy.ServeHTTP, got: %v", err)
-	}
-	if rec.Code != http.StatusOK {
-		t.Errorf("status: got %d, want %d", rec.Code, http.StatusOK)
-	}
-	expectedBody := "hello world"
-	if rec.Body.String() != expectedBody {
-		t.Errorf("body: got %q, want %q", rec.Body.String(), expectedBody)
-	}
-}

modules/caddyhttp/reverseproxy/reverseproxy.go

@@ -488,19 +488,20 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
 	reqHost := clonedReq.Host
 	reqHeader := clonedReq.Header
 
-	// If the request contained a body, wrap it in io.NopCloser
-	// to prevent Go's transport from closing it on dial errors.
-	// cloneRequest does a shallow copy, so clonedReq.Body and
+	// When retries are configured and there is a body, wrap it in
+	// io.NopCloser to prevent Go's transport from closing it on dial
+	// errors. cloneRequest does a shallow copy, so clonedReq.Body and
 	// r.Body share the same io.ReadCloser — a dial-failure Close()
-	// would kill the original body for all subsequent retry
-	// attempts or subsequent handlers. The real body is closed by
-	// the HTTP server when the handler returns.
+	// would kill the original body for all subsequent retry attempts.
+	// The real body is closed by the HTTP server when the handler
+	// returns.
 	//
 	// If the body was already fully buffered (via request_buffers),
 	// we also extract the buffer so the retry loop can replay it
-	// from the beginning on each attempt. (see #6259, #7546, #7713)
+	// from the beginning on each attempt. (see #6259, #7546)
 	var bufferedReqBody *bytes.Buffer
-	if clonedReq.Body != nil {
+	if clonedReq.Body != nil && h.LoadBalancing != nil &&
+		(h.LoadBalancing.Retries > 0 || h.LoadBalancing.TryDuration > 0) {
 		if reqBodyBuf, ok := clonedReq.Body.(bodyReadCloser); ok && reqBodyBuf.body == nil && reqBodyBuf.buf != nil {
 			bufferedReqBody = reqBodyBuf.buf
 			reqBodyBuf.buf = nil
@@ -573,17 +574,6 @@ func (h *Handler) proxyLoopIteration(r *http.Request, origReq *http.Request, w h
 	// get the updated list of upstreams
 	upstreams := h.Upstreams
 	if h.DynamicUpstreams != nil {
-		if retries > 0 {
-			// after a failure (and thus during a retry), give dynamic upstream modules an opportunity
-			// to purge their relevant cache entries so we don't keep retrying bad upstreams
-			if cachingDynamicUpstreams, ok := h.DynamicUpstreams.(CachingUpstreamSource); ok {
-				if err := cachingDynamicUpstreams.ResetCache(r); err != nil {
-					if c := h.logger.Check(zapcore.ErrorLevel, "failed clearing dynamic upstream source's cache"); c != nil {
-						c.Write(zap.Error(err))
-					}
-				}
-			}
-		}
 		dUpstreams, err := h.DynamicUpstreams.GetUpstreams(r)
 		if err != nil {
 			if c := h.logger.Check(zapcore.ErrorLevel, "failed getting dynamic upstreams; falling back to static upstreams"); c != nil {
@@ -680,12 +670,8 @@ func (h *Handler) proxyLoopIteration(r *http.Request, origReq *http.Request, w h
 		return true, succ.error
 	}
 
-	// remember this failure (if enabled); response-based retries
-	// are not counted as failures since the upstream did respond
-	// successfully - only the response content triggered a retry
-	if _, isRetryableResponse := proxyErr.(retryableResponseError); !isRetryableResponse {
-		h.countFailure(upstream)
-	}
+	// remember this failure (if enabled)
+	h.countFailure(upstream)
 
 	// if we've tried long enough, break
 	if !h.LoadBalancing.tryAgain(h.ctx, start, retries, proxyErr, r, h.logger) {
@@ -1069,45 +1055,6 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, origRe
 		res.Body, _ = h.bufferedBody(res.Body, h.ResponseBuffers)
 	}
 
-	// set response placeholders so they can be used in retry match
-	// expressions and handle_response routes; clear stale header
-	// placeholders from a previous attempt first so they don't
-	// leak into the next retry evaluation
-	repl.DeleteByPrefix("http.reverse_proxy.header.")
-	for field, value := range res.Header {
-		repl.Set("http.reverse_proxy.header."+field, strings.Join(value, ","))
-	}
-	repl.Set("http.reverse_proxy.status_code", res.StatusCode)
-	repl.Set("http.reverse_proxy.status_text", res.Status)
-
-	// check if the response matches a retry match entry; if so,
-	// close the body and return a retryable error so the request
-	// is retried with the next upstream. Only evaluate matcher sets
-	// that contain at least one expression matcher, since those are
-	// the ones that can reference response data ({rp.status_code},
-	// {rp.header.*}). Pure request-only matchers (method, path, etc.)
-	// are skipped to avoid retrying every response that matches a
-	// request condition
-	if h.LoadBalancing != nil && len(h.LoadBalancing.RetryMatch) > 0 {
-		for _, matcherSet := range h.LoadBalancing.RetryMatch {
-			if !matcherSetHasExpressionMatcher(matcherSet) {
-				continue
-			}
-			match, err := matcherSet.MatchWithError(req)
-			if err != nil {
-				h.logger.Error("error matching request for retry", zap.Error(err))
-				break
-			}
-			if match {
-				res.Body.Close()
-				return retryableResponseError{
-					error:      fmt.Errorf("upstream response matched retry_match (status %d)", res.StatusCode),
-					statusCode: res.StatusCode,
-				}
-			}
-		}
-	}
-
 	// see if any response handler is configured for this response from the backend
 	for i, rh := range h.HandleResponse {
 		if rh.Match != nil && !rh.Match.Match(res.StatusCode, res.Header) {
@@ -1127,6 +1074,14 @@ func (h *Handler) reverseProxy(rw http.ResponseWriter, req *http.Request, origRe
 			break
 		}
 
+		// set up the replacer so that parts of the original response can be
+		// used for routing decisions
+		for field, value := range res.Header {
+			repl.Set("http.reverse_proxy.header."+field, strings.Join(value, ","))
+		}
+		repl.Set("http.reverse_proxy.status_code", res.StatusCode)
+		repl.Set("http.reverse_proxy.status_text", res.Status)
+
 		if c := logger.Check(zapcore.DebugLevel, "handling response"); c != nil {
 			c.Write(zap.Int("handler", i))
 		}
@@ -1311,29 +1266,18 @@ func (lb LoadBalancing) tryAgain(ctx caddy.Context, start time.Time, retries int
 	// specifically a dialer error, we need to be careful
 	if proxyErr != nil {
 		_, isDialError := proxyErr.(DialError)
-		_, isRetryableResponse := proxyErr.(retryableResponseError)
 		herr, isHandlerError := proxyErr.(caddyhttp.HandlerError)
 
 		// if the error occurred after a connection was established,
 		// we have to assume the upstream received the request, and
 		// retries need to be carefully decided, because some requests
-		// are not idempotent; retryableResponseError is excluded here
-		// because its retry decision was already made in reverseProxy()
-		// when the response matchers were evaluated
-		if !isDialError && !isRetryableResponse && (!isHandlerError || !errors.Is(herr, errNoUpstream)) {
+		// are not idempotent
+		if !isDialError && (!isHandlerError || !errors.Is(herr, errNoUpstream)) {
 			if lb.RetryMatch == nil && req.Method != "GET" {
 				// by default, don't retry requests if they aren't GET
 				return false
 			}
 
-			// set transport error flag so CEL expressions can use
-			// {rp.is_transport_error} to decide whether to retry
-			repl, _ := req.Context().Value(caddy.ReplacerCtxKey).(*caddy.Replacer)
-			if repl != nil {
-				repl.Set("http.reverse_proxy.is_transport_error", true)
-				defer repl.Delete("http.reverse_proxy.is_transport_error")
-			}
-
 			match, err := lb.RetryMatch.AnyMatchWithError(req)
 			if err != nil {
 				logger.Error("error matching request for retry", zap.Error(err))
@@ -1563,12 +1507,6 @@ func removeConnectionHeaders(h http.Header) {
 
 // statusError returns an error value that has a status code.
 func statusError(err error) error {
-	// if a response-based retry was exhausted, use the actual upstream
-	// status code instead of a generic 502
-	if rre, ok := err.(retryableResponseError); ok {
-		return caddyhttp.Error(rre.statusCode, err)
-	}
-
 	// errors proxying usually mean there is a problem with the upstream(s)
 	statusCode := http.StatusBadGateway
 
@@ -1620,15 +1558,13 @@ type LoadBalancing struct {
 	// to spin if all backends are down and latency is very low.
 	TryInterval caddy.Duration `json:"try_interval,omitempty"`
 
-	// A list of matcher sets that controls retry behavior. Matcher sets
-	// without expression matchers (e.g. method, path) restrict which
-	// requests are retried on transport errors - if unspecified, only
-	// GET requests will be retried. Matcher sets with CEL expression
-	// matchers are evaluated against upstream responses and can
-	// reference {rp.status_code}, {rp.header.*}, and
-	// {rp.is_transport_error}. Dial errors are always retried
-	// regardless of this setting. Retries use the next available
-	// upstream per the load balancing policy
+	// A list of matcher sets that restricts with which requests retries are
+	// allowed. A request must match any of the given matcher sets in order
+	// to be retried if the connection to the upstream succeeded but the
+	// subsequent round-trip failed. If the connection to the upstream failed,
+	// a retry is always allowed. If unspecified, only GET requests will be
+	// allowed to be retried. Note that a retry is done with the next available
+	// host according to the load balancing policy.
 	RetryMatchRaw caddyhttp.RawMatcherSets `json:"retry_match,omitempty" caddy:"namespace=http.matchers"`
 
 	SelectionPolicy Selector              `json:"-"`
@@ -1650,28 +1586,10 @@ type Selector interface {
 // may be called during each retry, multiple times per request, and as
 // such, needs to be instantaneous. The returned slice will not be
 // modified.
-//
-// For upstream sources that cache results, implement the
-// [CachingUpstreamSource] interface for optimal performance.
 type UpstreamSource interface {
 	GetUpstreams(*http.Request) ([]*Upstream, error)
 }
 
-// CachingUpstreamSource is an upstream source that caches its upstreams.
-// The relevant cache entry can be cleared/reset for a given request during
-// retries if a request fails. This can help ensure that failing backends
-// are not retried.
-//
-// EXPERIMENTAL: Subject to change.
-type CachingUpstreamSource interface {
-	UpstreamSource
-
-	// ResetCache clears any cache entry related to the given request.
-	// The next time GetUpstreams is called, it should have new upstream
-	// information for the given request.
-	ResetCache(*http.Request) error
-}
-
 // Hop-by-hop headers. These are removed when sent to the backend.
 // As of RFC 7230, hop-by-hop headers are required to appear in the
 // Connection header field. These are the headers defined by the
@@ -1744,34 +1662,10 @@ type RequestHeaderOpsTransport interface {
 	RequestHeaderOps() *headers.HeaderOps
 }
 
-// matcherSetHasExpressionMatcher reports whether a matcher set contains
-// at least one expression matcher. Expression matchers can reference
-// response data via placeholders like {rp.status_code}. Matcher sets
-// without expression matchers only test request properties and should
-// not be evaluated for response-based retry decisions
-func matcherSetHasExpressionMatcher(matcherSet caddyhttp.MatcherSet) bool {
-	for _, m := range matcherSet {
-		if _, ok := m.(*caddyhttp.MatchExpression); ok {
-			return true
-		}
-	}
-	return false
-}
-
 // roundtripSucceededError is an error type that is returned if the
 // roundtrip succeeded, but an error occurred after-the-fact.
 type roundtripSucceededError struct{ error }
 
-// retryableResponseError is returned when the upstream response matched
-// a retry_match entry, indicating the request should be retried with the
-// next upstream. It preserves the original status code so that if retries
-// are exhausted, the actual upstream status is reported instead of a
-// generic 502
-type retryableResponseError struct {
-	error
-	statusCode int
-}
-
 // bodyReadCloser is a reader that, upon closing, will return
 // its buffer to the pool and close the underlying body reader.
 type bodyReadCloser struct {

modules/caddyhttp/reverseproxy/selectionpolicies.go

@@ -664,12 +664,10 @@ func (s CookieHashSelection) Select(pool UpstreamPool, req *http.Request, w http
 			return upstream
 		}
 		cookie := &http.Cookie{
-			Name:     s.Name,
-			Value:    sha,
-			Path:     "/",
-			Secure:   false,
-			HttpOnly: true,
-			SameSite: http.SameSiteLaxMode,
+			Name:   s.Name,
+			Value:  sha,
+			Path:   "/",
+			Secure: false,
 		}
 		isProxyHttps := false
 		if trusted, ok := caddyhttp.GetVar(req.Context(), caddyhttp.TrustedProxyVarKey).(bool); ok && trusted {

modules/caddyhttp/reverseproxy/upstreams.go

@@ -119,18 +119,6 @@ func (su *SRVUpstreams) Provision(ctx caddy.Context) error {
 	return nil
 }
 
-func (su *SRVUpstreams) ResetCache(r *http.Request) error {
-	srvsMu.Lock()
-	if r == nil {
-		srvs = make(map[string]srvLookup)
-	} else {
-		suAddr, _, _, _ := su.expandedAddr(r)
-		delete(srvs, suAddr)
-	}
-	srvsMu.Unlock()
-	return nil
-}
-
 func (su SRVUpstreams) GetUpstreams(r *http.Request) ([]*Upstream, error) {
 	suAddr, service, proto, name := su.expandedAddr(r)
 
@@ -566,9 +554,8 @@ var (
 
 // Interface guards
 var (
-	_ caddy.Provisioner     = (*SRVUpstreams)(nil)
-	_ UpstreamSource        = (*SRVUpstreams)(nil)
-	_ CachingUpstreamSource = (*SRVUpstreams)(nil)
-	_ caddy.Provisioner     = (*AUpstreams)(nil)
-	_ UpstreamSource        = (*AUpstreams)(nil)
+	_ caddy.Provisioner = (*SRVUpstreams)(nil)
+	_ UpstreamSource    = (*SRVUpstreams)(nil)
+	_ caddy.Provisioner = (*AUpstreams)(nil)
+	_ UpstreamSource    = (*AUpstreams)(nil)
 )

modules/caddyhttp/rewrite/rewrite.go

@@ -211,7 +211,12 @@ func (rewr Rewrite) Rewrite(r *http.Request, repl *caddy.Replacer) bool {
 		var newPath, newQuery, newFrag string
 
 		if path != "" {
-			path = escapePathPlaceholders(path, r, repl)
+			// replace the `path` placeholder to escaped path
+			pathPlaceholder := "{http.request.uri.path}"
+			if strings.Contains(path, pathPlaceholder) {
+				path = strings.ReplaceAll(path, pathPlaceholder, r.URL.EscapedPath())
+			}
+
 			newPath = repl.ReplaceAll(path, "")
 		}
 
@@ -295,31 +300,6 @@ func (rewr Rewrite) Rewrite(r *http.Request, repl *caddy.Replacer) bool {
 	return r.Method != oldMethod || r.RequestURI != oldURI
 }
 
-func escapePathPlaceholders(path string, r *http.Request, repl *caddy.Replacer) string {
-	// Replace path-valued placeholders in escaped form before the URI is parsed,
-	// otherwise literal '?' and '%' bytes from the path can be interpreted as URI
-	// delimiters or percent-escape sequences during the rewrite.
-	pathPlaceholder := "{http.request.uri.path}"
-	if strings.Contains(path, pathPlaceholder) {
-		path = strings.ReplaceAll(path, pathPlaceholder, r.URL.EscapedPath())
-	}
-
-	fileMatchRelativePlaceholder := "{http.matchers.file.relative}"
-	if strings.Contains(path, fileMatchRelativePlaceholder) {
-		if val, ok := repl.Get("http.matchers.file.relative"); ok {
-			if relativePath, ok := val.(string); ok {
-				path = strings.ReplaceAll(path, fileMatchRelativePlaceholder, escapePathPreservingSlashes(relativePath))
-			}
-		}
-	}
-
-	return path
-}
-
-func escapePathPreservingSlashes(path string) string {
-	return strings.ReplaceAll(url.PathEscape(path), "%2F", "/")
-}
-
 // buildQueryString takes an input query string and
 // performs replacements on each component, returning
 // the resulting query string. This function appends

modules/caddyhttp/rewrite/rewrite_utils_test.go

@@ -1,194 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rewrite
-
-import (
-	"testing"
-)
-
-func TestReverse(t *testing.T) {
-	tests := []struct {
-		name     string
-		input    string
-		expected string
-	}{
-		{
-			name:     "simple string",
-			input:    "hello",
-			expected: "olleh",
-		},
-		{
-			name:     "empty string",
-			input:    "",
-			expected: "",
-		},
-		{
-			name:     "single character",
-			input:    "a",
-			expected: "a",
-		},
-		{
-			name:     "two characters",
-			input:    "ab",
-			expected: "ba",
-		},
-		{
-			name:     "palindrome",
-			input:    "racecar",
-			expected: "racecar",
-		},
-		{
-			name:     "with spaces",
-			input:    "hello world",
-			expected: "dlrow olleh",
-		},
-		{
-			name:     "with numbers",
-			input:    "abc123",
-			expected: "321cba",
-		},
-		{
-			name:     "unicode characters",
-			input:    "hello世界",
-			expected: "界世olleh",
-		},
-		{
-			name:     "emoji",
-			input:    "🎉🎊🎈",
-			expected: "🎈🎊🎉",
-		},
-		{
-			name:     "mixed unicode and ascii",
-			input:    "café☕",
-			expected: "☕éfac",
-		},
-		{
-			name:     "special characters",
-			input:    "a!b@c#d$",
-			expected: "$d#c@b!a",
-		},
-		{
-			name:     "path-like string",
-			input:    "/path/to/file",
-			expected: "elif/ot/htap/",
-		},
-		{
-			name:     "url-like string",
-			input:    "https://example.com",
-			expected: "moc.elpmaxe//:sptth",
-		},
-		{
-			name:     "long string",
-			input:    "The quick brown fox jumps over the lazy dog",
-			expected: "god yzal eht revo spmuj xof nworb kciuq ehT",
-		},
-		{
-			name:     "newlines",
-			input:    "line1\nline2\nline3",
-			expected: "3enil\n2enil\n1enil",
-		},
-		{
-			name:     "tabs",
-			input:    "a\tb\tc",
-			expected: "c\tb\ta",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := reverse(tt.input)
-			if result != tt.expected {
-				t.Errorf("reverse(%q) = %q; want %q", tt.input, result, tt.expected)
-			}
-
-			// Test that reversing twice gives the original string
-			if tt.input != "" {
-				doubleReverse := reverse(reverse(tt.input))
-				if doubleReverse != tt.input {
-					t.Errorf("reverse(reverse(%q)) = %q; want %q", tt.input, doubleReverse, tt.input)
-				}
-			}
-		})
-	}
-}
-
-func TestReverse_LengthPreservation(t *testing.T) {
-	// Test that reverse preserves string length
-	testStrings := []string{
-		"",
-		"a",
-		"ab",
-		"abc",
-		"hello world",
-		"🎉🎊🎈",
-		"café☕",
-		"The quick brown fox jumps over the lazy dog",
-	}
-
-	for _, s := range testStrings {
-		reversed := reverse(s)
-		if len([]rune(s)) != len([]rune(reversed)) {
-			t.Errorf("reverse(%q) changed length: original %d, reversed %d", s, len([]rune(s)), len([]rune(reversed)))
-		}
-	}
-}
-
-// BenchmarkReverse benchmarks the reverse function
-func BenchmarkReverse(b *testing.B) {
-	testCases := []struct {
-		name  string
-		input string
-	}{
-		{"empty", ""},
-		{"short", "hello"},
-		{"medium", "The quick brown fox jumps over the lazy dog"},
-		{"long", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."},
-		{"unicode", "hello世界🎉"},
-	}
-
-	for _, tc := range testCases {
-		b.Run(tc.name, func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				reverse(tc.input)
-			}
-		})
-	}
-}
-
-func TestReverse_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name  string
-		input string
-	}{
-		{"null byte", "\x00"},
-		{"multiple null bytes", "\x00\x00\x00"},
-		{"control characters", "\t\n\r"},
-		{"high unicode", "𝕳𝖊𝖑𝖑𝖔"},
-		{"zero-width characters", "a\u200Bb\u200Cc"},
-		{"combining characters", "é"}, // e + combining acute
-		{"rtl text", "مرحبا"},
-		{"mixed rtl/ltr", "Hello مرحبا World"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result := reverse(tt.input)
-			// Just ensure it doesn't panic and returns something
-			if result == "" && tt.input != "" {
-				t.Errorf("reverse(%q) returned empty string", tt.input)
-			}
-		})
-	}
-}

modules/caddyhttp/routes.go

@@ -18,7 +18,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"slices"
 	"strings"
 
 	"github.com/caddyserver/caddy/v2"
@@ -242,8 +241,8 @@ func (routes RouteList) Compile(next Handler) Handler {
 		mid = append(mid, wrapRoute(route))
 	}
 	stack := next
-	for _, middleware := range slices.Backward(mid) {
-		stack = middleware(stack)
+	for i := len(mid) - 1; i >= 0; i-- {
+		stack = mid[i](stack)
 	}
 	return stack
 }
@@ -306,8 +305,8 @@ func wrapRoute(route Route) Middleware {
 			}
 
 			// compile this route's handler stack
-			for _, middleware := range slices.Backward(route.middleware) {
-				nextCopy = middleware(nextCopy)
+			for i := len(route.middleware) - 1; i >= 0; i-- {
+				nextCopy = route.middleware[i](nextCopy)
 			}
 
 			// Apply metrics instrumentation once for the entire route,

modules/caddyhttp/server.go

@@ -28,7 +28,7 @@ import (
 	"runtime"
 	"slices"
 	"strings"
-	"sync/atomic"
+	"sync"
 	"time"
 
 	"github.com/caddyserver/certmagic"
@@ -291,7 +291,8 @@ type Server struct {
 
 	trustedProxies IPRangeSource
 
-	shutdownAt atomic.Pointer[time.Time]
+	shutdownAt   time.Time
+	shutdownAtMu *sync.RWMutex
 
 	// registered callback functions
 	connStateFuncs   []func(net.Conn, http.ConnState)
@@ -300,8 +301,6 @@ type Server struct {
 	onStopFuncs      []func(context.Context) error // TODO: Experimental (Nov. 2023)
 }
 
-var defaultProtocols = []string{"h1", "h2", "h3"}
-
 var (
 	ServerHeader = "Caddy"
 	serverHeader = []string{ServerHeader}
@@ -901,56 +900,20 @@ func (s *Server) logRequest(
 // protocol returns true if the protocol proto is configured/enabled.
 func (s *Server) protocol(proto string) bool {
 	if s.ListenProtocols == nil {
-		return slices.Contains(s.protocolsWithDefaults(), proto)
-	}
-
-	for _, lnProtocols := range s.ListenProtocols {
-		if slices.Contains(s.listenerProtocolsWithDefaults(lnProtocols), proto) {
+		if slices.Contains(s.Protocols, proto) {
 			return true
 		}
-	}
-
-	return false
-}
-
-func (s *Server) protocolsWithDefaults() []string {
-	if len(s.Protocols) == 0 {
-		return defaultProtocols
-	}
-	return s.Protocols
-}
-
-func (s *Server) listenerProtocolsWithDefaults(lnProtocols []string) []string {
-	serverProtocols := s.protocolsWithDefaults()
-	if len(lnProtocols) == 0 {
-		return serverProtocols
-	}
-
-	lnProtocolsDefault := false
-	lnProtocolsInclude := make([]string, 0, len(lnProtocols)+len(serverProtocols))
-	srvProtocolsInclude := make(map[string]struct{}, len(serverProtocols))
-	for _, srvProtocol := range serverProtocols {
-		srvProtocolsInclude[srvProtocol] = struct{}{}
-	}
-
-	for _, lnProtocol := range lnProtocols {
-		if lnProtocol == "" {
-			lnProtocolsDefault = true
-			continue
-		}
-		lnProtocolsInclude = append(lnProtocolsInclude, lnProtocol)
-		delete(srvProtocolsInclude, lnProtocol)
-	}
-
-	if lnProtocolsDefault {
-		for _, srvProtocol := range serverProtocols {
-			if _, ok := srvProtocolsInclude[srvProtocol]; ok {
-				lnProtocolsInclude = append(lnProtocolsInclude, srvProtocol)
+	} else {
+		for _, lnProtocols := range s.ListenProtocols {
+			for _, lnProtocol := range lnProtocols {
+				if lnProtocol == "" && slices.Contains(s.Protocols, proto) || lnProtocol == proto {
+					return true
+				}
 			}
 		}
 	}
 
-	return lnProtocolsInclude
+	return false
 }
 
 // Listeners returns the server's listeners. These are active listeners,
@@ -1123,11 +1086,11 @@ func strictUntrustedClientIp(r *http.Request, headers []string, trusted []netip.
 	for _, headerName := range headers {
 		parts := strings.Split(strings.Join(r.Header.Values(headerName), ","), ",")
 
-		for _, part := range slices.Backward(parts) {
+		for i := len(parts) - 1; i >= 0; i-- {
 			// Some proxies may retain the port number, so split if possible
-			host, _, err := net.SplitHostPort(part)
+			host, _, err := net.SplitHostPort(parts[i])
 			if err != nil {
-				host = part
+				host = parts[i]
 			}
 
 			// Remove any zone identifier from the IP address

modules/caddyhttp/staticerror_test.go

@@ -1,197 +0,0 @@
-package caddyhttp
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/caddyserver/caddy/v2"
-	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
-)
-
-func TestStaticErrorCaddyModule(t *testing.T) {
-	se := StaticError{}
-	info := se.CaddyModule()
-	if info.ID != "http.handlers.error" {
-		t.Errorf("CaddyModule().ID = %q, want 'http.handlers.error'", info.ID)
-	}
-}
-
-func TestStaticErrorServeHTTP(t *testing.T) {
-	tests := []struct {
-		name           string
-		staticErr      StaticError
-		wantStatusCode int
-		wantMessage    string
-	}{
-		{
-			name:           "default status code 500",
-			staticErr:      StaticError{},
-			wantStatusCode: 500,
-		},
-		{
-			name:           "custom status code",
-			staticErr:      StaticError{StatusCode: "404"},
-			wantStatusCode: 404,
-		},
-		{
-			name:           "custom error message",
-			staticErr:      StaticError{Error: "custom error", StatusCode: "503"},
-			wantStatusCode: 503,
-			wantMessage:    "custom error",
-		},
-		{
-			name:           "status code only",
-			staticErr:      StaticError{StatusCode: "403"},
-			wantStatusCode: 403,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			repl := caddy.NewReplacer()
-			ctx := context.WithValue(context.Background(), caddy.ReplacerCtxKey, repl)
-
-			req, _ := http.NewRequest("GET", "http://example.com/", nil)
-			req = req.WithContext(ctx)
-			w := httptest.NewRecorder()
-
-			err := tt.staticErr.ServeHTTP(w, req, nil)
-			if err == nil {
-				t.Fatal("ServeHTTP() should return an error")
-			}
-
-			var he HandlerError
-			if !errors.As(err, &he) {
-				t.Fatal("ServeHTTP() error should be HandlerError")
-			}
-
-			if he.StatusCode != tt.wantStatusCode {
-				t.Errorf("StatusCode = %d, want %d", he.StatusCode, tt.wantStatusCode)
-			}
-
-			if tt.wantMessage != "" && he.Err != nil {
-				if he.Err.Error() != tt.wantMessage {
-					t.Errorf("Err.Error() = %q, want %q", he.Err.Error(), tt.wantMessage)
-				}
-			}
-		})
-	}
-}
-
-func TestStaticErrorServeHTTPInvalidStatusCode(t *testing.T) {
-	repl := caddy.NewReplacer()
-	ctx := context.WithValue(context.Background(), caddy.ReplacerCtxKey, repl)
-
-	req, _ := http.NewRequest("GET", "http://example.com/", nil)
-	req = req.WithContext(ctx)
-	w := httptest.NewRecorder()
-
-	se := StaticError{StatusCode: "not_a_number"}
-	err := se.ServeHTTP(w, req, nil)
-	if err == nil {
-		t.Fatal("ServeHTTP() should return error for invalid status code")
-	}
-
-	var he HandlerError
-	if !errors.As(err, &he) {
-		t.Fatal("error should be HandlerError")
-	}
-	// Invalid status code should return 500
-	if he.StatusCode != 500 {
-		t.Errorf("StatusCode = %d, want 500 for invalid status code", he.StatusCode)
-	}
-}
-
-func TestStaticErrorUnmarshalCaddyfile(t *testing.T) {
-	tests := []struct {
-		name       string
-		input      string
-		wantErr    bool
-		wantStatus string
-		wantMsg    string
-	}{
-		{
-			name:       "status code only",
-			input:      `error 404`,
-			wantStatus: "404",
-		},
-		{
-			name:    "message only (non-3-digit)",
-			input:   `error "Page not found"`,
-			wantMsg: "Page not found",
-		},
-		{
-			name:       "message and status code",
-			input:      `error "Page not found" 404`,
-			wantStatus: "404",
-			wantMsg:    "Page not found",
-		},
-		{
-			name:    "no args",
-			input:   `error`,
-			wantErr: true,
-		},
-		{
-			name:    "too many args",
-			input:   `error "msg" 404 extra`,
-			wantErr: true,
-		},
-		{
-			name:       "status in block",
-			input:      "error 500 {\n    message \"server error\"\n}",
-			wantStatus: "500",
-			wantMsg:    "server error",
-		},
-		{
-			name:    "two-digit number is treated as message",
-			input:   `error 42`,
-			wantMsg: "42",
-		},
-		{
-			name:    "four-digit number is treated as message",
-			input:   `error 1234`,
-			wantMsg: "1234",
-		},
-		{
-			name:       "three-digit is status code",
-			input:      `error 503`,
-			wantStatus: "503",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			d := caddyfile.NewTestDispenser(tt.input)
-			se := &StaticError{}
-			err := se.UnmarshalCaddyfile(d)
-
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UnmarshalCaddyfile() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if err != nil {
-				return
-			}
-
-			if tt.wantStatus != "" && string(se.StatusCode) != tt.wantStatus {
-				t.Errorf("StatusCode = %q, want %q", se.StatusCode, tt.wantStatus)
-			}
-			if tt.wantMsg != "" && se.Error != tt.wantMsg {
-				t.Errorf("Error = %q, want %q", se.Error, tt.wantMsg)
-			}
-		})
-	}
-}
-
-func TestStaticErrorUnmarshalCaddyfileDuplicateMessage(t *testing.T) {
-	input := "error \"first message\" 500 {\n    message \"second message\"\n}"
-	d := caddyfile.NewTestDispenser(input)
-	se := &StaticError{}
-	err := se.UnmarshalCaddyfile(d)
-	if err == nil {
-		t.Error("expected error when message is specified both inline and in block")
-	}
-}

modules/caddyhttp/templates/templates.go

@@ -36,22 +36,13 @@ func init() {
 // Templates is a middleware which executes response bodies as Go templates.
 // The syntax is documented in the Go standard library's
 // [text/template package](https://golang.org/pkg/text/template/).
-// Note that ANY response body that matches and qualifies may be evaluated,
-// even if it comes from a proxied backend.
 //
-// ⚠️ Template functions/actions can access the environment, files on disk,
-// and make HTTP requests. This is extremely useful, but you need to make
-// sure templates are only evaluated on content that you trust, control, or
-// at least sanitize properly.
+// ⚠️ Template functions/actions are still experimental, so they are subject to change.
 //
-// ⚠️ Templates are still experimental, so they are subject to change.
+// Custom template functions can be registered by creating a plugin module under the `http.handlers.templates.functions.*` namespace that implements the `CustomFunctions` interface.
 //
 // [All Sprig functions](https://masterminds.github.io/sprig/) are supported.
 //
-// Custom template functions can be registered by creating a plugin module
-// under the `http.handlers.templates.functions.*` namespace that implements
-// the `CustomFunctions` interface.
-//
 // In addition to the standard functions and the Sprig library, Caddy adds
 // extra functions and data that are available to a template:
 //
@@ -171,25 +162,6 @@ func init() {
 // {{listFiles "/mydir"}}
 // ```
 //
-// ##### `fileExists`
-//
-// Returns true if the given file name, relative to the template context's file root,
-// can be opened successfully.
-//
-// ```
-// {{fileExists "path/to/file.html"}}
-// ```
-//
-// ##### `fileStat`
-//
-// Returns [FileInfo](https://pkg.go.dev/io/fs#FileInfo) using [Stat](https://pkg.go.dev/io/fs#Stat)
-// on the given file name, relative to the template context's file root.
-//
-// ```
-// {{$css := fileStat "css/style.css" -}}
-// <link rel="stylesheet" href="/css/style.css?v={{ $css.ModTime.Unix }}">
-// ```
-//
 // ##### `markdown`
 //
 // Renders the given Markdown text as HTML and returns it. This uses the

modules/caddyhttp/tracing/tracer.go

@@ -21,6 +21,7 @@ import (
 )
 
 const (
+	webEngineName                = "Caddy"
 	defaultSpanName              = "handler"
 	nextCallCtxKey  caddy.CtxKey = "nextCall"
 )
@@ -57,7 +58,7 @@ func newOpenTelemetryWrapper(
 	}
 
 	version, _ := caddy.Version()
-	res, err := ot.newResource(caddyhttp.ServerHeader, version)
+	res, err := ot.newResource(webEngineName, version)
 	if err != nil {
 		return ot, fmt.Errorf("creating resource error: %w", err)
 	}

modules/caddyhttp/vars_test.go

@@ -23,158 +23,6 @@ import (
 	"github.com/caddyserver/caddy/v2"
 )
 
-func TestGetVarAndSetVar(t *testing.T) {
-	vars := map[string]any{
-		"existing_key": "existing_value",
-	}
-
-	ctx := context.WithValue(context.Background(), VarsCtxKey, vars)
-
-	if v := GetVar(ctx, "existing_key"); v != "existing_value" {
-		t.Errorf("GetVar() = %v, want 'existing_value'", v)
-	}
-
-	if v := GetVar(ctx, "nonexistent_key"); v != nil {
-		t.Errorf("GetVar() for missing key = %v, want nil", v)
-	}
-
-	emptyCtx := context.Background()
-	if v := GetVar(emptyCtx, "any"); v != nil {
-		t.Errorf("GetVar() on context without vars = %v, want nil", v)
-	}
-}
-
-func TestSetVar(t *testing.T) {
-	vars := map[string]any{}
-	ctx := context.WithValue(context.Background(), VarsCtxKey, vars)
-
-	SetVar(ctx, "key1", "value1")
-	if vars["key1"] != "value1" {
-		t.Errorf("SetVar() didn't set value, got %v", vars["key1"])
-	}
-
-	SetVar(ctx, "key1", "value2")
-	if vars["key1"] != "value2" {
-		t.Errorf("SetVar() didn't overwrite value, got %v", vars["key1"])
-	}
-
-	SetVar(ctx, "key1", nil)
-	if _, ok := vars["key1"]; ok {
-		t.Error("SetVar(nil) should delete the key")
-	}
-
-	// BUG: SetVar with nil for non-existent key should be a no-op per its documentation,
-	// but it actually inserts a nil value into the map. The nil check only deletes
-	// existing keys; if the key doesn't exist, execution falls through to the
-	// final `varMap[key] = value` line, storing nil.
-	SetVar(ctx, "nonexistent", nil)
-	if _, ok := vars["nonexistent"]; !ok {
-		t.Error("BUG: SetVar(nil) for non-existent key unexpectedly did NOT set the key. If this passes, the bug described in code comments may have been fixed.")
-	}
-}
-
-func TestSetVarWithoutContext(t *testing.T) {
-	ctx := context.Background()
-	SetVar(ctx, "key", "value")
-}
-
-func TestVarsMiddlewareCaddyModule(t *testing.T) {
-	m := VarsMiddleware{}
-	info := m.CaddyModule()
-	if info.ID != "http.handlers.vars" {
-		t.Errorf("CaddyModule().ID = %v, want 'http.handlers.vars'", info.ID)
-	}
-}
-
-func TestVarsMatcherEmptyMatch(t *testing.T) {
-	m := VarsMatcher{}
-
-	vars := map[string]any{}
-	repl := caddy.NewReplacer()
-	ctx := context.WithValue(context.Background(), VarsCtxKey, vars)
-	ctx = context.WithValue(ctx, caddy.ReplacerCtxKey, repl)
-
-	req, _ := http.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = req.WithContext(ctx)
-
-	match, err := m.MatchWithError(req)
-	if err != nil {
-		t.Fatalf("MatchWithError() error = %v", err)
-	}
-	if !match {
-		t.Error("empty VarsMatcher should match everything")
-	}
-}
-
-func TestVarsMatcherMatch(t *testing.T) {
-	vars := map[string]any{
-		"my_var": "hello",
-	}
-	repl := caddy.NewReplacer()
-	ctx := context.WithValue(context.Background(), VarsCtxKey, vars)
-	ctx = context.WithValue(ctx, caddy.ReplacerCtxKey, repl)
-
-	req, _ := http.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = req.WithContext(ctx)
-
-	tests := []struct {
-		name      string
-		matcher   VarsMatcher
-		wantMatch bool
-	}{
-		{
-			name:      "matching variable",
-			matcher:   VarsMatcher{"my_var": {"hello"}},
-			wantMatch: true,
-		},
-		{
-			name:      "non-matching variable",
-			matcher:   VarsMatcher{"my_var": {"world"}},
-			wantMatch: false,
-		},
-		{
-			name:      "nonexistent variable",
-			matcher:   VarsMatcher{"nonexistent": {"anything"}},
-			wantMatch: false,
-		},
-		{
-			name:      "multiple values OR",
-			matcher:   VarsMatcher{"my_var": {"world", "hello", "foo"}},
-			wantMatch: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			match := tt.matcher.Match(req)
-			if match != tt.wantMatch {
-				t.Errorf("Match() = %v, want %v", match, tt.wantMatch)
-			}
-		})
-	}
-}
-
-func TestVarsMatcherWithNilVarValue(t *testing.T) {
-	vars := map[string]any{
-		"nil_var": nil,
-	}
-	repl := caddy.NewReplacer()
-	ctx := context.WithValue(context.Background(), VarsCtxKey, vars)
-	ctx = context.WithValue(ctx, caddy.ReplacerCtxKey, repl)
-
-	req, _ := http.NewRequest(http.MethodGet, "http://example.com/", nil)
-	req = req.WithContext(ctx)
-
-	m := VarsMatcher{"nil_var": {""}}
-	match, err := m.MatchWithError(req)
-	if err != nil {
-		t.Fatalf("MatchWithError() error = %v", err)
-	}
-	if !match {
-		t.Error("nil variable value should match empty string")
-	}
-}
-
 func newVarsTestRequest(t *testing.T, target string, headers http.Header, vars map[string]any) (*http.Request, *caddy.Replacer) {
 	t.Helper()
 
@@ -190,6 +38,8 @@ func newVarsTestRequest(t *testing.T, target string, headers http.Header, vars m
 	if vars == nil {
 		vars = make(map[string]any)
 	}
+	// Inject vars directly so these tests exercise matcher-side handling of
+	// already-resolved values, not VarsMiddleware placeholder expansion.
 	ctx = context.WithValue(ctx, VarsCtxKey, vars)
 	req = req.WithContext(ctx)
 

modules/caddytls/acmeissuer.go

@@ -140,42 +140,6 @@ func (iss *ACMEIssuer) Provision(ctx caddy.Context) error {
 		iss.Email = email
 	}
 
-	// expand CA endpoint, if non-empty
-	if iss.CA != "" {
-		ca, err := repl.ReplaceOrErr(iss.CA, true, true)
-		if err != nil {
-			return fmt.Errorf("expanding CA endpoint '%s': %v", iss.CA, err)
-		}
-		iss.CA = ca
-	}
-
-	// expand TestCA endpoint, if non-empty
-	if iss.TestCA != "" {
-		testca, err := repl.ReplaceOrErr(iss.TestCA, true, true)
-		if err != nil {
-			return fmt.Errorf("expanding TestCA endpoint '%s': %v", iss.TestCA, err)
-		}
-		iss.TestCA = testca
-	}
-
-	// expand EAB credentials, if non-empty
-	if iss.ExternalAccount != nil {
-		if iss.ExternalAccount.KeyID != "" {
-			keyID, err := repl.ReplaceOrErr(iss.ExternalAccount.KeyID, true, true)
-			if err != nil {
-				return fmt.Errorf("expanding EAB key ID '%s': %v", iss.ExternalAccount.KeyID, err)
-			}
-			iss.ExternalAccount.KeyID = keyID
-		}
-		if iss.ExternalAccount.MACKey != "" {
-			macKey, err := repl.ReplaceOrErr(iss.ExternalAccount.MACKey, true, true)
-			if err != nil {
-				return fmt.Errorf("expanding EAB MAC key (redacted): %v", err)
-			}
-			iss.ExternalAccount.MACKey = macKey
-		}
-	}
-
 	// expand account key, if non-empty
 	if iss.AccountKey != "" {
 		accountKey, err := repl.ReplaceOrErr(iss.AccountKey, true, true)

modules/caddytls/acmeissuer_test.go

@@ -1,43 +0,0 @@
-package caddytls
-
-import (
-	"github.com/caddyserver/caddy/v2"
-	"github.com/mholt/acmez/v3/acme"
-	"testing"
-)
-
-func TestACMEIssuerExpandPlaceholders(t *testing.T) {
-	t.Setenv("CADDY_TEST_CA_URL", "https://acme.example.com/directory")
-	t.Setenv("CADDY_TEST_TEST_CA_URL", "https://acme2.example.com/directory")
-	t.Setenv("CADDY_TEST_EAB_KEY_ID", "example-key-id")
-	t.Setenv("CADDY_TEST_EAB_MAC_KEY", "example-mac-key")
-
-	caddyCtx, cancel := caddy.NewContext(caddy.Context{Context: t.Context()})
-	defer cancel()
-
-	iss := &ACMEIssuer{
-		CA:     "{env.CADDY_TEST_CA_URL}",
-		TestCA: "{env.CADDY_TEST_TEST_CA_URL}",
-		ExternalAccount: &acme.EAB{
-			KeyID:  "{env.CADDY_TEST_EAB_KEY_ID}",
-			MACKey: "{env.CADDY_TEST_EAB_MAC_KEY}",
-		},
-	}
-
-	if err := iss.Provision(caddyCtx); err != nil {
-		t.Fatalf("Provision() returned unexpected error: %v", err)
-	}
-
-	if want := "https://acme.example.com/directory"; iss.CA != want {
-		t.Errorf("CA: got %q, want %q", iss.CA, want)
-	}
-	if want := "https://acme2.example.com/directory"; iss.TestCA != want {
-		t.Errorf("TestCA: got %q, want %q", iss.TestCA, want)
-	}
-	if want := "example-key-id"; iss.ExternalAccount.KeyID != want {
-		t.Errorf("ExternalAccount.KeyID: got %q, want %q", iss.ExternalAccount.KeyID, want)
-	}
-	if want := "example-mac-key"; iss.ExternalAccount.MACKey != want {
-		t.Errorf("ExternalAccount.MACKey: got %q, want %q", iss.ExternalAccount.MACKey, want)
-	}
-}

modules/caddytls/connpolicy.go

@@ -153,9 +153,9 @@ func (cp ConnectionPolicies) TLSConfig(ctx caddy.Context) *tls.Config {
 			// in its config (remember, TLS connection policies are used by *other* apps to
 			// run TLS servers) -- we skip names with placeholders
 			if tlsApp.EncryptedClientHello.Publication == nil {
+				var echNames []string
 				repl := caddy.NewReplacer()
 				for _, p := range cp {
-					var echNames []string
 					for _, m := range p.matchers {
 						if sni, ok := m.(MatchServerName); ok {
 							for _, name := range sni {
@@ -164,8 +164,8 @@ func (cp ConnectionPolicies) TLSConfig(ctx caddy.Context) *tls.Config {
 							}
 						}
 					}
-					tlsApp.RegisterServerNames(echNames, p.ALPN)
 				}
+				tlsApp.RegisterServerNames(echNames)
 			}
 
 			tlsCfg.GetEncryptedClientHelloKeys = func(chi *tls.ClientHelloInfo) ([]tls.EncryptedClientHelloKey, error) {
@@ -896,19 +896,18 @@ func (clientauth *ClientAuthentication) ConfigureTLSConfig(cfg *tls.Config) erro
 // Unlike VerifyPeerCertificate, VerifyConnection is called on every
 // connection including resumed sessions, preventing session-resumption bypass.
 func (clientauth *ClientAuthentication) verifyConnection(cs tls.ConnectionState) error {
-	rawCerts := make([][]byte, len(cs.PeerCertificates))
-	for i, cert := range cs.PeerCertificates {
-		rawCerts[i] = cert.Raw
-	}
-
 	// first use any pre-existing custom verification function
 	if clientauth.existingVerifyPeerCert != nil {
+		rawCerts := make([][]byte, len(cs.PeerCertificates))
+		for i, cert := range cs.PeerCertificates {
+			rawCerts[i] = cert.Raw
+		}
 		if err := clientauth.existingVerifyPeerCert(rawCerts, cs.VerifiedChains); err != nil {
 			return err
 		}
 	}
 	for _, verifier := range clientauth.verifiers {
-		if err := verifier.VerifyClientCertificate(rawCerts, cs.VerifiedChains); err != nil {
+		if err := verifier.VerifyClientCertificate(nil, cs.VerifiedChains); err != nil {
 			return err
 		}
 	}

modules/caddytls/connpolicy_verifyconnection_test.go

@@ -1,59 +0,0 @@
-package caddytls
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"reflect"
-	"testing"
-)
-
-type testClientCertificateVerifier struct {
-	rawCerts       [][]byte
-	verifiedChains [][]*x509.Certificate
-	err            error
-}
-
-func (v *testClientCertificateVerifier) VerifyClientCertificate(rawCerts [][]byte, verifiedChains [][]*x509.Certificate) error {
-	v.rawCerts = rawCerts
-	v.verifiedChains = verifiedChains
-	return v.err
-}
-
-func TestClientAuthenticationVerifyConnectionPassesRawCertsToVerifiers(t *testing.T) {
-	verifier := &testClientCertificateVerifier{}
-	clientauth := &ClientAuthentication{
-		verifiers: []ClientCertificateVerifier{verifier},
-	}
-
-	peerCert := &x509.Certificate{Raw: []byte("peer-cert-raw")}
-	verifiedChains := [][]*x509.Certificate{{peerCert}}
-	connState := tls.ConnectionState{
-		PeerCertificates: []*x509.Certificate{peerCert},
-		VerifiedChains:   verifiedChains,
-	}
-
-	if err := clientauth.verifyConnection(connState); err != nil {
-		t.Fatalf("verifyConnection failed: %v", err)
-	}
-
-	if !reflect.DeepEqual(verifier.rawCerts, [][]byte{[]byte("peer-cert-raw")}) {
-		t.Fatalf("unexpected raw certs: got %#v", verifier.rawCerts)
-	}
-	if !reflect.DeepEqual(verifier.verifiedChains, verifiedChains) {
-		t.Fatalf("unexpected verified chains: got %#v", verifier.verifiedChains)
-	}
-}
-
-func TestClientAuthenticationVerifyConnectionReturnsVerifierError(t *testing.T) {
-	wantErr := errors.New("verify failed")
-	verifier := &testClientCertificateVerifier{err: wantErr}
-	clientauth := &ClientAuthentication{
-		verifiers: []ClientCertificateVerifier{verifier},
-	}
-
-	err := clientauth.verifyConnection(tls.ConnectionState{})
-	if !errors.Is(err, wantErr) {
-		t.Fatalf("expected error %v, got %v", wantErr, err)
-	}
-}

modules/caddytls/ech.go

@@ -440,10 +440,6 @@ func (t *TLS) publishECHConfigs(logger *zap.Logger) error {
 				zap.Strings("domains", dnsNamesToPublish),
 				zap.Uint8s("config_ids", configIDs))
 
-			if dnsPublisher, ok := publisher.(*ECHDNSPublisher); ok {
-				dnsPublisher.alpnByDomain = t.alpnValuesForServerNames(dnsNamesToPublish)
-			}
-
 			// publish this ECH config list with this publisher
 			pubTime := time.Now()
 			err := publisher.PublishECHConfigList(t.ctx, dnsNamesToPublish, echCfgListBin)
@@ -780,8 +776,7 @@ type ECHDNSPublisher struct {
 	ProviderRaw json.RawMessage `json:"provider,omitempty" caddy:"namespace=dns.providers inline_key=name"`
 	provider    ECHDNSProvider
 
-	alpnByDomain map[string][]string
-	logger       *zap.Logger
+	logger *zap.Logger
 }
 
 // CaddyModule returns the Caddy module information.
@@ -877,7 +872,12 @@ nextName:
 			continue
 		}
 		params := httpsRec.Params
-		params = dnsPub.publishedSvcParams(domain, params, configListBin)
+		if params == nil {
+			params = make(libdns.SvcParams)
+		}
+
+		// overwrite only the "ech" SvcParamKey
+		params["ech"] = []string{base64.StdEncoding.EncodeToString(configListBin)}
 
 		// publish record
 		_, err = dnsPub.provider.SetRecords(ctx, zone, []libdns.Record{
@@ -903,25 +903,6 @@ nextName:
 	return nil
 }
 
-func (dnsPub *ECHDNSPublisher) publishedSvcParams(domain string, existing libdns.SvcParams, configListBin []byte) libdns.SvcParams {
-	params := make(libdns.SvcParams, len(existing)+2)
-	for key, values := range existing {
-		params[key] = append([]string(nil), values...)
-	}
-
-	params["ech"] = []string{base64.StdEncoding.EncodeToString(configListBin)}
-
-	if len(dnsPub.alpnByDomain) == 0 {
-		return params
-	}
-
-	if alpn := dnsPub.alpnByDomain[strings.ToLower(domain)]; len(alpn) > 0 {
-		params["alpn"] = append([]string(nil), alpn...)
-	}
-
-	return params
-}
-
 // echConfig represents an ECHConfig from the specification,
 // [draft-ietf-tls-esni-22](https://www.ietf.org/archive/id/draft-ietf-tls-esni-22.html).
 type echConfig struct {

modules/caddytls/ech_dns_test.go

@@ -1,65 +0,0 @@
-package caddytls
-
-import (
-	"encoding/base64"
-	"reflect"
-	"sync"
-	"testing"
-
-	"github.com/libdns/libdns"
-)
-
-func TestRegisterServerNamesWithALPN(t *testing.T) {
-	tlsApp := &TLS{
-		serverNames:   make(map[string]serverNameRegistration),
-		serverNamesMu: new(sync.Mutex),
-	}
-
-	tlsApp.RegisterServerNames([]string{
-		"Example.com:443",
-		"example.com",
-		"127.0.0.1:443",
-	}, []string{"h2", "http/1.1"})
-	tlsApp.RegisterServerNames([]string{"EXAMPLE.COM"}, []string{"h3"})
-
-	got := tlsApp.alpnValuesForServerNames([]string{"example.com:443", "127.0.0.1:443"})
-	want := map[string][]string{
-		"example.com": {"h3", "h2", "http/1.1"},
-	}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("unexpected ALPN values: got %#v want %#v", got, want)
-	}
-}
-
-func TestECHDNSPublisherPublishedSvcParams(t *testing.T) {
-	dnsPub := &ECHDNSPublisher{
-		alpnByDomain: map[string][]string{
-			"example.com": {"h3", "h2", "http/1.1"},
-		},
-	}
-
-	existing := libdns.SvcParams{
-		"alpn":     {"h2"},
-		"ipv4hint": {"203.0.113.10"},
-	}
-
-	got := dnsPub.publishedSvcParams("Example.com", existing, []byte{0x01, 0x02, 0x03})
-
-	if !reflect.DeepEqual(existing["alpn"], []string{"h2"}) {
-		t.Fatalf("existing params mutated: got %v", existing["alpn"])
-	}
-
-	if !reflect.DeepEqual(got["alpn"], []string{"h3", "h2", "http/1.1"}) {
-		t.Fatalf("unexpected ALPN params: got %v", got["alpn"])
-	}
-
-	if !reflect.DeepEqual(got["ipv4hint"], []string{"203.0.113.10"}) {
-		t.Fatalf("unexpected preserved params: got %v", got["ipv4hint"])
-	}
-
-	wantECH := base64.StdEncoding.EncodeToString([]byte{0x01, 0x02, 0x03})
-	if !reflect.DeepEqual(got["ech"], []string{wantECH}) {
-		t.Fatalf("unexpected ECH params: got %v want %v", got["ech"], wantECH)
-	}
-}

modules/caddytls/tls.go

@@ -23,7 +23,6 @@ import (
 	"net"
 	"net/http"
 	"runtime/debug"
-	"slices"
 	"strings"
 	"sync"
 	"time"
@@ -141,7 +140,7 @@ type TLS struct {
 	logger             *zap.Logger
 	events             *caddyevents.App
 
-	serverNames   map[string]serverNameRegistration
+	serverNames   map[string]struct{}
 	serverNamesMu *sync.Mutex
 
 	// set of subjects with managed certificates,
@@ -169,7 +168,7 @@ func (t *TLS) Provision(ctx caddy.Context) error {
 	t.logger = ctx.Logger()
 	repl := caddy.NewReplacer()
 	t.managing, t.loaded = make(map[string]string), make(map[string]string)
-	t.serverNames = make(map[string]serverNameRegistration)
+	t.serverNames = make(map[string]struct{})
 	t.serverNamesMu = new(sync.Mutex)
 
 	// set up default DNS module, if any, and make sure it implements all the
@@ -614,8 +613,8 @@ func (t *TLS) Manage(subjects map[string]struct{}) error {
 
 // managingWildcardFor returns true if the app is managing a certificate that covers that
 // subject name (including consideration of wildcards), either from its internal list of
-// names that it IS managing certs for, from the otherSubjsToManage which includes names
-// that WILL be managed, or from names configured in the 'automate' loader.
+// names that it IS managing certs for, or from the otherSubjsToManage which includes names
+// that WILL be managed.
 func (t *TLS) managingWildcardFor(subj string, otherSubjsToManage map[string]struct{}) bool {
 	// TODO: we could also consider manually-loaded certs using t.HasCertificateForSubject(),
 	// but that does not account for how manually-loaded certs may be restricted as to which
@@ -630,9 +629,7 @@ func (t *TLS) managingWildcardFor(subj string, otherSubjsToManage map[string]str
 		return managing
 	}
 
-	// replace labels of the domain with wildcards until we get a match from names
-	// already being managed, those about to be managed in this batch, or those
-	// configured for automation
+	// replace labels of the domain with wildcards until we get a match
 	labels := strings.Split(subj, ".")
 	for i := range labels {
 		if labels[i] == "*" {
@@ -646,117 +643,32 @@ func (t *TLS) managingWildcardFor(subj string, otherSubjsToManage map[string]str
 		if _, ok := otherSubjsToManage[candidate]; ok {
 			return true
 		}
-		if _, ok := t.automateNames[candidate]; ok {
-			return true
-		}
 	}
 
 	return false
 }
 
-// RegisterServerNames registers the provided DNS names with the TLS app and
-// associates them with the given HTTPS RR ALPN values, if any. This is
-// currently used to auto-publish Encrypted ClientHello (ECH) configurations,
-// if enabled. Use of this function by apps using the TLS app removes the need
-// for the user to redundantly specify domain names in their configuration.
-// This function separates hostname and port, keeping only the hostname, and
-// filters IP addresses which can't be used with ECH.
+// RegisterServerNames registers the provided DNS names with the TLS app.
+// This is currently used to auto-publish Encrypted ClientHello (ECH)
+// configurations, if enabled. Use of this function by apps using the TLS
+// app removes the need for the user to redundantly specify domain names
+// in their configuration. This function separates hostname and port
+// (keeping only the hotsname) and filters IP addresses, which can't be
+// used with ECH.
 //
 // EXPERIMENTAL: This function and its semantics/behavior are subject to change.
-func (t *TLS) RegisterServerNames(dnsNames, alpnValues []string) {
+func (t *TLS) RegisterServerNames(dnsNames []string) {
 	t.serverNamesMu.Lock()
-	defer t.serverNamesMu.Unlock()
-
 	for _, name := range dnsNames {
 		host, _, err := net.SplitHostPort(name)
 		if err != nil {
 			host = name
 		}
-		host = strings.ToLower(strings.TrimSpace(host))
-		if host == "" || certmagic.SubjectIsIP(host) {
-			continue
-		}
-
-		registration := t.serverNames[host]
-
-		if len(alpnValues) == 0 {
-			t.serverNames[host] = registration
-			continue
-		}
-
-		if registration.alpnValues == nil {
-			registration.alpnValues = make(map[string]struct{}, len(alpnValues))
-		}
-		for _, alpn := range alpnValues {
-			if alpn == "" {
-				continue
-			}
-			registration.alpnValues[alpn] = struct{}{}
-		}
-		t.serverNames[host] = registration
-	}
-}
-
-func (t *TLS) alpnValuesForServerNames(dnsNames []string) map[string][]string {
-	t.serverNamesMu.Lock()
-	defer t.serverNamesMu.Unlock()
-
-	result := make(map[string][]string, len(dnsNames))
-	for _, name := range dnsNames {
-		host, _, err := net.SplitHostPort(name)
-		if err != nil {
-			host = name
-		}
-		host = strings.ToLower(strings.TrimSpace(host))
-		if host == "" {
-			continue
-		}
-
-		registration, ok := t.serverNames[host]
-		if !ok || len(registration.alpnValues) == 0 {
-			continue
-		}
-		result[host] = OrderedHTTPSRRALPN(registration.alpnValues)
-	}
-
-	return result
-}
-
-// OrderedHTTPSRRALPN returns the HTTPS RR ALPN values in preferred order.
-func OrderedHTTPSRRALPN(alpnSet map[string]struct{}) []string {
-	if len(alpnSet) == 0 {
-		return nil
-	}
-
-	knownOrder := append([]string{"h3"}, defaultALPN...)
-	ordered := make([]string, 0, len(alpnSet))
-	seen := make(map[string]struct{}, len(alpnSet))
-
-	for _, alpn := range knownOrder {
-		if _, ok := alpnSet[alpn]; ok {
-			ordered = append(ordered, alpn)
-			seen[alpn] = struct{}{}
+		if strings.TrimSpace(host) != "" && !certmagic.SubjectIsIP(host) {
+			t.serverNames[strings.ToLower(host)] = struct{}{}
 		}
 	}
-
-	if len(ordered) == len(alpnSet) {
-		return ordered
-	}
-
-	var remaining []string
-	for alpn := range alpnSet {
-		if _, ok := seen[alpn]; ok {
-			continue
-		}
-		remaining = append(remaining, alpn)
-	}
-	slices.Sort(remaining)
-
-	return append(ordered, remaining...)
-}
-
-type serverNameRegistration struct {
-	alpnValues map[string]struct{}
+	t.serverNamesMu.Unlock()
 }
 
 // HandleHTTPChallenge ensures that the ACME HTTP challenge or ZeroSSL HTTP

modules/caddytls/tls_wildcard_test.go

@@ -1,96 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddytls
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/caddyserver/caddy/v2"
-)
-
-func TestAvoidDuplicateAutomation(t *testing.T) {
-	tests := []struct {
-		name             string
-		automateNames    []string
-		expectedToManage bool
-	}{
-		{
-			name:             "do not manage if wildcard is automated",
-			automateNames:    []string{"*.example.com"},
-			expectedToManage: false,
-		},
-		{
-			name:             "manage if no automation configured",
-			automateNames:    []string{},
-			expectedToManage: true,
-		},
-		{
-			name:             "manage if explicitly requested even when wildcard automated",
-			automateNames:    []string{"*.example.com", "sub.example.com"},
-			expectedToManage: true,
-		},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			automateJSON, err := json.Marshal(tc.automateNames)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			tlsApp := &TLS{
-				Automation: &AutomationConfig{
-					Policies: []*AutomationPolicy{
-						{
-							IssuersRaw: []json.RawMessage{
-								[]byte(`{"module": "internal"}`),
-							},
-						},
-					},
-				},
-				CertificatesRaw: map[string]json.RawMessage{
-					"automate": automateJSON,
-				},
-			}
-
-			var cfg caddy.Config
-			ctx, err := caddy.ProvisionContext(&cfg)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if err := tlsApp.Provision(ctx); err != nil {
-				t.Fatal(err)
-			}
-
-			// simulate a case wherein the HTTP app starts first and
-			// tells the TLS app about the following auto-HTTPS domains
-			httpDomains := map[string]struct{}{"sub.example.com": {}}
-			if err := tlsApp.Manage(httpDomains); err != nil {
-				t.Fatal(err)
-			}
-
-			_, actuallyManaged := tlsApp.managing["sub.example.com"]
-			if actuallyManaged != tc.expectedToManage {
-				t.Errorf(
-					"expected sub.example.com individually managed: %v, got: %v",
-					tc.expectedToManage,
-					actuallyManaged,
-				)
-			}
-		})
-	}
-}

modules/filestorage/filestorage_test.go

@@ -1,102 +0,0 @@
-package filestorage
-
-import (
-	"testing"
-
-	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
-)
-
-func TestFileStorageCaddyModule(t *testing.T) {
-	fs := FileStorage{}
-	info := fs.CaddyModule()
-	if info.ID != "caddy.storage.file_system" {
-		t.Errorf("CaddyModule().ID = %q, want 'caddy.storage.file_system'", info.ID)
-	}
-	mod := info.New()
-	if mod == nil {
-		t.Error("New() should not return nil")
-	}
-}
-
-func TestFileStorageCertMagicStorage(t *testing.T) {
-	fs := FileStorage{Root: "/var/lib/caddy/certs"}
-	storage, err := fs.CertMagicStorage()
-	if err != nil {
-		t.Fatalf("CertMagicStorage() error = %v", err)
-	}
-	if storage == nil {
-		t.Fatal("CertMagicStorage() returned nil")
-	}
-}
-
-func TestFileStorageCertMagicStorageEmptyRoot(t *testing.T) {
-	fs := FileStorage{Root: ""}
-	storage, err := fs.CertMagicStorage()
-	if err != nil {
-		t.Fatalf("CertMagicStorage() error = %v", err)
-	}
-	if storage == nil {
-		t.Fatal("CertMagicStorage() returned nil even with empty root")
-	}
-}
-
-func TestFileStorageUnmarshalCaddyfile(t *testing.T) {
-	tests := []struct {
-		name    string
-		input   string
-		wantErr bool
-		wantVal string
-	}{
-		{
-			name:    "root as inline arg",
-			input:   `file_system /var/lib/caddy`,
-			wantVal: "/var/lib/caddy",
-		},
-		{
-			name:    "root in block",
-			input:   "file_system {\n\troot /var/lib/caddy\n}",
-			wantVal: "/var/lib/caddy",
-		},
-		{
-			name:    "missing root",
-			input:   `file_system`,
-			wantErr: true,
-		},
-		{
-			name:    "too many inline args",
-			input:   `file_system /path1 /path2`,
-			wantErr: true,
-		},
-		{
-			name:    "root already set inline then block",
-			input:   "file_system /path1 {\n\troot /path2\n}",
-			wantErr: true,
-		},
-		{
-			name:    "unknown subdirective",
-			input:   "file_system {\n\tunknown_option value\n}",
-			wantErr: true,
-		},
-		{
-			name:    "root in block without value",
-			input:   "file_system {\n\troot\n}",
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			d := caddyfile.NewTestDispenser(tt.input)
-			fs := &FileStorage{}
-			err := fs.UnmarshalCaddyfile(d)
-
-			if (err != nil) != tt.wantErr {
-				t.Errorf("UnmarshalCaddyfile() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !tt.wantErr && fs.Root != tt.wantVal {
-				t.Errorf("Root = %q, want %q", fs.Root, tt.wantVal)
-			}
-		})
-	}
-}

modules/logging/filewriter_test.go

@@ -174,47 +174,6 @@ func TestFileRotationPreserveMode(t *testing.T) {
 	}
 }
 
-func TestFileRotationPreserveModeWithUmask(t *testing.T) {
-	m := syscall.Umask(0o022)
-	defer syscall.Umask(m)
-
-	dir, err := os.MkdirTemp("", "caddytest")
-	if err != nil {
-		t.Fatalf("failed to create tempdir: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	fpath := path.Join(dir, "test.log")
-
-	roll := true
-	mode := fileMode(0o660)
-	fw := FileWriter{
-		Filename:   fpath,
-		Mode:       mode,
-		Roll:       &roll,
-		RollSizeMB: 1,
-	}
-
-	logger, err := fw.OpenWriter()
-	if err != nil {
-		t.Fatalf("failed to create file: %v", err)
-	}
-	defer logger.Close()
-
-	b := make([]byte, 1024*1024-1000)
-	logger.Write(b)
-	logger.Write(b[0:2000])
-
-	st, err := os.Stat(fpath)
-	if err != nil {
-		t.Fatalf("failed to check file permissions: %v", err)
-	}
-
-	if got := st.Mode().Perm(); got != os.FileMode(mode) {
-		t.Errorf("file mode after rotation is %v, want %v", got, mode)
-	}
-}
-
 func TestFileModeConfig(t *testing.T) {
 	tests := []struct {
 		name    string

modules/logging/filters.go

@@ -29,7 +29,7 @@ import (
 
 	"github.com/caddyserver/caddy/v2"
 	"github.com/caddyserver/caddy/v2/caddyconfig/caddyfile"
-	"github.com/caddyserver/caddy/v2/internal"
+	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
 )
 
 func init() {
@@ -100,8 +100,8 @@ func (f *HashFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 
 // Filter filters the input field with the replacement value.
 func (f *HashFilter) Filter(in zapcore.Field) zapcore.Field {
-	if array, ok := in.Interface.(internal.LoggableStringArray); ok {
-		newArray := make(internal.LoggableStringArray, len(array))
+	if array, ok := in.Interface.(caddyhttp.LoggableStringArray); ok {
+		newArray := make(caddyhttp.LoggableStringArray, len(array))
 		for i, s := range array {
 			newArray[i] = hash(s)
 		}
@@ -241,8 +241,8 @@ func (m *IPMaskFilter) Provision(ctx caddy.Context) error {
 
 // Filter filters the input field.
 func (m IPMaskFilter) Filter(in zapcore.Field) zapcore.Field {
-	if array, ok := in.Interface.(internal.LoggableStringArray); ok {
-		newArray := make(internal.LoggableStringArray, len(array))
+	if array, ok := in.Interface.(caddyhttp.LoggableStringArray); ok {
+		newArray := make(caddyhttp.LoggableStringArray, len(array))
 		for i, s := range array {
 			newArray[i] = m.mask(s)
 		}
@@ -392,8 +392,8 @@ func (m *QueryFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 
 // Filter filters the input field.
 func (m QueryFilter) Filter(in zapcore.Field) zapcore.Field {
-	if array, ok := in.Interface.(internal.LoggableStringArray); ok {
-		newArray := make(internal.LoggableStringArray, len(array))
+	if array, ok := in.Interface.(caddyhttp.LoggableStringArray); ok {
+		newArray := make(caddyhttp.LoggableStringArray, len(array))
 		for i, s := range array {
 			newArray[i] = m.processQueryString(s)
 		}
@@ -523,7 +523,7 @@ func (m *CookieFilter) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
 
 // Filter filters the input field.
 func (m CookieFilter) Filter(in zapcore.Field) zapcore.Field {
-	cookiesSlice, ok := in.Interface.(internal.LoggableStringArray)
+	cookiesSlice, ok := in.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		return in
 	}
@@ -559,7 +559,7 @@ OUTER:
 		transformedRequest.AddCookie(c)
 	}
 
-	in.Interface = internal.LoggableStringArray(transformedRequest.Header["Cookie"])
+	in.Interface = caddyhttp.LoggableStringArray(transformedRequest.Header["Cookie"])
 
 	return in
 }
@@ -613,8 +613,8 @@ func (m *RegexpFilter) Provision(ctx caddy.Context) error {
 
 // Filter filters the input field with the replacement value if it matches the regexp.
 func (f *RegexpFilter) Filter(in zapcore.Field) zapcore.Field {
-	if array, ok := in.Interface.(internal.LoggableStringArray); ok {
-		newArray := make(internal.LoggableStringArray, len(array))
+	if array, ok := in.Interface.(caddyhttp.LoggableStringArray); ok {
+		newArray := make(caddyhttp.LoggableStringArray, len(array))
 		for i, s := range array {
 			newArray[i] = f.regexp.ReplaceAllString(s, f.Value)
 		}
@@ -783,8 +783,8 @@ func (f *MultiRegexpFilter) Validate() error {
 // Filter applies all regexp operations sequentially to the input field.
 // Input is sanitized and validated for security.
 func (f *MultiRegexpFilter) Filter(in zapcore.Field) zapcore.Field {
-	if array, ok := in.Interface.(internal.LoggableStringArray); ok {
-		newArray := make(internal.LoggableStringArray, len(array))
+	if array, ok := in.Interface.(caddyhttp.LoggableStringArray); ok {
+		newArray := make(caddyhttp.LoggableStringArray, len(array))
 		for i, s := range array {
 			newArray[i] = f.processString(s)
 		}

modules/logging/filters_test.go

@@ -8,7 +8,7 @@ import (
 	"go.uber.org/zap/zapcore"
 
 	"github.com/caddyserver/caddy/v2"
-	"github.com/caddyserver/caddy/v2/internal"
+	"github.com/caddyserver/caddy/v2/modules/caddyhttp"
 )
 
 func TestIPMaskSingleValue(t *testing.T) {
@@ -55,11 +55,11 @@ func TestIPMaskMultiValue(t *testing.T) {
 	f := IPMaskFilter{IPv4MaskRaw: 16, IPv6MaskRaw: 32}
 	f.Provision(caddy.Context{})
 
-	out := f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{
+	out := f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{
 		"255.255.255.255",
 		"244.244.244.244",
 	}})
-	arr, ok := out.Interface.(internal.LoggableStringArray)
+	arr, ok := out.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		t.Fatalf("field is wrong type: %T", out.Integer)
 	}
@@ -70,11 +70,11 @@ func TestIPMaskMultiValue(t *testing.T) {
 		t.Fatalf("field entry 1 has not been filtered: %s", arr[1])
 	}
 
-	out = f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{
+	out = f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{
 		"ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
 		"ff00:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
 	}})
-	arr, ok = out.Interface.(internal.LoggableStringArray)
+	arr, ok = out.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		t.Fatalf("field is wrong type: %T", out.Integer)
 	}
@@ -120,11 +120,11 @@ func TestQueryFilterMultiValue(t *testing.T) {
 		t.Fatalf("the filter must be valid")
 	}
 
-	out := f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{
+	out := f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{
 		"/path1?foo=a&foo=b&bar=c&bar=d&baz=e&hash=hashed",
 		"/path2?foo=c&foo=d&bar=e&bar=f&baz=g&hash=hashed",
 	}})
-	arr, ok := out.Interface.(internal.LoggableStringArray)
+	arr, ok := out.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		t.Fatalf("field is wrong type: %T", out.Interface)
 	}
@@ -162,11 +162,11 @@ func TestCookieFilter(t *testing.T) {
 		{hashAction, "hash", ""},
 	}}
 
-	out := f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{
+	out := f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{
 		"foo=a; foo=b; bar=c; bar=d; baz=e; hash=hashed",
 	}})
-	outval := out.Interface.(internal.LoggableStringArray)
-	expected := internal.LoggableStringArray{
+	outval := out.Interface.(caddyhttp.LoggableStringArray)
+	expected := caddyhttp.LoggableStringArray{
 		"foo=REDACTED; foo=REDACTED; baz=e; hash=1a06df82",
 	}
 	if outval[0] != expected[0] {
@@ -204,8 +204,8 @@ func TestRegexpFilterMultiValue(t *testing.T) {
 	f := RegexpFilter{RawRegexp: `secret`, Value: "REDACTED"}
 	f.Provision(caddy.Context{})
 
-	out := f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{"foo-secret-bar", "bar-secret-foo"}})
-	arr, ok := out.Interface.(internal.LoggableStringArray)
+	out := f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{"foo-secret-bar", "bar-secret-foo"}})
+	arr, ok := out.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		t.Fatalf("field is wrong type: %T", out.Integer)
 	}
@@ -229,8 +229,8 @@ func TestHashFilterSingleValue(t *testing.T) {
 func TestHashFilterMultiValue(t *testing.T) {
 	f := HashFilter{}
 
-	out := f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{"foo", "bar"}})
-	arr, ok := out.Interface.(internal.LoggableStringArray)
+	out := f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{"foo", "bar"}})
+	arr, ok := out.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		t.Fatalf("field is wrong type: %T", out.Integer)
 	}
@@ -292,11 +292,11 @@ func TestMultiRegexpFilterMultiValue(t *testing.T) {
 		t.Fatalf("unexpected error provisioning: %v", err)
 	}
 
-	out := f.Filter(zapcore.Field{Interface: internal.LoggableStringArray{
+	out := f.Filter(zapcore.Field{Interface: caddyhttp.LoggableStringArray{
 		"foo-secret-123",
 		"bar-secret-456",
 	}})
-	arr, ok := out.Interface.(internal.LoggableStringArray)
+	arr, ok := out.Interface.(caddyhttp.LoggableStringArray)
 	if !ok {
 		t.Fatalf("field is wrong type: %T", out.Interface)
 	}

network_test.go

@@ -1,963 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestNetworkAddress_String_Consistency(t *testing.T) {
-	tests := []struct {
-		name string
-		addr NetworkAddress
-	}{
-		{
-			name: "basic tcp",
-			addr: NetworkAddress{Network: "tcp", Host: "localhost", StartPort: 8080, EndPort: 8080},
-		},
-		{
-			name: "tcp with port range",
-			addr: NetworkAddress{Network: "tcp", Host: "localhost", StartPort: 8080, EndPort: 8090},
-		},
-		{
-			name: "unix socket",
-			addr: NetworkAddress{Network: "unix", Host: "/tmp/socket"},
-		},
-		{
-			name: "udp",
-			addr: NetworkAddress{Network: "udp", Host: "0.0.0.0", StartPort: 53, EndPort: 53},
-		},
-		{
-			name: "ipv6",
-			addr: NetworkAddress{Network: "tcp", Host: "::1", StartPort: 80, EndPort: 80},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			str := test.addr.String()
-
-			// Parse the string back
-			parsed, err := ParseNetworkAddress(str)
-			if err != nil {
-				t.Fatalf("Failed to parse string representation: %v", err)
-			}
-
-			// Should be equivalent to original
-			if parsed.Network != test.addr.Network {
-				t.Errorf("Network mismatch: expected %s, got %s", test.addr.Network, parsed.Network)
-			}
-			if parsed.Host != test.addr.Host {
-				t.Errorf("Host mismatch: expected %s, got %s", test.addr.Host, parsed.Host)
-			}
-			if parsed.StartPort != test.addr.StartPort {
-				t.Errorf("StartPort mismatch: expected %d, got %d", test.addr.StartPort, parsed.StartPort)
-			}
-			if parsed.EndPort != test.addr.EndPort {
-				t.Errorf("EndPort mismatch: expected %d, got %d", test.addr.EndPort, parsed.EndPort)
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_PortRangeSize_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name     string
-		addr     NetworkAddress
-		expected uint
-	}{
-		{
-			name:     "single port",
-			addr:     NetworkAddress{StartPort: 80, EndPort: 80},
-			expected: 1,
-		},
-		{
-			name:     "invalid range (end < start)",
-			addr:     NetworkAddress{StartPort: 8080, EndPort: 8070},
-			expected: 0,
-		},
-		{
-			name:     "zero ports",
-			addr:     NetworkAddress{StartPort: 0, EndPort: 0},
-			expected: 1,
-		},
-		{
-			name:     "maximum range",
-			addr:     NetworkAddress{StartPort: 1, EndPort: 65535},
-			expected: 65535,
-		},
-		{
-			name:     "large range",
-			addr:     NetworkAddress{StartPort: 8000, EndPort: 9000},
-			expected: 1001,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			size := test.addr.PortRangeSize()
-			if size != test.expected {
-				t.Errorf("Expected %d, got %d", test.expected, size)
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_At_Validation(t *testing.T) {
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 8080,
-		EndPort:   8090,
-	}
-
-	// Test valid offsets
-	for offset := uint(0); offset <= 10; offset++ {
-		result := addr.At(offset)
-		expectedPort := 8080 + offset
-
-		if result.StartPort != expectedPort || result.EndPort != expectedPort {
-			t.Errorf("Offset %d: expected port %d, got %d-%d",
-				offset, expectedPort, result.StartPort, result.EndPort)
-		}
-
-		if result.Network != addr.Network || result.Host != addr.Host {
-			t.Errorf("Offset %d: network/host should be preserved", offset)
-		}
-	}
-}
-
-func TestNetworkAddress_Expand_LargeRange(t *testing.T) {
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 8000,
-		EndPort:   8010,
-	}
-
-	expanded := addr.Expand()
-	expectedSize := 11 // 8000 to 8010 inclusive
-
-	if len(expanded) != expectedSize {
-		t.Errorf("Expected %d addresses, got %d", expectedSize, len(expanded))
-	}
-
-	// Verify each address
-	for i, expandedAddr := range expanded {
-		expectedPort := uint(8000 + i)
-		if expandedAddr.StartPort != expectedPort || expandedAddr.EndPort != expectedPort {
-			t.Errorf("Address %d: expected port %d, got %d-%d",
-				i, expectedPort, expandedAddr.StartPort, expandedAddr.EndPort)
-		}
-	}
-}
-
-func TestNetworkAddress_IsLoopback_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name     string
-		addr     NetworkAddress
-		expected bool
-	}{
-		{
-			name:     "unix socket",
-			addr:     NetworkAddress{Network: "unix", Host: "/tmp/socket"},
-			expected: true, // Unix sockets are always considered loopback
-		},
-		{
-			name:     "fd network",
-			addr:     NetworkAddress{Network: "fd", Host: "3"},
-			expected: true, // fd networks are always considered loopback
-		},
-		{
-			name:     "localhost",
-			addr:     NetworkAddress{Network: "tcp", Host: "localhost"},
-			expected: true,
-		},
-		{
-			name:     "127.0.0.1",
-			addr:     NetworkAddress{Network: "tcp", Host: "127.0.0.1"},
-			expected: true,
-		},
-		{
-			name:     "::1",
-			addr:     NetworkAddress{Network: "tcp", Host: "::1"},
-			expected: true,
-		},
-		{
-			name:     "127.0.0.2",
-			addr:     NetworkAddress{Network: "tcp", Host: "127.0.0.2"},
-			expected: true, // Part of 127.0.0.0/8 loopback range
-		},
-		{
-			name:     "192.168.1.1",
-			addr:     NetworkAddress{Network: "tcp", Host: "192.168.1.1"},
-			expected: false, // Private but not loopback
-		},
-		{
-			name:     "invalid ip",
-			addr:     NetworkAddress{Network: "tcp", Host: "invalid-ip"},
-			expected: false,
-		},
-		{
-			name:     "empty host",
-			addr:     NetworkAddress{Network: "tcp", Host: ""},
-			expected: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result := test.addr.isLoopback()
-			if result != test.expected {
-				t.Errorf("Expected %v, got %v", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_IsWildcard_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name     string
-		addr     NetworkAddress
-		expected bool
-	}{
-		{
-			name:     "empty host",
-			addr:     NetworkAddress{Network: "tcp", Host: ""},
-			expected: true,
-		},
-		{
-			name:     "ipv4 any",
-			addr:     NetworkAddress{Network: "tcp", Host: "0.0.0.0"},
-			expected: true,
-		},
-		{
-			name:     "ipv6 any",
-			addr:     NetworkAddress{Network: "tcp", Host: "::"},
-			expected: true,
-		},
-		{
-			name:     "localhost",
-			addr:     NetworkAddress{Network: "tcp", Host: "localhost"},
-			expected: false,
-		},
-		{
-			name:     "specific ip",
-			addr:     NetworkAddress{Network: "tcp", Host: "192.168.1.1"},
-			expected: false,
-		},
-		{
-			name:     "invalid ip",
-			addr:     NetworkAddress{Network: "tcp", Host: "invalid"},
-			expected: false,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result := test.addr.isWildcardInterface()
-			if result != test.expected {
-				t.Errorf("Expected %v, got %v", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestSplitNetworkAddress_IPv6_EdgeCases(t *testing.T) {
-	tests := []struct {
-		name          string
-		input         string
-		expectNetwork string
-		expectHost    string
-		expectPort    string
-		expectErr     bool
-	}{
-		{
-			name:       "ipv6 with port",
-			input:      "[::1]:8080",
-			expectHost: "::1",
-			expectPort: "8080",
-		},
-		{
-			name:       "ipv6 without port",
-			input:      "[::1]",
-			expectHost: "::1",
-		},
-		{
-			name:       "ipv6 without brackets or port",
-			input:      "::1",
-			expectHost: "::1",
-		},
-		{
-			name:       "ipv6 loopback",
-			input:      "[::1]:443",
-			expectHost: "::1",
-			expectPort: "443",
-		},
-		{
-			name:       "ipv6 any address",
-			input:      "[::]:80",
-			expectHost: "::",
-			expectPort: "80",
-		},
-		{
-			name:          "ipv6 with network prefix",
-			input:         "tcp6/[::1]:8080",
-			expectNetwork: "tcp6",
-			expectHost:    "::1",
-			expectPort:    "8080",
-		},
-		{
-			name:       "malformed ipv6",
-			input:      "[::1:8080", // Missing closing bracket
-			expectHost: "::1:8080",
-		},
-		{
-			name:       "ipv6 with zone",
-			input:      "[fe80::1%eth0]:8080",
-			expectHost: "fe80::1%eth0",
-			expectPort: "8080",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			network, host, port, err := SplitNetworkAddress(test.input)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error but got none")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-
-			if network != test.expectNetwork {
-				t.Errorf("Network: expected '%s', got '%s'", test.expectNetwork, network)
-			}
-			if host != test.expectHost {
-				t.Errorf("Host: expected '%s', got '%s'", test.expectHost, host)
-			}
-			if port != test.expectPort {
-				t.Errorf("Port: expected '%s', got '%s'", test.expectPort, port)
-			}
-		})
-	}
-}
-
-func TestParseNetworkAddress_PortRange_Validation(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expectErr bool
-		errMsg    string
-	}{
-		{
-			name:      "valid range",
-			input:     "localhost:8080-8090",
-			expectErr: false,
-		},
-		{
-			name:      "inverted range",
-			input:     "localhost:8090-8080",
-			expectErr: true,
-			errMsg:    "end port must not be less than start port",
-		},
-		{
-			name:      "too large range",
-			input:     "localhost:0-65535",
-			expectErr: true,
-			errMsg:    "port range exceeds 65535 ports",
-		},
-		{
-			name:      "invalid start port",
-			input:     "localhost:abc-8080",
-			expectErr: true,
-		},
-		{
-			name:      "invalid end port",
-			input:     "localhost:8080-xyz",
-			expectErr: true,
-		},
-		{
-			name:      "port too large",
-			input:     "localhost:99999",
-			expectErr: true,
-		},
-		{
-			name:      "negative port",
-			input:     "localhost:-80",
-			expectErr: true,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			_, err := ParseNetworkAddress(test.input)
-
-			if test.expectErr && err == nil {
-				t.Error("Expected error but got none")
-			}
-			if !test.expectErr && err != nil {
-				t.Errorf("Unexpected error: %v", err)
-			}
-
-			if test.expectErr && test.errMsg != "" && err != nil {
-				if !containsString(err.Error(), test.errMsg) {
-					t.Errorf("Expected error containing '%s', got '%s'", test.errMsg, err.Error())
-				}
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_Listen_ContextCancellation(t *testing.T) {
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 0, // Let OS assign port
-		EndPort:   0,
-	}
-
-	// Create context that will be cancelled
-	ctx, cancel := context.WithCancel(context.Background())
-
-	// Start listening in a goroutine
-	listenDone := make(chan error, 1)
-	go func() {
-		_, err := addr.Listen(ctx, 0, net.ListenConfig{})
-		listenDone <- err
-	}()
-
-	// Cancel context immediately
-	cancel()
-
-	// Should get context cancellation error quickly
-	select {
-	case err := <-listenDone:
-		if err == nil {
-			t.Error("Expected error due to context cancellation")
-		}
-		// Accept any error related to context cancellation
-		// (could be context.Canceled or DNS lookup error due to cancellation)
-	case <-time.After(time.Second):
-		t.Error("Listen operation did not respect context cancellation")
-	}
-}
-
-func TestNetworkAddress_ListenAll_PartialFailure(t *testing.T) {
-	// Create an address range where some ports might fail to bind
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 0, // OS-assigned port
-		EndPort:   2, // Try to bind 3 ports starting from OS-assigned
-	}
-
-	// This test might be flaky depending on available ports,
-	// but tests the error handling logic
-	ctx := context.Background()
-
-	listeners, err := addr.ListenAll(ctx, net.ListenConfig{})
-
-	// Either all succeed or all fail (due to cleanup on partial failure)
-	if err != nil {
-		// If there's an error, no listeners should be returned
-		if len(listeners) != 0 {
-			t.Errorf("Expected no listeners on error, got %d", len(listeners))
-		}
-	} else {
-		// If successful, should have listeners for all ports in range
-		expectedCount := int(addr.PortRangeSize())
-		if len(listeners) != expectedCount {
-			t.Errorf("Expected %d listeners, got %d", expectedCount, len(listeners))
-		}
-
-		// Clean up listeners
-		for _, ln := range listeners {
-			if closer, ok := ln.(interface{ Close() error }); ok {
-				closer.Close()
-			}
-		}
-	}
-}
-
-func TestJoinNetworkAddress_SpecialCases(t *testing.T) {
-	tests := []struct {
-		name     string
-		network  string
-		host     string
-		port     string
-		expected string
-	}{
-		{
-			name:     "empty everything",
-			network:  "",
-			host:     "",
-			port:     "",
-			expected: "",
-		},
-		{
-			name:     "network only",
-			network:  "tcp",
-			host:     "",
-			port:     "",
-			expected: "tcp/",
-		},
-		{
-			name:     "host only",
-			network:  "",
-			host:     "localhost",
-			port:     "",
-			expected: "localhost",
-		},
-		{
-			name:     "port only",
-			network:  "",
-			host:     "",
-			port:     "8080",
-			expected: ":8080",
-		},
-		{
-			name:     "unix socket with port (port ignored)",
-			network:  "unix",
-			host:     "/tmp/socket",
-			port:     "8080",
-			expected: "unix//tmp/socket",
-		},
-		{
-			name:     "fd network with port (port ignored)",
-			network:  "fd",
-			host:     "3",
-			port:     "8080",
-			expected: "fd/3",
-		},
-		{
-			name:     "ipv6 host with port",
-			network:  "tcp",
-			host:     "::1",
-			port:     "8080",
-			expected: "tcp/[::1]:8080",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result := JoinNetworkAddress(test.network, test.host, test.port)
-			if result != test.expected {
-				t.Errorf("Expected '%s', got '%s'", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestIsUnixNetwork_IsFdNetwork(t *testing.T) {
-	tests := []struct {
-		network string
-		isUnix  bool
-		isFd    bool
-	}{
-		{"unix", true, false},
-		{"unixgram", true, false},
-		{"unixpacket", true, false},
-		{"fd", false, true},
-		{"fdgram", false, true},
-		{"tcp", false, false},
-		{"udp", false, false},
-		{"", false, false},
-		{"unix-like", true, false},
-		{"fd-like", false, true},
-	}
-
-	for _, test := range tests {
-		t.Run(test.network, func(t *testing.T) {
-			if IsUnixNetwork(test.network) != test.isUnix {
-				t.Errorf("IsUnixNetwork('%s'): expected %v, got %v",
-					test.network, test.isUnix, IsUnixNetwork(test.network))
-			}
-			if IsFdNetwork(test.network) != test.isFd {
-				t.Errorf("IsFdNetwork('%s'): expected %v, got %v",
-					test.network, test.isFd, IsFdNetwork(test.network))
-			}
-
-			// Test NetworkAddress methods too
-			addr := NetworkAddress{Network: test.network}
-			if addr.IsUnixNetwork() != test.isUnix {
-				t.Errorf("NetworkAddress.IsUnixNetwork(): expected %v, got %v",
-					test.isUnix, addr.IsUnixNetwork())
-			}
-			if addr.IsFdNetwork() != test.isFd {
-				t.Errorf("NetworkAddress.IsFdNetwork(): expected %v, got %v",
-					test.isFd, addr.IsFdNetwork())
-			}
-		})
-	}
-}
-
-func TestRegisterNetwork_Validation(t *testing.T) {
-	// Save original state
-	originalNetworkTypes := make(map[string]ListenerFunc)
-	for k, v := range networkTypes {
-		originalNetworkTypes[k] = v
-	}
-	defer func() {
-		// Restore original state
-		networkTypes = originalNetworkTypes
-	}()
-
-	mockListener := func(ctx context.Context, network, host, portRange string, portOffset uint, cfg net.ListenConfig) (any, error) {
-		return nil, nil
-	}
-
-	// Test reserved network types that should panic
-	reservedTypes := []string{
-		"tcp", "tcp4", "tcp6",
-		"udp", "udp4", "udp6",
-		"unix", "unixpacket", "unixgram",
-		"ip:1", "ip4:1", "ip6:1",
-		"fd", "fdgram",
-	}
-
-	for _, networkType := range reservedTypes {
-		t.Run("reserved_"+networkType, func(t *testing.T) {
-			defer func() {
-				if r := recover(); r == nil {
-					t.Errorf("Expected panic for reserved network type: %s", networkType)
-				}
-			}()
-			RegisterNetwork(networkType, mockListener)
-		})
-	}
-
-	// Test valid registration
-	t.Run("valid_registration", func(t *testing.T) {
-		customNetwork := "custom-network"
-		RegisterNetwork(customNetwork, mockListener)
-
-		if _, exists := networkTypes[customNetwork]; !exists {
-			t.Error("Custom network should be registered")
-		}
-	})
-
-	// Test duplicate registration should panic
-	t.Run("duplicate_registration", func(t *testing.T) {
-		customNetwork := "another-custom"
-		RegisterNetwork(customNetwork, mockListener)
-
-		defer func() {
-			if r := recover(); r == nil {
-				t.Error("Expected panic for duplicate registration")
-			}
-		}()
-		RegisterNetwork(customNetwork, mockListener)
-	})
-}
-
-func TestListenerUsage_EdgeCases(t *testing.T) {
-	// Test ListenerUsage function with various inputs
-	tests := []struct {
-		name     string
-		network  string
-		addr     string
-		expected int
-	}{
-		{
-			name:     "non-existent listener",
-			network:  "tcp",
-			addr:     "localhost:9999",
-			expected: 0,
-		},
-		{
-			name:     "empty network and address",
-			network:  "",
-			addr:     "",
-			expected: 0,
-		},
-		{
-			name:     "unix socket",
-			network:  "unix",
-			addr:     "/tmp/non-existent.sock",
-			expected: 0,
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			usage := ListenerUsage(test.network, test.addr)
-			if usage != test.expected {
-				t.Errorf("Expected usage %d, got %d", test.expected, usage)
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_Port_Formatting(t *testing.T) {
-	tests := []struct {
-		name     string
-		addr     NetworkAddress
-		expected string
-	}{
-		{
-			name:     "single port",
-			addr:     NetworkAddress{StartPort: 80, EndPort: 80},
-			expected: "80",
-		},
-		{
-			name:     "port range",
-			addr:     NetworkAddress{StartPort: 8080, EndPort: 8090},
-			expected: "8080-8090",
-		},
-		{
-			name:     "zero ports",
-			addr:     NetworkAddress{StartPort: 0, EndPort: 0},
-			expected: "0",
-		},
-		{
-			name:     "large ports",
-			addr:     NetworkAddress{StartPort: 65534, EndPort: 65535},
-			expected: "65534-65535",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result := test.addr.port()
-			if result != test.expected {
-				t.Errorf("Expected '%s', got '%s'", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_JoinHostPort_SpecialNetworks(t *testing.T) {
-	tests := []struct {
-		name     string
-		addr     NetworkAddress
-		offset   uint
-		expected string
-	}{
-		{
-			name: "unix socket ignores offset",
-			addr: NetworkAddress{
-				Network: "unix",
-				Host:    "/tmp/socket",
-			},
-			offset:   100,
-			expected: "/tmp/socket",
-		},
-		{
-			name: "fd network ignores offset",
-			addr: NetworkAddress{
-				Network: "fd",
-				Host:    "3",
-			},
-			offset:   50,
-			expected: "3",
-		},
-		{
-			name: "tcp with offset",
-			addr: NetworkAddress{
-				Network:   "tcp",
-				Host:      "localhost",
-				StartPort: 8000,
-			},
-			offset:   10,
-			expected: "localhost:8010",
-		},
-		{
-			name: "ipv6 with offset",
-			addr: NetworkAddress{
-				Network:   "tcp",
-				Host:      "::1",
-				StartPort: 8000,
-			},
-			offset:   5,
-			expected: "[::1]:8005",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			result := test.addr.JoinHostPort(test.offset)
-			if result != test.expected {
-				t.Errorf("Expected '%s', got '%s'", test.expected, result)
-			}
-		})
-	}
-}
-
-// Helper function for string containment check
-func containsString(haystack, needle string) bool {
-	return len(haystack) >= len(needle) &&
-		(needle == "" || haystack == needle ||
-			strings.Contains(haystack, needle))
-}
-
-func TestListenerKey_Generation(t *testing.T) {
-	tests := []struct {
-		network  string
-		addr     string
-		expected string
-	}{
-		{
-			network:  "tcp",
-			addr:     "localhost:8080",
-			expected: "tcp/localhost:8080",
-		},
-		{
-			network:  "unix",
-			addr:     "/tmp/socket",
-			expected: "unix//tmp/socket",
-		},
-		{
-			network:  "",
-			addr:     "localhost:8080",
-			expected: "/localhost:8080",
-		},
-		{
-			network:  "tcp",
-			addr:     "",
-			expected: "tcp/",
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(fmt.Sprintf("%s_%s", test.network, test.addr), func(t *testing.T) {
-			result := listenerKey(test.network, test.addr)
-			if result != test.expected {
-				t.Errorf("Expected '%s', got '%s'", test.expected, result)
-			}
-		})
-	}
-}
-
-func TestNetworkAddress_ConcurrentAccess(t *testing.T) {
-	// Test that NetworkAddress methods are safe for concurrent read access
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 8080,
-		EndPort:   8090,
-	}
-
-	const numGoroutines = 50
-	var wg sync.WaitGroup
-
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(id int) {
-			defer wg.Done()
-
-			// Call various methods concurrently
-			_ = addr.String()
-			_ = addr.PortRangeSize()
-			_ = addr.IsUnixNetwork()
-			_ = addr.IsFdNetwork()
-			_ = addr.isLoopback()
-			_ = addr.isWildcardInterface()
-			_ = addr.port()
-			_ = addr.JoinHostPort(uint(id % 10))
-			_ = addr.At(uint(id % 11))
-
-			// Expand creates new slice, should be safe
-			expanded := addr.Expand()
-			if len(expanded) == 0 {
-				t.Errorf("Goroutine %d: Expected non-empty expansion", id)
-			}
-		}(i)
-	}
-
-	wg.Wait()
-}
-
-func TestNetworkAddress_IPv6_Zone_Handling(t *testing.T) {
-	// Test IPv6 addresses with zone identifiers
-	input := "tcp/[fe80::1%eth0]:8080"
-
-	addr, err := ParseNetworkAddress(input)
-	if err != nil {
-		t.Fatalf("Failed to parse IPv6 with zone: %v", err)
-	}
-
-	if addr.Network != "tcp" {
-		t.Errorf("Expected network 'tcp', got '%s'", addr.Network)
-	}
-	if addr.Host != "fe80::1%eth0" {
-		t.Errorf("Expected host 'fe80::1%%eth0', got '%s'", addr.Host)
-	}
-	if addr.StartPort != 8080 {
-		t.Errorf("Expected port 8080, got %d", addr.StartPort)
-	}
-
-	// Test string representation round-trip
-	str := addr.String()
-	parsed, err := ParseNetworkAddress(str)
-	if err != nil {
-		t.Fatalf("Failed to parse string representation: %v", err)
-	}
-
-	if parsed.Host != addr.Host {
-		t.Errorf("Round-trip failed: expected host '%s', got '%s'", addr.Host, parsed.Host)
-	}
-}
-
-func BenchmarkParseNetworkAddress(b *testing.B) {
-	inputs := []string{
-		"localhost:8080",
-		"tcp/localhost:8080-8090",
-		"unix//tmp/socket",
-		"[::1]:443",
-		"udp/:53",
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		input := inputs[i%len(inputs)]
-		ParseNetworkAddress(input)
-	}
-}
-
-func BenchmarkNetworkAddress_String(b *testing.B) {
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 8080,
-		EndPort:   8090,
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		addr.String()
-	}
-}
-
-func BenchmarkNetworkAddress_Expand(b *testing.B) {
-	addr := NetworkAddress{
-		Network:   "tcp",
-		Host:      "localhost",
-		StartPort: 8000,
-		EndPort:   8100, // 101 addresses
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		addr.Expand()
-	}
-}

replacer.go

@@ -121,18 +121,6 @@ func (r *Replacer) Delete(variable string) {
 	r.mapMutex.Unlock()
 }
 
-// DeleteByPrefix removes all static variables with
-// keys starting with the given prefix
-func (r *Replacer) DeleteByPrefix(prefix string) {
-	r.mapMutex.Lock()
-	for key := range r.static {
-		if strings.HasPrefix(key, prefix) {
-			delete(r.static, key)
-		}
-	}
-	r.mapMutex.Unlock()
-}
-
 // fromStatic provides values from r.static.
 func (r *Replacer) fromStatic(key string) (any, bool) {
 	r.mapMutex.RLock()

usagepool.go

@@ -79,15 +79,14 @@ func (up *UsagePool) LoadOrNew(key any, construct Constructor) (value any, loade
 	up.Lock()
 	upv, loaded = up.pool[key]
 	if loaded {
-		upv.refs.Add(1)
+		atomic.AddInt32(&upv.refs, 1)
 		up.Unlock()
 		upv.RLock()
 		value = upv.value
 		err = upv.err
 		upv.RUnlock()
 	} else {
-		upv = &usagePoolVal{}
-		upv.refs.Store(1)
+		upv = &usagePoolVal{refs: 1}
 		upv.Lock()
 		up.pool[key] = upv
 		up.Unlock()
@@ -119,7 +118,7 @@ func (up *UsagePool) LoadOrStore(key, val any) (value any, loaded bool) {
 	up.Lock()
 	upv, loaded = up.pool[key]
 	if loaded {
-		upv.refs.Add(1)
+		atomic.AddInt32(&upv.refs, 1)
 		up.Unlock()
 		upv.Lock()
 		if upv.err == nil {
@@ -130,8 +129,7 @@ func (up *UsagePool) LoadOrStore(key, val any) (value any, loaded bool) {
 		}
 		upv.Unlock()
 	} else {
-		upv = &usagePoolVal{value: val}
-		upv.refs.Store(1)
+		upv = &usagePoolVal{refs: 1, value: val}
 		up.pool[key] = upv
 		up.Unlock()
 		value = val
@@ -175,7 +173,7 @@ func (up *UsagePool) Delete(key any) (deleted bool, err error) {
 		up.Unlock()
 		return false, nil
 	}
-	refs := upv.refs.Add(-1)
+	refs := atomic.AddInt32(&upv.refs, -1)
 	if refs == 0 {
 		delete(up.pool, key)
 		up.Unlock()
@@ -190,7 +188,7 @@ func (up *UsagePool) Delete(key any) (deleted bool, err error) {
 		up.Unlock()
 		if refs < 0 {
 			panic(fmt.Sprintf("deleted more than stored: %#v (usage: %d)",
-				upv.value, upv.refs.Load()))
+				upv.value, upv.refs))
 		}
 	}
 	return deleted, err
@@ -205,7 +203,7 @@ func (up *UsagePool) References(key any) (int, bool) {
 	if loaded {
 		// I wonder if it'd be safer to read this value during
 		// our lock on the UsagePool... guess we'll see...
-		refs := upv.refs.Load()
+		refs := atomic.LoadInt32(&upv.refs)
 		return int(refs), true
 	}
 	return 0, false
@@ -222,7 +220,7 @@ type Destructor interface {
 }
 
 type usagePoolVal struct {
-	refs  atomic.Int32
+	refs  int32 // accessed atomically; must be 64-bit aligned for 32-bit systems
 	value any
 	err   error
 	sync.RWMutex

usagepool_test.go

@@ -1,624 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddy
-
-import (
-	"errors"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-type mockDestructor struct {
-	value     string
-	destroyed int32
-	err       error
-}
-
-func (m *mockDestructor) Destruct() error {
-	atomic.StoreInt32(&m.destroyed, 1)
-	return m.err
-}
-
-func (m *mockDestructor) IsDestroyed() bool {
-	return atomic.LoadInt32(&m.destroyed) == 1
-}
-
-func TestUsagePool_LoadOrNew_Basic(t *testing.T) {
-	pool := NewUsagePool()
-	key := "test-key"
-
-	// First load should construct new value
-	val, loaded, err := pool.LoadOrNew(key, func() (Destructor, error) {
-		return &mockDestructor{value: "test-value"}, nil
-	})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	if loaded {
-		t.Error("Expected loaded to be false for new value")
-	}
-	if val.(*mockDestructor).value != "test-value" {
-		t.Errorf("Expected 'test-value', got '%s'", val.(*mockDestructor).value)
-	}
-
-	// Second load should return existing value
-	val2, loaded2, err := pool.LoadOrNew(key, func() (Destructor, error) {
-		t.Error("Constructor should not be called for existing value")
-		return nil, nil
-	})
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	if !loaded2 {
-		t.Error("Expected loaded to be true for existing value")
-	}
-	if val2.(*mockDestructor).value != "test-value" {
-		t.Errorf("Expected 'test-value', got '%s'", val2.(*mockDestructor).value)
-	}
-
-	// Check reference count
-	refs, exists := pool.References(key)
-	if !exists {
-		t.Error("Key should exist in pool")
-	}
-	if refs != 2 {
-		t.Errorf("Expected 2 references, got %d", refs)
-	}
-}
-
-func TestUsagePool_LoadOrNew_ConstructorError(t *testing.T) {
-	pool := NewUsagePool()
-	key := "test-key"
-	expectedErr := errors.New("constructor failed")
-
-	val, loaded, err := pool.LoadOrNew(key, func() (Destructor, error) {
-		return nil, expectedErr
-	})
-	if err != expectedErr {
-		t.Errorf("Expected constructor error, got: %v", err)
-	}
-	if loaded {
-		t.Error("Expected loaded to be false for failed construction")
-	}
-	if val != nil {
-		t.Error("Expected nil value for failed construction")
-	}
-
-	// Key should not exist after constructor failure
-	refs, exists := pool.References(key)
-	if exists {
-		t.Error("Key should not exist after constructor failure")
-	}
-	if refs != 0 {
-		t.Errorf("Expected 0 references, got %d", refs)
-	}
-}
-
-func TestUsagePool_LoadOrStore_Basic(t *testing.T) {
-	pool := NewUsagePool()
-	key := "test-key"
-	mockVal := &mockDestructor{value: "stored-value"}
-
-	// First load/store should store new value
-	val, loaded := pool.LoadOrStore(key, mockVal)
-	if loaded {
-		t.Error("Expected loaded to be false for new value")
-	}
-	if val != mockVal {
-		t.Error("Expected stored value to be returned")
-	}
-
-	// Second load/store should return existing value
-	newMockVal := &mockDestructor{value: "new-value"}
-	val2, loaded2 := pool.LoadOrStore(key, newMockVal)
-	if !loaded2 {
-		t.Error("Expected loaded to be true for existing value")
-	}
-	if val2 != mockVal {
-		t.Error("Expected original stored value to be returned")
-	}
-
-	// Check reference count
-	refs, exists := pool.References(key)
-	if !exists {
-		t.Error("Key should exist in pool")
-	}
-	if refs != 2 {
-		t.Errorf("Expected 2 references, got %d", refs)
-	}
-}
-
-func TestUsagePool_Delete_Basic(t *testing.T) {
-	pool := NewUsagePool()
-	key := "test-key"
-	mockVal := &mockDestructor{value: "test-value"}
-
-	// Store value twice to get ref count of 2
-	pool.LoadOrStore(key, mockVal)
-	pool.LoadOrStore(key, mockVal)
-
-	// First delete should decrement ref count
-	deleted, err := pool.Delete(key)
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	if deleted {
-		t.Error("Expected deleted to be false when refs > 0")
-	}
-	if mockVal.IsDestroyed() {
-		t.Error("Value should not be destroyed yet")
-	}
-
-	// Second delete should destroy value
-	deleted, err = pool.Delete(key)
-	if err != nil {
-		t.Fatalf("Unexpected error: %v", err)
-	}
-	if !deleted {
-		t.Error("Expected deleted to be true when refs = 0")
-	}
-	if !mockVal.IsDestroyed() {
-		t.Error("Value should be destroyed")
-	}
-
-	// Key should not exist after deletion
-	refs, exists := pool.References(key)
-	if exists {
-		t.Error("Key should not exist after deletion")
-	}
-	if refs != 0 {
-		t.Errorf("Expected 0 references, got %d", refs)
-	}
-}
-
-func TestUsagePool_Delete_NonExistentKey(t *testing.T) {
-	pool := NewUsagePool()
-
-	deleted, err := pool.Delete("non-existent")
-	if err != nil {
-		t.Errorf("Expected no error for non-existent key, got: %v", err)
-	}
-	if deleted {
-		t.Error("Expected deleted to be false for non-existent key")
-	}
-}
-
-func TestUsagePool_Delete_PanicOnNegativeRefs(t *testing.T) {
-	// This test demonstrates the panic condition by manipulating
-	// the ref count directly to create an invalid state
-	pool := NewUsagePool()
-	key := "test-key"
-	mockVal := &mockDestructor{value: "test-value"}
-
-	// Store the value to get it in the pool
-	pool.LoadOrStore(key, mockVal)
-
-	// Get the pool value to manipulate its refs directly
-	pool.Lock()
-	upv, exists := pool.pool[key]
-	if !exists {
-		pool.Unlock()
-		t.Fatal("Value should exist in pool")
-	}
-
-	// Manually set refs to 1 to test the panic condition
-	atomic.StoreInt32(&upv.refs, 1)
-	pool.Unlock()
-
-	// Now delete twice - the second delete should cause refs to go negative
-	// First delete
-	deleted1, err := pool.Delete(key)
-	if err != nil {
-		t.Fatalf("First delete failed: %v", err)
-	}
-	if !deleted1 {
-		t.Error("First delete should have removed the value")
-	}
-
-	// Second delete on the same key after it was removed should be safe
-	deleted2, err := pool.Delete(key)
-	if err != nil {
-		t.Errorf("Second delete should not error: %v", err)
-	}
-	if deleted2 {
-		t.Error("Second delete should return false for non-existent key")
-	}
-}
-
-func TestUsagePool_Range(t *testing.T) {
-	pool := NewUsagePool()
-
-	// Add multiple values
-	values := map[string]string{
-		"key1": "value1",
-		"key2": "value2",
-		"key3": "value3",
-	}
-
-	for key, value := range values {
-		pool.LoadOrStore(key, &mockDestructor{value: value})
-	}
-
-	// Range through all values
-	found := make(map[string]string)
-	pool.Range(func(key, value any) bool {
-		found[key.(string)] = value.(*mockDestructor).value
-		return true
-	})
-
-	if len(found) != len(values) {
-		t.Errorf("Expected %d values, got %d", len(values), len(found))
-	}
-
-	for key, expectedValue := range values {
-		if actualValue, exists := found[key]; !exists || actualValue != expectedValue {
-			t.Errorf("Key %s: expected '%s', got '%s'", key, expectedValue, actualValue)
-		}
-	}
-}
-
-func TestUsagePool_Range_EarlyReturn(t *testing.T) {
-	pool := NewUsagePool()
-
-	// Add multiple values
-	for i := 0; i < 5; i++ {
-		pool.LoadOrStore(i, &mockDestructor{value: "value"})
-	}
-
-	// Range but return false after first iteration
-	count := 0
-	pool.Range(func(key, value any) bool {
-		count++
-		return false // Stop after first iteration
-	})
-
-	if count != 1 {
-		t.Errorf("Expected 1 iteration, got %d", count)
-	}
-}
-
-func TestUsagePool_Concurrent_LoadOrNew(t *testing.T) {
-	pool := NewUsagePool()
-	key := "concurrent-key"
-	constructorCalls := int32(0)
-
-	const numGoroutines = 100
-	var wg sync.WaitGroup
-	results := make([]any, numGoroutines)
-
-	for i := 0; i < numGoroutines; i++ {
-		wg.Add(1)
-		go func(index int) {
-			defer wg.Done()
-			val, _, err := pool.LoadOrNew(key, func() (Destructor, error) {
-				atomic.AddInt32(&constructorCalls, 1)
-				// Add small delay to increase chance of race conditions
-				time.Sleep(time.Microsecond)
-				return &mockDestructor{value: "concurrent-value"}, nil
-			})
-			if err != nil {
-				t.Errorf("Goroutine %d: Unexpected error: %v", index, err)
-				return
-			}
-			results[index] = val
-		}(i)
-	}
-
-	wg.Wait()
-
-	// Constructor should only be called once
-	if calls := atomic.LoadInt32(&constructorCalls); calls != 1 {
-		t.Errorf("Expected constructor to be called once, was called %d times", calls)
-	}
-
-	// All goroutines should get the same value
-	firstVal := results[0]
-	for i, val := range results {
-		if val != firstVal {
-			t.Errorf("Goroutine %d got different value than first goroutine", i)
-		}
-	}
-
-	// Reference count should equal number of goroutines
-	refs, exists := pool.References(key)
-	if !exists {
-		t.Error("Key should exist in pool")
-	}
-	if refs != numGoroutines {
-		t.Errorf("Expected %d references, got %d", numGoroutines, refs)
-	}
-}
-
-func TestUsagePool_Concurrent_Delete(t *testing.T) {
-	pool := NewUsagePool()
-	key := "concurrent-delete-key"
-	mockVal := &mockDestructor{value: "test-value"}
-
-	const numRefs = 50
-
-	// Add multiple references
-	for i := 0; i < numRefs; i++ {
-		pool.LoadOrStore(key, mockVal)
-	}
-
-	var wg sync.WaitGroup
-	deleteResults := make([]bool, numRefs)
-
-	// Delete concurrently
-	for i := 0; i < numRefs; i++ {
-		wg.Add(1)
-		go func(index int) {
-			defer wg.Done()
-			deleted, err := pool.Delete(key)
-			if err != nil {
-				t.Errorf("Goroutine %d: Unexpected error: %v", index, err)
-				return
-			}
-			deleteResults[index] = deleted
-		}(i)
-	}
-
-	wg.Wait()
-
-	// Exactly one delete should have returned true (when refs reached 0)
-	deletedCount := 0
-	for _, deleted := range deleteResults {
-		if deleted {
-			deletedCount++
-		}
-	}
-	if deletedCount != 1 {
-		t.Errorf("Expected exactly 1 delete to return true, got %d", deletedCount)
-	}
-
-	// Value should be destroyed
-	if !mockVal.IsDestroyed() {
-		t.Error("Value should be destroyed after all references deleted")
-	}
-
-	// Key should not exist
-	refs, exists := pool.References(key)
-	if exists {
-		t.Error("Key should not exist after all references deleted")
-	}
-	if refs != 0 {
-		t.Errorf("Expected 0 references, got %d", refs)
-	}
-}
-
-func TestUsagePool_DestructorError(t *testing.T) {
-	pool := NewUsagePool()
-	key := "destructor-error-key"
-	expectedErr := errors.New("destructor failed")
-	mockVal := &mockDestructor{value: "test-value", err: expectedErr}
-
-	pool.LoadOrStore(key, mockVal)
-
-	deleted, err := pool.Delete(key)
-	if err != expectedErr {
-		t.Errorf("Expected destructor error, got: %v", err)
-	}
-	if !deleted {
-		t.Error("Expected deleted to be true even with destructor error")
-	}
-	if !mockVal.IsDestroyed() {
-		t.Error("Destructor should have been called despite error")
-	}
-}
-
-func TestUsagePool_Mixed_Concurrent_Operations(t *testing.T) {
-	pool := NewUsagePool()
-	keys := []string{"key1", "key2", "key3"}
-
-	var wg sync.WaitGroup
-	const opsPerKey = 10
-
-	// Test concurrent operations but with more controlled behavior
-	for _, key := range keys {
-		for i := 0; i < opsPerKey; i++ {
-			wg.Add(2) // LoadOrStore and Delete
-
-			// LoadOrStore (safer than LoadOrNew for concurrency)
-			go func(k string) {
-				defer wg.Done()
-				pool.LoadOrStore(k, &mockDestructor{value: k + "-value"})
-			}(key)
-
-			// Delete (may fail if refs are 0, that's fine)
-			go func(k string) {
-				defer wg.Done()
-				pool.Delete(k)
-			}(key)
-		}
-	}
-
-	wg.Wait()
-
-	// Test that the pool is in a consistent state
-	for _, key := range keys {
-		refs, exists := pool.References(key)
-		if exists && refs < 0 {
-			t.Errorf("Key %s has negative reference count: %d", key, refs)
-		}
-	}
-}
-
-func TestUsagePool_Range_SkipsErrorValues(t *testing.T) {
-	pool := NewUsagePool()
-
-	// Add value that will succeed
-	goodKey := "good-key"
-	pool.LoadOrStore(goodKey, &mockDestructor{value: "good-value"})
-
-	// Try to add value that will fail construction
-	badKey := "bad-key"
-	pool.LoadOrNew(badKey, func() (Destructor, error) {
-		return nil, errors.New("construction failed")
-	})
-
-	// Range should only iterate good values
-	count := 0
-	pool.Range(func(key, value any) bool {
-		count++
-		if key.(string) != goodKey {
-			t.Errorf("Expected only good key, got: %s", key.(string))
-		}
-		return true
-	})
-
-	if count != 1 {
-		t.Errorf("Expected 1 value in range, got %d", count)
-	}
-}
-
-func TestUsagePool_LoadOrStore_ErrorRecovery(t *testing.T) {
-	pool := NewUsagePool()
-	key := "error-recovery-key"
-
-	// First, create a value that fails construction
-	_, _, err := pool.LoadOrNew(key, func() (Destructor, error) {
-		return nil, errors.New("construction failed")
-	})
-	if err == nil {
-		t.Error("Expected constructor error")
-	}
-
-	// Now try LoadOrStore with a good value - should recover
-	goodVal := &mockDestructor{value: "recovery-value"}
-	val, loaded := pool.LoadOrStore(key, goodVal)
-	if loaded {
-		t.Error("Expected loaded to be false for error recovery")
-	}
-	if val != goodVal {
-		t.Error("Expected recovery value to be returned")
-	}
-}
-
-func TestUsagePool_MemoryLeak_Prevention(t *testing.T) {
-	pool := NewUsagePool()
-	key := "memory-leak-test"
-
-	// Create many references
-	const numRefs = 1000
-	mockVal := &mockDestructor{value: "leak-test"}
-
-	for i := 0; i < numRefs; i++ {
-		pool.LoadOrStore(key, mockVal)
-	}
-
-	// Delete all references
-	for i := 0; i < numRefs; i++ {
-		deleted, err := pool.Delete(key)
-		if err != nil {
-			t.Fatalf("Delete %d: Unexpected error: %v", i, err)
-		}
-		if i == numRefs-1 && !deleted {
-			t.Error("Last delete should return true")
-		} else if i < numRefs-1 && deleted {
-			t.Errorf("Delete %d should return false", i)
-		}
-	}
-
-	// Verify destructor was called
-	if !mockVal.IsDestroyed() {
-		t.Error("Value should be destroyed after all references deleted")
-	}
-
-	// Verify no memory leak - key should be removed from map
-	refs, exists := pool.References(key)
-	if exists {
-		t.Error("Key should not exist after complete deletion")
-	}
-	if refs != 0 {
-		t.Errorf("Expected 0 references, got %d", refs)
-	}
-}
-
-func TestUsagePool_RaceCondition_RefsCounter(t *testing.T) {
-	pool := NewUsagePool()
-	key := "race-test-key"
-	mockVal := &mockDestructor{value: "race-value"}
-
-	const numOperations = 100
-	var wg sync.WaitGroup
-
-	// Mix of increment and decrement operations
-	for i := 0; i < numOperations; i++ {
-		wg.Add(2)
-
-		// Increment (LoadOrStore)
-		go func() {
-			defer wg.Done()
-			pool.LoadOrStore(key, mockVal)
-		}()
-
-		// Decrement (Delete) - may fail if refs are 0, that's ok
-		go func() {
-			defer wg.Done()
-			pool.Delete(key)
-		}()
-	}
-
-	wg.Wait()
-
-	// Final reference count should be consistent
-	refs, exists := pool.References(key)
-	if exists {
-		if refs < 0 {
-			t.Errorf("Reference count should never be negative, got: %d", refs)
-		}
-	}
-}
-
-func BenchmarkUsagePool_LoadOrNew(b *testing.B) {
-	pool := NewUsagePool()
-	key := "bench-key"
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		pool.LoadOrNew(key, func() (Destructor, error) {
-			return &mockDestructor{value: "bench-value"}, nil
-		})
-	}
-}
-
-func BenchmarkUsagePool_LoadOrStore(b *testing.B) {
-	pool := NewUsagePool()
-	key := "bench-key"
-	mockVal := &mockDestructor{value: "bench-value"}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		pool.LoadOrStore(key, mockVal)
-	}
-}
-
-func BenchmarkUsagePool_Delete(b *testing.B) {
-	pool := NewUsagePool()
-	key := "bench-key"
-	mockVal := &mockDestructor{value: "bench-value"}
-
-	// Pre-populate with many references
-	for i := 0; i < b.N; i++ {
-		pool.LoadOrStore(key, mockVal)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		pool.Delete(key)
-	}
-}