Skip to content
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

Revert "Allow Redemption With Non-Current Valid Keys" #516

Merged
merged 1 commit into from
Jul 6, 2023
Merged

Revert "Allow Redemption With Non-Current Valid Keys" #516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
109 changes: 48 additions & 61 deletions kafka/signed_token_redeem_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ import (

/*
SignedTokenRedeemHandler emits payment tokens that correspond to the signed confirmation

tokens provided. If it encounters a permanent error, it emits a permanent result for that
item. If the error is temporary, an error is returned to indicate that progress cannot be
made.
tokens provided. If it encounters a permanent error, it emits a permanent result for that
item. If the error is temporary, an error is returned to indicate that progress cannot be
made.
*/
func SignedTokenRedeemHandler(
msg kafka.Message,
Expand Down Expand Up @@ -84,48 +83,6 @@ func SignedTokenRedeemHandler(
return nil
}

// Create a lookup for issuers & signing keys based on public key
issuerLookup := map[string]*cbpServer.Issuer{}
signingKeyLookup := map[string]*crypto.SigningKey{}
for _, issuer := range *issuers {
if !issuer.ExpiresAt.IsZero() && issuer.ExpiresAt.Before(time.Now()) {
continue
}

for _, issuerKey := range issuer.Keys {
// Don't use keys outside their start/end dates
if !issuerKey.StartAt.IsZero() && issuerKey.StartAt.After(time.Now()) {
continue
}
if !issuerKey.EndAt.IsZero() && issuerKey.EndAt.Before(time.Now()) {
continue
}

signingKey := issuer.SigningKey

// Only attempt token verification with the issuer that was provided.
issuerPublicKey := signingKey.PublicKey()
marshaledPublicKey, err := issuerPublicKey.MarshalText()
// Unmarshaling failure is a data issue and is probably permanent.
if err != nil {
message := fmt.Sprintf("request %s: could not unmarshal issuer public key into text", tokenRedeemRequestSet.Request_id)
handlePermanentRedemptionError(
message,
err,
msg,
producer,
tokenRedeemRequestSet.Request_id,
int32(avroSchema.RedeemResultStatusError),
log,
)
return nil
}

issuerLookup[string(marshaledPublicKey)] = &issuer
signingKeyLookup[string(marshaledPublicKey)] = signingKey
}
}

// Iterate over requests (only one at this point but the schema can support more
// in the future if needed)
for _, request := range tokenRedeemRequestSet.Data {
Expand Down Expand Up @@ -193,23 +150,53 @@ func SignedTokenRedeemHandler(
)
return nil
}
for _, issuer := range *issuers {
if !issuer.ExpiresAt.IsZero() && issuer.ExpiresAt.Before(time.Now()) {
continue
}

if issuer, signingKey := issuerLookup[request.Public_key], signingKeyLookup[request.Public_key]; issuer != nil && signingKey != nil {
logger.
Trace().
Str("requestID", tokenRedeemRequestSet.Request_id).
Str("publicKey", request.Public_key).
Msg("attempting token redemption verification")
// get latest signing key from issuer
var signingKey *crypto.SigningKey
if len(issuer.Keys) > 0 {
signingKey = issuer.Keys[len(issuer.Keys)-1].SigningKey
}

if err := btd.VerifyTokenRedemption(
&tokenPreimage,
&verificationSignature,
request.Binding,
[]*crypto.SigningKey{signingKey},
); err == nil {
verified = true
verifiedIssuer = issuer
verifiedCohort = int32(issuer.IssuerCohort)
// Only attempt token verification with the issuer that was provided.
issuerPublicKey := signingKey.PublicKey()
marshaledPublicKey, err := issuerPublicKey.MarshalText()
// Unmarshaling failure is a data issue and is probably permanent.
if err != nil {
message := fmt.Sprintf("request %s: could not unmarshal issuer public key into text", tokenRedeemRequestSet.Request_id)
handlePermanentRedemptionError(
message,
err,
msg,
producer,
tokenRedeemRequestSet.Request_id,
int32(avroSchema.RedeemResultStatusError),
log,
)
return nil
}

logger.Trace().
Msgf("request %s: issuer: %s, request: %s", tokenRedeemRequestSet.Request_id,
string(marshaledPublicKey), request.Public_key)

if string(marshaledPublicKey) == request.Public_key {
if err := btd.VerifyTokenRedemption(
&tokenPreimage,
&verificationSignature,
request.Binding,
[]*crypto.SigningKey{signingKey},
); err != nil {
verified = false
} else {
verified = true
verifiedIssuer = &issuer
verifiedCohort = int32(issuer.IssuerCohort)
break
}
}
}

Expand Down