Skip to content

refactor(dpop): eliminate variable shadowing in Parse() HTU/HTM claim validation #4117

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

Merged
reinkrul merged 2 commits into from
Mar 25, 2026
Merged

refactor(dpop): eliminate variable shadowing in Parse() HTU/HTM claim validation #4117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10f7ac6
Initial plan
Copilot Mar 25, 2026
cf9d9dd
refactor: rename shadowing s variables to htu/htm in Parse()
Copilot Mar 25, 2026
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
11 changes: 5 additions & 6 deletions crypto/dpop/dpop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"net/http"
"net/url"
"slices"
"strings"
"time"

"github.com/lestrrat-go/jwx/v2/jwa"
Expand Down Expand Up @@ -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() == "" {
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down