grassrootseconomics/sarafu-vise
7
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix-pin-reset-bug' (#26) from fix-pin-reset-bug into master
Some checks failed
release / docker (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #26
This commit is contained in:
carlos 2025-02-21 10:31:45 +01:00
commit e2d5546de1
9 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
handlers/application/menuhandler.go
View File

@ -318,7 +318,7 @@ func (h *MenuHandlers) VerifyNewPin(ctx context.Context, sym string, input []byt
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin") flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
if !h.st.Back() { if string(input) != "0" {
pinInput := string(input) pinInput := string(input)
// Validate that the PIN is a 4-digit number. // Validate that the PIN is a 4-digit number.
if pin.IsValidPIN(pinInput) { if pin.IsValidPIN(pinInput) {
@ -384,6 +384,12 @@ func (h *MenuHandlers) SaveOthersTemporaryPin(ctx context.Context, sym string, i
} }
temporaryPin := string(input) temporaryPin := string(input)
// Validate that the input is a 4-digit number.
if !pin.IsValidPIN(temporaryPin) {
return res, nil
}
// Retrieve the blocked number associated with this session // Retrieve the blocked number associated with this session
blockedNumber, err := store.ReadEntry(ctx, sessionId, storedb.DATA_BLOCKED_NUMBER) blockedNumber, err := store.ReadEntry(ctx, sessionId, storedb.DATA_BLOCKED_NUMBER)
if err != nil { if err != nil {
@ -416,7 +422,7 @@ func (h *MenuHandlers) CheckBlockedNumPinMisMatch(ctx context.Context, sym strin
if !ok { if !ok {
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
if h.st.Back() { if string(input) == "0" {
res.FlagReset = append(res.FlagReset, flag_pin_mismatch) res.FlagReset = append(res.FlagReset, flag_pin_mismatch)
return res, nil return res, nil
} }
@ -456,7 +462,7 @@ func (h *MenuHandlers) ConfirmPinChange(ctx context.Context, sym string, input [
} }
flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch") flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch")
if h.st.Back() { if string(input) == "0" {
res.FlagReset = append(res.FlagReset, flag_pin_mismatch) res.FlagReset = append(res.FlagReset, flag_pin_mismatch)
return res, nil return res, nil
} }
@ -601,16 +607,20 @@ func (h *MenuHandlers) ValidateBlockedNumber(ctx context.Context, sym string, in
return res, fmt.Errorf("missing session") return res, fmt.Errorf("missing session")
} }
if h.st.Back() { if string(input) == "0" {
res.FlagReset = append(res.FlagReset, flag_unregistered_number) res.FlagReset = append(res.FlagReset, flag_unregistered_number)
return res, nil return res, nil
} }
blockedNumber := string(input) blockedNumber := string(input)
_, err = store.ReadEntry(ctx, blockedNumber, storedb.DATA_PUBLIC_KEY) formattedNumber, err := phone.FormatPhoneNumber(blockedNumber)
if !phone.IsValidPhoneNumber(blockedNumber) { if err != nil {
res.FlagSet = append(res.FlagSet, flag_unregistered_number) res.FlagSet = append(res.FlagSet, flag_unregistered_number)
logg.ErrorCtxf(ctx, "Failed to format the phone number: %s", blockedNumber, "error", err)
return res, nil return res, nil
} }
_, err = store.ReadEntry(ctx, formattedNumber, storedb.DATA_PUBLIC_KEY)
if err != nil { if err != nil {
if db.IsNotFound(err) { if db.IsNotFound(err) {
logg.InfoCtxf(ctx, "Invalid or unregistered number") logg.InfoCtxf(ctx, "Invalid or unregistered number")
@ -621,7 +631,7 @@ func (h *MenuHandlers) ValidateBlockedNumber(ctx context.Context, sym string, in
return res, err return res, err
} }
} }
err = store.WriteEntry(ctx, sessionId, storedb.DATA_BLOCKED_NUMBER, []byte(blockedNumber)) err = store.WriteEntry(ctx, sessionId, storedb.DATA_BLOCKED_NUMBER, []byte(formattedNumber))
if err != nil { if err != nil {
return res, nil return res, nil
} }

2
menutraversal_test/menu_traversal_test.go
View File

@ -21,7 +21,7 @@ var (
sessionID string sessionID string
src = rand.NewSource(42) src = rand.NewSource(42)
g = rand.New(src) g = rand.New(src)
secondarySessionId = "0700000000" secondarySessionId = "+254700000000"
) )
var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests") var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")

2
services/registration/confirm_others_new_pin.vis
View File

@ -1,4 +1,4 @@
CATCH pin_entry flag_incorrect_pin 1 CATCH incorrect_pin flag_incorrect_pin 1
RELOAD retrieve_blocked_number RELOAD retrieve_blocked_number
MAP retrieve_blocked_number MAP retrieve_blocked_number
CATCH invalid_others_pin flag_valid_pin 0 CATCH invalid_others_pin flag_valid_pin 0

3
services/registration/old_pin.vis
View File

@ -1,7 +1,8 @@
RELOAD reset_incorrect RELOAD reset_allow_update
MOUT back 0 MOUT back 0
HALT HALT
INCMP _ 0 INCMP _ 0
RELOAD authorize_account RELOAD authorize_account
CATCH incorrect_pin flag_incorrect_pin 1 CATCH incorrect_pin flag_incorrect_pin 1
CATCH _ flag_allow_update 0
INCMP new_pin * INCMP new_pin *

1
services/registration/others_pin_mismatch.vis
View File

@ -3,3 +3,4 @@ MOUT quit 9
HALT HALT
INCMP _ 1 INCMP _ 1
INCMP quit 9 INCMP quit 9
INCMP . *

2
services/registration/pin_reset_mismatch.vis
View File

@ -3,4 +3,4 @@ MOUT quit 9
HALT HALT
INCMP _ 1 INCMP _ 1
INCMP quit 9 INCMP quit 9
INCMP . *

1
services/registration/pin_reset_success.vis
View File

@ -3,3 +3,4 @@ MOUT quit 9
HALT HALT
INCMP main 0 INCMP main 0
INCMP quit 9 INCMP quit 9
INCMP . *