Skip to content

fix: avoid chi route context reuse #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aqr91 wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −4
Open

fix: avoid chi route context reuse #1039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions autopatch/autopatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package autopatch

import (
"bytes"
"context"
"encoding/json"
"errors"
"io"
Expand All @@ -20,10 +21,12 @@ import (
"strconv"
"strings"

"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/casing"
"github.com/danielgtaylor/shorthand/v2"
jsonpatch "github.com/evanphx/json-patch/v5"
"github.com/go-chi/chi/v5"

"github.com/danielgtaylor/huma/v2"
"github.com/danielgtaylor/huma/v2/casing"
)

const MergePatchNullabilityExtension = "x-merge-patch-nullability"
Expand All @@ -43,6 +46,22 @@ func RegisterNullabilityExtension(api huma.API, stringRepresentationOfNull strin
}
}

type internalRequestContext struct {
context.Context
}

func (c internalRequestContext) Value(key any) any {
if key == chi.RouteCtxKey {
return nil
}

return c.Context.Value(key)
}

func autopatchRequestContext(ctx context.Context) context.Context {
return internalRequestContext{Context: ctx}
}

func replaceNulls(data []byte, settings MergePatchNullabilitySettings) ([]byte, error) {
var raw map[string]any
if err := json.Unmarshal(data, &raw); err != nil {
Expand Down Expand Up @@ -264,7 +283,7 @@ func PatchResource(api huma.API, path *huma.PathItem) {
resourcePath := findRelativeResourcePath(ctx.URL().Path, put.Path)

// Perform the get!
origReq, err := http.NewRequestWithContext(ctx.Context(), http.MethodGet, resourcePath, nil)
origReq, err := http.NewRequestWithContext(autopatchRequestContext(ctx.Context()), http.MethodGet, resourcePath, nil)
if err != nil {
huma.WriteErr(api, ctx, http.StatusInternalServerError, "Unable to get resource", err)
return
Expand Down Expand Up @@ -390,7 +409,7 @@ func PatchResource(api huma.API, path *huma.PathItem) {
}

// Write the updated data back to the server!
putReq, err := http.NewRequestWithContext(ctx.Context(), http.MethodPut, resourcePath, bytes.NewReader(patched))
putReq, err := http.NewRequestWithContext(autopatchRequestContext(ctx.Context()), http.MethodPut, resourcePath, bytes.NewReader(patched))
if err != nil {
huma.WriteErr(api, ctx, http.StatusInternalServerError, "Unable to put modified resource", err)
return
Expand Down