Skip to content

Use generics and fix bug of jwt count #2

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.

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
merged 2 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
create all available generic signers
  • Loading branch information
dominicriordan committed Apr 28, 2023
commit c164908904a3087e17cf946d0e65d5b99f3978f1
44 changes: 0 additions & 44 deletions pkgs/jwt-signer/ecdsa/ecdsa.go

This file was deleted.

44 changes: 0 additions & 44 deletions pkgs/jwt-signer/ed25519/ed25519.go

This file was deleted.

44 changes: 0 additions & 44 deletions pkgs/jwt-signer/rsa256/rsa256.go

This file was deleted.

44 changes: 0 additions & 44 deletions pkgs/jwt-signer/rsa512/rsa512.go

This file was deleted.

105 changes: 90 additions & 15 deletions pkgs/jwt-signer/signer.go
Original file line number Diff line number Diff line change
@@ -1,30 +1,105 @@
package jwt_signer

import (
"crypto"
"crypto/ecdsa"
"crypto/rsa"
"errors"
"github.com/domsolutions/gopayloader/pkgs/jwt-signer/definition"
"github.com/domsolutions/gopayloader/pkgs/jwt-signer/ecdsa"
ed25519 "github.com/domsolutions/gopayloader/pkgs/jwt-signer/ed25519"
"github.com/domsolutions/gopayloader/pkgs/jwt-signer/rsa256"
rsa512 "github.com/domsolutions/gopayloader/pkgs/jwt-signer/rsa512"
"github.com/golang-jwt/jwt"
"github.com/pterm/pterm"
)

type Signer func(privKey []byte, kid string) (definition.Signer, error)
func CreateSigner(privKey []byte, kid string) (definition.Signer, error) {
var signer definition.Signer

// TODO add more signers, use generics?
signer, err := createSigner[*ecdsa.PrivateKey](privKey, kid, jwt.ParseECPrivateKeyFromPEM, jwt.SigningMethodES256)
if err == nil {
return signer, nil
}
signer, err = createSigner[*ecdsa.PrivateKey](privKey, kid, jwt.ParseECPrivateKeyFromPEM, jwt.SigningMethodES384)
if err == nil {
return signer, nil
}
signer, err = createSigner[*ecdsa.PrivateKey](privKey, kid, jwt.ParseECPrivateKeyFromPEM, jwt.SigningMethodES512)
if err == nil {
return signer, nil
}
signer, err = createSigner[crypto.PrivateKey](privKey, kid, jwt.ParseEdPrivateKeyFromPEM, jwt.SigningMethodEdDSA)
if err == nil {
return signer, nil
}
signer, err = createSigner[*rsa.PrivateKey](privKey, kid, jwt.ParseRSAPrivateKeyFromPEM, jwt.SigningMethodRS512)
if err == nil {
return signer, nil
}
signer, err = createSigner[*rsa.PrivateKey](privKey, kid, jwt.ParseRSAPrivateKeyFromPEM, jwt.SigningMethodRS256)
if err == nil {
return signer, nil
}
signer, err = createSigner[*rsa.PrivateKey](privKey, kid, jwt.ParseRSAPrivateKeyFromPEM, jwt.SigningMethodRS384)
if err == nil {
return signer, nil
}

var signers = []Signer{ecdsa.Signer, ed25519.Signer, rsa256.Signer, rsa512.Signer}
signer, err = createSigner[[]byte](privKey, kid, func(key []byte) ([]byte, error) {
return key, nil
}, jwt.SigningMethodHS256)
if err == nil {
return signer, nil
}

func CreateSigner(privKey []byte, kid string) (definition.Signer, error) {
var signer definition.Signer
var err error
for _, s := range signers {
signer, err = s(privKey, kid)
if err != nil {
continue
}
signer, err = createSigner[[]byte](privKey, kid, func(key []byte) ([]byte, error) {
return key, nil
}, jwt.SigningMethodHS384)
if err == nil {
return signer, nil
}

signer, err = createSigner[[]byte](privKey, kid, func(key []byte) ([]byte, error) {
return key, nil
}, jwt.SigningMethodHS512)
if err == nil {
return signer, nil
}

return nil, errors.New("no supported jwt signer")
}

type signer struct {
kid string
privKey any
method jwt.SigningMethod
}

func (e *signer) Generate(claims jwt.MapClaims) (string, error) {
token := jwt.NewWithClaims(e.method, claims)
token.Header["kid"] = e.kid

t, err := token.SignedString(e.privKey)
if err != nil {
return "", err
}
return t, nil
}

func createSigner[k any](privKey []byte, kid string, genPrivKey func(key []byte) (k, error), method jwt.SigningMethod) (definition.Signer, error) {
key, err := genPrivKey(privKey)
if err != nil {
pterm.Debug.Printf("Failed to parse private key %v", err)
return nil, err
}

s := &signer{
kid: kid,
privKey: key,
method: method,
}
claim := make(jwt.MapClaims)
claim["test"] = true
if _, err := s.Generate(claim); err != nil {
pterm.Debug.Printf("Failed to generate jwt %v", err)
return nil, err
}
return s, nil
}