TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-13 03:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(notification): check both user event versions and if code expired (#887)

Browse Source
This commit is contained in:
Livio Amstutz 2020-10-21 16:42:29 +02:00 committed by GitHub
parent efcac8e70a
commit 274dce2c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
internal/notification/repository/eventsourcing/handler/notification.go
View File

@ -4,6 +4,7 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"net/http" "net/http"
"time"
"github.com/caos/logging" "github.com/caos/logging"
@ -79,7 +80,13 @@ func (n *Notification) Reduce(event *models.Event) (err error) {
} }
func (n *Notification) handleInitUserCode(event *models.Event) (err error) { func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
alreadyHandled, err := n.checkIfCodeAlreadyHandled(event.AggregateID, event.Sequence, es_model.InitializedUserCodeAdded, es_model.InitializedUserCodeSent) initCode := new(es_model.InitUserCode)
if err := initCode.SetData(event); err != nil {
return err
}
alreadyHandled, err := n.checkIfCodeAlreadyHandledOrExpired(event, initCode.Expiry,
es_model.InitializedUserCodeAdded, es_model.InitializedUserCodeSent,
es_model.InitializedHumanCodeAdded, es_model.InitializedHumanCodeSent)
if err != nil || alreadyHandled { if err != nil || alreadyHandled {
return err return err
} }
@ -89,8 +96,6 @@ func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
return err return err
} }
initCode := new(es_model.InitUserCode)
initCode.SetData(event)
user, err := n.view.NotifyUserByID(event.AggregateID) user, err := n.view.NotifyUserByID(event.AggregateID)
if err != nil { if err != nil {
return err return err
@ -103,7 +108,13 @@ func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
} }
func (n *Notification) handlePasswordCode(event *models.Event) (err error) { func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
alreadyHandled, err := n.checkIfCodeAlreadyHandled(event.AggregateID, event.Sequence, es_model.UserPasswordCodeAdded, es_model.UserPasswordCodeSent) pwCode := new(es_model.PasswordCode)
if err := pwCode.SetData(event); err != nil {
return err
}
alreadyHandled, err := n.checkIfCodeAlreadyHandledOrExpired(event, pwCode.Expiry,
es_model.UserPasswordCodeAdded, es_model.UserPasswordCodeSent,
es_model.HumanPasswordCodeAdded, es_model.HumanPasswordCodeSent)
if err != nil || alreadyHandled { if err != nil || alreadyHandled {
return err return err
} }
@ -113,8 +124,6 @@ func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
return err return err
} }
pwCode := new(es_model.PasswordCode)
pwCode.SetData(event)
user, err := n.view.NotifyUserByID(event.AggregateID) user, err := n.view.NotifyUserByID(event.AggregateID)
if err != nil { if err != nil {
return err return err
@ -127,7 +136,13 @@ func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
} }
func (n *Notification) handleEmailVerificationCode(event *models.Event) (err error) { func (n *Notification) handleEmailVerificationCode(event *models.Event) (err error) {
alreadyHandled, err := n.checkIfCodeAlreadyHandled(event.AggregateID, event.Sequence, es_model.UserEmailCodeAdded, es_model.UserEmailCodeSent) emailCode := new(es_model.EmailCode)
if err := emailCode.SetData(event); err != nil {
return err
}
alreadyHandled, err := n.checkIfCodeAlreadyHandledOrExpired(event, emailCode.Expiry,
es_model.UserEmailCodeAdded, es_model.UserEmailCodeSent,
es_model.HumanEmailCodeAdded, es_model.HumanEmailCodeSent)
if err != nil || alreadyHandled { if err != nil || alreadyHandled {
return nil return nil
} }
@ -137,8 +152,6 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
return err return err
} }
emailCode := new(es_model.EmailCode)
emailCode.SetData(event)
user, err := n.view.NotifyUserByID(event.AggregateID) user, err := n.view.NotifyUserByID(event.AggregateID)
if err != nil { if err != nil {
return err return err
@ -151,12 +164,16 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
} }
func (n *Notification) handlePhoneVerificationCode(event *models.Event) (err error) { func (n *Notification) handlePhoneVerificationCode(event *models.Event) (err error) {
alreadyHandled, err := n.checkIfCodeAlreadyHandled(event.AggregateID, event.Sequence, es_model.UserPhoneCodeAdded, es_model.UserPhoneCodeSent) phoneCode := new(es_model.PhoneCode)
if err := phoneCode.SetData(event); err != nil {
return err
}
alreadyHandled, err := n.checkIfCodeAlreadyHandledOrExpired(event, phoneCode.Expiry,
es_model.UserPhoneCodeAdded, es_model.UserPhoneCodeSent,
es_model.HumanPhoneCodeAdded, es_model.HumanPhoneCodeSent)
if err != nil || alreadyHandled { if err != nil || alreadyHandled {
return nil return nil
} }
phoneCode := new(es_model.PhoneCode)
phoneCode.SetData(event)
user, err := n.view.NotifyUserByID(event.AggregateID) user, err := n.view.NotifyUserByID(event.AggregateID)
if err != nil { if err != nil {
return err return err
@ -169,7 +186,7 @@ func (n *Notification) handlePhoneVerificationCode(event *models.Event) (err err
} }
func (n *Notification) handleDomainClaimed(event *models.Event) (err error) { func (n *Notification) handleDomainClaimed(event *models.Event) (err error) {
alreadyHandled, err := n.checkIfCodeAlreadyHandled(event.AggregateID, event.Sequence, es_model.DomainClaimed, es_model.DomainClaimedSent) alreadyHandled, err := n.checkIfAlreadyHandled(event.AggregateID, event.Sequence, es_model.DomainClaimed, es_model.DomainClaimedSent)
if err != nil || alreadyHandled { if err != nil || alreadyHandled {
return nil return nil
} }
@ -189,14 +206,23 @@ func (n *Notification) handleDomainClaimed(event *models.Event) (err error) {
return n.userEvents.DomainClaimedSent(getSetNotifyContextData(event.ResourceOwner), event.AggregateID) return n.userEvents.DomainClaimedSent(getSetNotifyContextData(event.ResourceOwner), event.AggregateID)
} }
func (n *Notification) checkIfCodeAlreadyHandled(userID string, sequence uint64, addedType, sentType models.EventType) (bool, error) { func (n *Notification) checkIfCodeAlreadyHandledOrExpired(event *models.Event, expiry time.Duration, eventTypes ...models.EventType) (bool, error) {
if event.CreationDate.Add(expiry).Before(time.Now().UTC()) {
return true, nil
}
return n.checkIfAlreadyHandled(event.AggregateID, event.Sequence, eventTypes...)
}
func (n *Notification) checkIfAlreadyHandled(userID string, sequence uint64, eventTypes ...models.EventType) (bool, error) {
events, err := n.getUserEvents(userID, sequence) events, err := n.getUserEvents(userID, sequence)
if err != nil { if err != nil {
return false, err return false, err
} }
for _, event := range events { for _, event := range events {
if event.Type == addedType || event.Type == sentType { for _, eventType := range eventTypes {
return true, nil if event.Type == eventType {
return true, nil
}
} }
} }
return false, nil return false, nil