sendnrw/pocket-id
2
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2026-10-05 09:19:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade jwx to v4 (#1730)

Browse Source
This commit is contained in:
Alessandro (Ale) Segala
2026-08-31 14:12:35 -07:00
committed by GitHub
parent fa8aa44706
commit 01cc44246a
26 changed files with 94 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/utils/jwk/key_provider.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwk"
"gorm.io/gorm"
"github.com/pocket-id/pocket-id/backend/internal/common"
backend/internal/utils/jwk/key_provider_database.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
"fmt"
"time"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwk"
"gorm.io/gorm"
"gorm.io/gorm/clause"
backend/internal/utils/jwk/key_provider_database_test.go
+3 -3
View File
@@ -7,7 +7,7 @@ import (
"encoding/base64"
"testing"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -44,7 +44,7 @@ func TestKeyProviderDatabase_LoadKey(t *testing.T) {
pk, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
require.NoError(t, err)
key, err := jwk.Import(pk)
key, err := jwk.Import[jwk.Key](pk)
require.NoError(t, err)
t.Run("LoadKey with no existing key", func(t *testing.T) {
@@ -213,7 +213,7 @@ func TestKeyProviderDatabase_SaveKey(t *testing.T) {
pk, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
require.NoError(t, err)
key, err := jwk.Import(pk)
key, err := jwk.Import[jwk.Key](pk)
require.NoError(t, err)
t.Run("SaveKey and verify database record", func(t *testing.T) {
backend/internal/utils/jwk/public_key.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"errors"
"fmt"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwk"
)
var (
backend/internal/utils/jwk/public_key_test.go
+3 -3
View File
@@ -4,8 +4,8 @@ import (
"encoding/json"
"testing"
"github.com/lestrrat-go/jwx/v3/jwa"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwa"
"github.com/lestrrat-go/jwx/v4/jwk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -54,7 +54,7 @@ func TestParsePublicKey(t *testing.T) {
})
t.Run("rejects symmetric keys", func(t *testing.T) {
symmetricKey, err := jwk.Import([]byte("this-is-a-shared-secret"))
symmetricKey, err := jwk.Import[jwk.Key]([]byte("this-is-a-shared-secret"))
require.NoError(t, err)
require.NoError(t, symmetricKey.Set(jwk.KeyIDKey, "symmetric"))
encoded, err := json.Marshal(symmetricKey)
backend/internal/utils/jwk/utils.go
+3 -3
View File
@@ -13,8 +13,8 @@ import (
"fmt"
"io"
"github.com/lestrrat-go/jwx/v3/jwa"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwa"
"github.com/lestrrat-go/jwx/v4/jwk"
"github.com/pocket-id/pocket-id/backend/internal/common"
"github.com/pocket-id/pocket-id/backend/internal/utils/crypto"
@@ -58,7 +58,7 @@ func LoadKeyEncryptionKey(envConfig *common.EnvConfigSchema, instanceID string)
// ImportRawKey imports a crypto key in "raw" format (e.g. crypto.PrivateKey) into a jwk.Key.
// It also populates additional fields such as the key ID, usage, and alg.
func ImportRawKey(rawKey any, alg string, crv string) (jwk.Key, error) {
key, err := jwk.Import(rawKey)
key, err := jwk.Import[jwk.Key](rawKey)
if err != nil {
return nil, fmt.Errorf("failed to import generated private key: %w", err)
}
backend/internal/utils/jwk/utils_test.go
+10 -14
View File
@@ -9,8 +9,8 @@ import (
"encoding/hex"
"testing"
"github.com/lestrrat-go/jwx/v3/jwa"
"github.com/lestrrat-go/jwx/v3/jwk"
"github.com/lestrrat-go/jwx/v4/jwa"
"github.com/lestrrat-go/jwx/v4/jwk"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@@ -130,8 +130,7 @@ func TestGenerateKey(t *testing.T) {
assert.True(t, ok, "key usage should be set")
assert.Equal(t, KeyUsageSigning, usage)
var crv any
_ = key.Get("crv", &crv)
crv, _ := jwk.Get[any](key, "crv")
// Verify key type matches expected algorithm
switch tt.expectedAlg {
@@ -162,7 +161,7 @@ func TestEnsureAlgInKey(t *testing.T) {
t.Run("does not change alg already set", func(t *testing.T) {
// Import the RSA key
key, err := jwk.Import(rsaKey)
key, err := jwk.Import[jwk.Key](rsaKey)
require.NoError(t, err)
// Pre-set the algorithm
@@ -224,7 +223,7 @@ func TestEnsureAlgInKey(t *testing.T) {
rawKey, err := tt.keyGen()
require.NoError(t, err)
key, err := jwk.Import(rawKey)
key, err := jwk.Import[jwk.Key](rawKey)
require.NoError(t, err)
// Ensure no algorithm is set initially
@@ -241,8 +240,7 @@ func TestEnsureAlgInKey(t *testing.T) {
// Verify curve if expected
if tt.expectedCrv != "" {
var crv any
_ = key.Get("crv", &crv)
crv, _ := jwk.Get[any](key, "crv")
require.NotNil(t, crv)
eca, ok := crv.(jwa.EllipticCurveAlgorithm)
require.True(t, ok)
@@ -291,7 +289,7 @@ func TestEnsureAlgInKey(t *testing.T) {
rawKey, err := tt.keyGen()
require.NoError(t, err)
key, err := jwk.Import(rawKey)
key, err := jwk.Import[jwk.Key](rawKey)
require.NoError(t, err)
// Ensure no algorithm is set initially
@@ -308,8 +306,7 @@ func TestEnsureAlgInKey(t *testing.T) {
// Verify curve if expected
if tt.expectedCrv != "" {
var crv any
_ = key.Get("crv", &crv)
crv, _ := jwk.Get[any](key, "crv")
require.NotNil(t, crv)
eca, ok := crv.(jwa.EllipticCurveAlgorithm)
require.True(t, ok)
@@ -323,7 +320,7 @@ func TestEnsureAlgInKey(t *testing.T) {
rsaKey, err := rsa.GenerateKey(rand.Reader, 2048)
require.NoError(t, err)
key, err := jwk.Import(rsaKey)
key, err := jwk.Import[jwk.Key](rsaKey)
require.NoError(t, err)
// Call EnsureAlgInKey with invalid curve
@@ -334,8 +331,7 @@ func TestEnsureAlgInKey(t *testing.T) {
require.True(t, ok)
assert.Equal(t, jwa.RS256().String(), alg.String())
var crv any
_ = key.Get("crv", &crv)
crv, _ := jwk.Get[any](key, "crv")
assert.Nil(t, crv)
})
}
backend/internal/utils/jwt_util.go
+3 -3
View File
@@ -3,15 +3,15 @@ package utils
import (
"fmt"
"github.com/lestrrat-go/jwx/v3/jwt"
"github.com/lestrrat-go/jwx/v4/jwt"
)
func GetClaimsFromToken(token jwt.Token) (map[string]any, error) {
keys := token.Keys()
claims := make(map[string]any, len(keys))
for _, key := range keys {
var value any
if err := token.Get(key, &value); err != nil {
value, err := jwt.Get[any](token, key)
if err != nil {
return nil, fmt.Errorf("failed to get claim %s: %w", key, err)
}
claims[key] = value