From 10f7ac6193756b7f490325ab88f26237feb8ebce Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:46:51 +0000 Subject: [PATCH 1/2] Initial plan From cf9d9dd3c8be40546efda597071d1a64aebd8f21 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 25 Mar 2026 13:51:14 +0000 Subject: [PATCH 2/2] refactor: rename shadowing s variables to htu/htm in Parse() Co-authored-by: reinkrul <1481228+reinkrul@users.noreply.github.com> Agent-Logs-Url: https://github.com/nuts-foundation/nuts-node/sessions/a3558c07-9536-44cd-b10a-74d497ac71f4 --- crypto/dpop/dpop.go | 11 +++++------ go.sum | 2 -- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/crypto/dpop/dpop.go b/crypto/dpop/dpop.go index c582599fe..5e6e58581 100644 --- a/crypto/dpop/dpop.go +++ b/crypto/dpop/dpop.go @@ -30,7 +30,6 @@ import ( "net/http" "net/url" "slices" - "strings" "time" "github.com/lestrrat-go/jwx/v2/jwa" @@ -158,18 +157,18 @@ func Parse(s string) (*DPoP, error) { } if v, ok := token.Get(HTUKey); !ok { return nil, fmt.Errorf("%w: missing htu claim", ErrInvalidDPoP) - } else if s, ok := v.(string); !ok { + } else if htu, ok := v.(string); !ok { return nil, fmt.Errorf("%w: invalid htu claim", ErrInvalidDPoP) - } else if s == "" { + } else if htu == "" { return nil, fmt.Errorf("%w: missing htu claim", ErrInvalidDPoP) - } else if _, err := url.Parse(s); err != nil { + } else if _, err := url.Parse(htu); err != nil { return nil, fmt.Errorf("%w: invalid htu claim: %w", ErrInvalidDPoP, err) } if v, ok := token.Get(HTMKey); !ok { return nil, fmt.Errorf("%w: missing htm claim", ErrInvalidDPoP) - } else if s, ok := v.(string); !ok { + } else if htm, ok := v.(string); !ok { return nil, fmt.Errorf("%w: invalid htm claim", ErrInvalidDPoP) - } else if s == "" { + } else if htm == "" { return nil, fmt.Errorf("%w: missing htm claim", ErrInvalidDPoP) } if token.JwtID() == "" { diff --git a/go.sum b/go.sum index 2ebaaae44..80d16f4f4 100644 --- a/go.sum +++ b/go.sum @@ -398,8 +398,6 @@ github.com/nuts-foundation/crypto-ecies v0.0.0-20211207143025-5b84f9efce2b h1:80 github.com/nuts-foundation/crypto-ecies v0.0.0-20211207143025-5b84f9efce2b/go.mod h1:6YUioYirD6/8IahZkoS4Ypc8xbeJW76Xdk1QKcziNTM= github.com/nuts-foundation/go-did v0.18.0 h1:IB0X8PrzDulpR1zAgDpaHfwoSjJpIhx5u1Tg8I2nnb8= github.com/nuts-foundation/go-did v0.18.0/go.mod h1:4od1gAmCi9HjHTQGEvHC8pLeuXdXACxidAcdA52YScc= -github.com/nuts-foundation/go-leia/v4 v4.2.0 h1:o/bgYVCyTgsfgtaKmlrcUaJ2z4NwetERC98SUWwYajM= -github.com/nuts-foundation/go-leia/v4 v4.2.0/go.mod h1:Gw6bXqJLOAmHSiXJJYbVoj+Mowp/PoBRywO0ZPsVzA0= github.com/nuts-foundation/go-leia/v4 v4.3.0 h1:R0qGISIeg2q/PCQTC9cuoBtA6cFu4WBV2DbmSOWKZyM= github.com/nuts-foundation/go-leia/v4 v4.3.0/go.mod h1:Gw6bXqJLOAmHSiXJJYbVoj+Mowp/PoBRywO0ZPsVzA0= github.com/nuts-foundation/go-stoabs v1.11.0 h1:q18jVruPdFcVhodDrnKuhq/24i0pUC/YXgzJS0glKUU=