attach an admin store for phone numbers

cmd/main.go

@@ -49,7 +49,7 @@ func main() {
 	ctx = context.WithValue(ctx, "Database", database)
 	pfp := path.Join(scriptDir, "pp.csv")
 
-	as := utils.NewAdminStore("admin_numbers.txt")
+	as, _ := utils.NewAdminStore(ctx, "admin_numbers")
 	as.Seed()
 
 	cfg := engine.Config{
@@ -94,6 +94,7 @@ func main() {
 
 	lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
+	lhs.SetAdminStore(as)
 	lhs.SetPersister(pe)
 
 	if err != nil {

internal/handlers/handlerservice.go

@@ -8,6 +8,7 @@ import (
 	"git.defalsify.org/vise.git/resource"
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
+	"git.grassecon.net/urdt/ussd/internal/utils"
 )
 
 type HandlerService interface {
@@ -28,6 +29,7 @@ type LocalHandlerService struct {
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
+	AdminStore    *utils.AdminStore
 	Cfg           engine.Config
 	Rs            resource.Resource
 }
@@ -53,8 +55,12 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }
 
+func (ls *LocalHandlerService) SetAdminStore(adminstore *utils.AdminStore) {
+	ls.AdminStore = adminstore
+}
+
 func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceInterface) (*ussd.Handlers, error) {
-	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, accountService)
+	ussdHandlers, err := ussd.NewHandlers(ls.Parser, *ls.UserdataStore, ls.AdminStore, accountService)
 	if err != nil {
 		return nil, err
 	}
@@ -103,6 +109,8 @@ func (ls *LocalHandlerService) GetHandler(accountService server.AccountServiceIn
 	ls.DbRs.AddLocalFunc("validate_blocked_number", ussdHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", ussdHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", ussdHandlers.ResetUnregisteredNumber)
+	ls.DbRs.AddLocalFunc("reset_others_pin", ussdHandlers.ResetOthersPin)
+	ls.DbRs.AddLocalFunc("save_others_temporary_pin", ussdHandlers.SaveOthersTemporaryPin)
 
 	return ussdHandlers, nil
 }

internal/utils/adminstore.go

@@ -1,80 +1,85 @@
 package utils
 
 import (
-	"bufio"
-	"log"
+	"context"
+	"encoding/json"
 	"os"
-	"strconv"
-	"strings"
 
-	"git.grassecon.net/urdt/ussd/initializers"
+	"git.defalsify.org/vise.git/db"
+	fsdb "git.defalsify.org/vise.git/db/fs"
+	"git.defalsify.org/vise.git/logging"
 )
 
-type AdminStore struct {
-	filePath string
+var (
+	logg = logging.NewVanilla().WithDomain("adminstore")
+)
+
+type Admin struct {
+	PhoneNumber string `json:"phonenumber"`
 }
 
-// Creates a new Admin store
-func NewAdminStore(filePath string) *AdminStore {
-	return &AdminStore{filePath: filePath}
+type Config struct {
+	Admins []Admin `json:"admins"`
+}
+
+type AdminStore struct {
+	ctx     context.Context
+	fsStore db.Db
+}
+
+func NewAdminStore(ctx context.Context, fileName string) (*AdminStore, error) {
+	fsStore, err := getFsStore(ctx, fileName)
+	if err != nil {
+		return nil, err
+	}
+	return &AdminStore{ctx: ctx, fsStore: fsStore}, nil
+}
+
+func getFsStore(ctx context.Context, connectStr string) (db.Db, error) {
+	fsStore := fsdb.NewFsDb()
+	err := fsStore.Connect(ctx, connectStr)
+	fsStore.SetPrefix(db.DATATYPE_USERDATA)
+	if err != nil {
+		return nil, err
+	}
+	return fsStore, nil
 }
 
 // Seed initializes a list of phonenumbers with admin privileges
 func (as *AdminStore) Seed() error {
-	var adminNumbers []int64
+	var config Config
 
-	numbersEnv := initializers.GetEnv("ADMIN_NUMBERS", "")
-	for _, numStr := range strings.Split(numbersEnv, ",") {
-		if num, err := strconv.ParseInt(strings.TrimSpace(numStr), 10, 64); err == nil {
-			adminNumbers = append(adminNumbers, num)
-		} else {
-			log.Printf("Skipping invalid number: %s", numStr)
-		}
-	}
-	file, err := os.Create(as.filePath)
+	store := as.fsStore
+	defer store.Close()
+
+	data, err := os.ReadFile("admin_numbers.json")
 	if err != nil {
 		return err
 	}
-	defer file.Close()
-
-	writer := bufio.NewWriter(file)
-	for _, num := range adminNumbers {
-		_, err := writer.WriteString(strconv.FormatInt(num, 10) + "\n")
+	if err := json.Unmarshal(data, &config); err != nil {
+		return err
+	}
+	for _, admin := range config.Admins {
+		err := store.Put(as.ctx, []byte(admin.PhoneNumber), []byte("1"))
 		if err != nil {
+			logg.Printf(logging.LVL_DEBUG, "Failed to insert admin number", admin.PhoneNumber)
 			return err
 		}
 	}
-	return writer.Flush()
+	return nil
 }
 
-func (as *AdminStore) load() ([]int64, error) {
-	file, err := os.Open(as.filePath)
+// Checks if the given sessionId is listed as an admin.
+func (as *AdminStore) IsAdmin(sessionId string) (bool, error) {
+	_, err := as.fsStore.Get(as.ctx, []byte(sessionId))
 	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	var numbers []int64
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		num, err := strconv.ParseInt(scanner.Text(), 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		numbers = append(numbers, num)
-	}
-	return numbers, scanner.Err()
-}
-
-func (as *AdminStore) IsAdmin(phoneNumber int64) (bool, error) {
-	phoneNumbers, err := as.load()
-	if err != nil {
-		return false, err
-	}
-	for _, phonenumber := range phoneNumbers {
-		if phonenumber == phoneNumber {
-			return true, nil
+		if db.IsNotFound(err) {
+			logg.Printf(logging.LVL_INFO, "Returning false because session id was not found")
+			return false, nil
+		} else {
+			return false, err
 		}
 	}
-	return false, nil
+
+	return true, nil
 }

services/registration/confirm_others_new_pin.vis

@@ -1,9 +1,9 @@
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 CATCH invalid_others_pin flag_valid_pin 0
-LOAD save_temporary_pin 6
-RELOAD save_temporary_pin
 CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
 MOUT back 0
 HALT 
 INCMP _ 0

services/registration/enter_others_new_pin.vis

@@ -2,7 +2,7 @@ LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 MOUT back 0
 HALT 
-INCMP _ 0
-LOAD verify_new_pin 0
+LOAD verify_new_pin 6
 RELOAD verify_new_pin
+INCMP _ 0
 INCMP * confirm_others_new_pin

services/registration/pin_reset_result.vis

@@ -1,5 +1,6 @@
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
+LOAD reset_others_pin 6
 MOUT back 0
 MOUT quit 9
 HALT