eric/onix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated steps to use updated keymanager interface function

Browse Source
This commit is contained in:
MohitKatare-protean
2025-05-27 10:51:40 +05:30
parent ea872338f6
commit 3ebf4e9815
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/module/handler/step.go
View File

@@ -31,18 +31,18 @@ func newSignStep(signer definition.Signer, km definition.KeyManager) (definition
// Run executes the signing step. // Run executes the signing step.
func (s *signStep) Run(ctx *model.StepContext) error { func (s *signStep) Run(ctx *model.StepContext) error {
keyID, key, err := s.km.SigningPrivateKey(ctx, ctx.SubID) keySet, err := s.km.Keyset(ctx, ctx.SubID)
if err != nil { if err != nil {
return fmt.Errorf("failed to get signing key: %w", err) return fmt.Errorf("failed to get signing key: %w", err)
} }
createdAt := time.Now().Unix() createdAt := time.Now().Unix()
validTill := time.Now().Add(5 * time.Minute).Unix() validTill := time.Now().Add(5 * time.Minute).Unix()
sign, err := s.signer.Sign(ctx, ctx.Body, key, createdAt, validTill) sign, err := s.signer.Sign(ctx, ctx.Body, keySet.SigningPrivate, createdAt, validTill)
if err != nil { if err != nil {
return fmt.Errorf("failed to sign request: %w", err) return fmt.Errorf("failed to sign request: %w", err)
} }
authHeader := s.generateAuthHeader(ctx.SubID, keyID, createdAt, validTill, sign) authHeader := s.generateAuthHeader(ctx.SubID, keySet.UniqueKeyID, createdAt, validTill, sign)
header := model.AuthHeaderSubscriber header := model.AuthHeaderSubscriber
if ctx.Role == model.RoleGateway { if ctx.Role == model.RoleGateway {
@@ -107,13 +107,12 @@ func (s *validateSignStep) validate(ctx *model.StepContext, value string) error
if len(ids) < 2 || len(headerParts) < 3 { if len(ids) < 2 || len(headerParts) < 3 {
return fmt.Errorf("malformed sign header") return fmt.Errorf("malformed sign header")
} }
subID := ids[1]
keyID := headerParts[1] keyID := headerParts[1]
key, err := s.km.SigningPublicKey(ctx, subID, keyID) keySet, err := s.km.Keyset(ctx, keyID)
if err != nil { if err != nil {
return fmt.Errorf("failed to get validation key: %w", err) return fmt.Errorf("failed to get validation key: %w", err)
} }
if err := s.validator.Validate(ctx, ctx.Body, value, key); err != nil { if err := s.validator.Validate(ctx, ctx.Body, value, keySet.SigningPublic); err != nil {
return fmt.Errorf("sign validation failed: %w", err) return fmt.Errorf("sign validation failed: %w", err)
} }
return nil return nil