Compare commits
80 Commits
wip-http-s
...
master
Author | SHA1 | Date | |
---|---|---|---|
7197382911 | |||
5c5f4cbc8e | |||
e581a1ad2f | |||
929e812992 | |||
3fe66466c5 | |||
f6979868e5 | |||
e8be64ae28 | |||
e4d8bfad7b | |||
96358959b4 | |||
bc9dfe4f65 | |||
ffa00ae15c | |||
13294b42d3 | |||
81159e77d1 | |||
5bd51b280e | |||
71e1ae6e3c | |||
10de039da0 | |||
27aa71e0ee | |||
a9a429824c | |||
4098ac8a19 | |||
2982f08b41 | |||
75ab9c66a3 | |||
95f02231b3 | |||
599f7a2857 | |||
2e7c07e6f4 | |||
01f7571185 | |||
065c8e5c1d | |||
dc14480519 | |||
aaf4923f64 | |||
e9c645bd87 | |||
1be6da9139 | |||
fa2930d93a | |||
a409e292ab | |||
00c86a2850 | |||
4daac7e90b | |||
06e23565df | |||
b19188165b | |||
2ed9f083bb | |||
e323ffa078 | |||
68de83af97 | |||
a3f2b23128 | |||
09f970db9b | |||
04edd90c21 | |||
a3f410875a | |||
3f3e98e637 | |||
660f8b7aa2 | |||
|
8ae3372c36 | ||
3a7c3ffc67 | |||
78c033e61c | |||
b5ef483f34 | |||
006eef0a28 | |||
e99a788c60 | |||
b5d33a98f0 | |||
f4f475bd45 | |||
6fe2e7287f | |||
1e9c9cf6ad | |||
3cb0b099e4 | |||
b53658e038 | |||
512460fdeb | |||
762f90adf6 | |||
|
9b4a4eeaf4 | ||
5e4e6a21a0 | |||
ffeb28e851 | |||
|
9c751aff30 | ||
|
b31d3b907a | ||
|
d49f866ca4 | ||
|
dde9f552a6 | ||
0f9b5551ec | |||
|
514e043e38 | ||
|
836e5fe8ee | ||
|
660fcaa0b6 | ||
44015b1c76 | |||
|
7438531900 | ||
|
681f293d3c | ||
|
8e3ff27bb8 | ||
|
dd2468a4d7 | ||
63cee42261 | |||
9f034967b5 | |||
ad48890a9f | |||
c0a3ad7e2b | |||
a3dffdf4e9 |
172
cmd/africastalking/main.go
Normal file
172
cmd/africastalking/main.go
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"path"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/logging"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
httpserver "git.grassecon.net/urdt/ussd/internal/http"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
logg = logging.NewVanilla()
|
||||||
|
scriptDir = path.Join("services", "registration")
|
||||||
|
)
|
||||||
|
|
||||||
|
type atRequestParser struct{}
|
||||||
|
|
||||||
|
func (arp *atRequestParser) GetSessionId(rq any) (string, error) {
|
||||||
|
rqv, ok := rq.(*http.Request)
|
||||||
|
if !ok {
|
||||||
|
return "", handlers.ErrInvalidRequest
|
||||||
|
}
|
||||||
|
if err := rqv.ParseForm(); err != nil {
|
||||||
|
return "", fmt.Errorf("failed to parse form data: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
phoneNumber := rqv.FormValue("phoneNumber")
|
||||||
|
if phoneNumber == "" {
|
||||||
|
return "", fmt.Errorf("no phone number found")
|
||||||
|
}
|
||||||
|
|
||||||
|
return phoneNumber, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (arp *atRequestParser) GetInput(rq any) ([]byte, error) {
|
||||||
|
rqv, ok := rq.(*http.Request)
|
||||||
|
if !ok {
|
||||||
|
return nil, handlers.ErrInvalidRequest
|
||||||
|
}
|
||||||
|
if err := rqv.ParseForm(); err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to parse form data: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
text := rqv.FormValue("text")
|
||||||
|
|
||||||
|
parts := strings.Split(text, "*")
|
||||||
|
if len(parts) == 0 {
|
||||||
|
return nil, fmt.Errorf("no input found")
|
||||||
|
}
|
||||||
|
|
||||||
|
return []byte(parts[len(parts)-1]), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
var dbDir string
|
||||||
|
var resourceDir string
|
||||||
|
var size uint
|
||||||
|
var engineDebug bool
|
||||||
|
var stateDebug bool
|
||||||
|
var host string
|
||||||
|
var port uint
|
||||||
|
flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
|
||||||
|
flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
|
||||||
|
flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
|
||||||
|
flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
|
||||||
|
flag.UintVar(&size, "s", 160, "max size of output")
|
||||||
|
flag.StringVar(&host, "h", "127.0.0.1", "http host")
|
||||||
|
flag.UintVar(&port, "p", 7123, "http port")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pfp := path.Join(scriptDir, "pp.csv")
|
||||||
|
|
||||||
|
cfg := engine.Config{
|
||||||
|
Root: "root",
|
||||||
|
OutputSize: uint32(size),
|
||||||
|
FlagCount: uint32(16),
|
||||||
|
}
|
||||||
|
if stateDebug {
|
||||||
|
cfg.StateDebug = true
|
||||||
|
}
|
||||||
|
if engineDebug {
|
||||||
|
cfg.EngineDebug = true
|
||||||
|
}
|
||||||
|
|
||||||
|
menuStorageService := storage.MenuStorageService{}
|
||||||
|
|
||||||
|
rs, err := menuStorageService.GetResource(scriptDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = menuStorageService.EnsureDbDir(dbDir)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
userdataStore := menuStorageService.GetUserdataDb(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer userdataStore.Close()
|
||||||
|
|
||||||
|
dbResource, ok := rs.(*resource.DbResource)
|
||||||
|
if !ok {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
|
||||||
|
lhs.WithDataStore(&userdataStore)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
hl, err := lhs.GetHandler()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
stateStore, err := menuStorageService.GetStateStore(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer stateStore.Close()
|
||||||
|
|
||||||
|
rp := &atRequestParser{}
|
||||||
|
bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
|
||||||
|
sh := httpserver.NewATSessionHandler(bsh)
|
||||||
|
s := &http.Server{
|
||||||
|
Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
|
||||||
|
Handler: sh,
|
||||||
|
}
|
||||||
|
s.RegisterOnShutdown(sh.Shutdown)
|
||||||
|
|
||||||
|
cint := make(chan os.Signal)
|
||||||
|
cterm := make(chan os.Signal)
|
||||||
|
signal.Notify(cint, os.Interrupt, syscall.SIGINT)
|
||||||
|
signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
|
||||||
|
go func() {
|
||||||
|
select {
|
||||||
|
case _ = <-cint:
|
||||||
|
case _ = <-cterm:
|
||||||
|
}
|
||||||
|
s.Shutdown(ctx)
|
||||||
|
}()
|
||||||
|
err = s.ListenAndServe()
|
||||||
|
if err != nil {
|
||||||
|
logg.Infof("Server closed with error", "err", err)
|
||||||
|
}
|
||||||
|
}
|
161
cmd/async/main.go
Normal file
161
cmd/async/main.go
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"path"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/logging"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
logg = logging.NewVanilla()
|
||||||
|
scriptDir = path.Join("services", "registration")
|
||||||
|
)
|
||||||
|
|
||||||
|
type asyncRequestParser struct {
|
||||||
|
sessionId string
|
||||||
|
input []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *asyncRequestParser) GetSessionId(r any) (string, error) {
|
||||||
|
return p.sessionId, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *asyncRequestParser) GetInput(r any) ([]byte, error) {
|
||||||
|
return p.input, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
var sessionId string
|
||||||
|
var dbDir string
|
||||||
|
var resourceDir string
|
||||||
|
var size uint
|
||||||
|
var engineDebug bool
|
||||||
|
var stateDebug bool
|
||||||
|
var host string
|
||||||
|
var port uint
|
||||||
|
flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
|
||||||
|
flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
|
||||||
|
flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
|
||||||
|
flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
|
||||||
|
flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
|
||||||
|
flag.UintVar(&size, "s", 160, "max size of output")
|
||||||
|
flag.StringVar(&host, "h", "127.0.0.1", "http host")
|
||||||
|
flag.UintVar(&port, "p", 7123, "http port")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size, "sessionId", sessionId)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pfp := path.Join(scriptDir, "pp.csv")
|
||||||
|
|
||||||
|
cfg := engine.Config{
|
||||||
|
Root: "root",
|
||||||
|
OutputSize: uint32(size),
|
||||||
|
FlagCount: uint32(16),
|
||||||
|
}
|
||||||
|
if stateDebug {
|
||||||
|
cfg.StateDebug = true
|
||||||
|
}
|
||||||
|
if engineDebug {
|
||||||
|
cfg.EngineDebug = true
|
||||||
|
}
|
||||||
|
|
||||||
|
menuStorageService := storage.MenuStorageService{}
|
||||||
|
rs, err := menuStorageService.GetResource(scriptDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = menuStorageService.EnsureDbDir(dbDir)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
userdataStore := menuStorageService.GetUserdataDb(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer userdataStore.Close()
|
||||||
|
|
||||||
|
dbResource, ok := rs.(*resource.DbResource)
|
||||||
|
if !ok {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
|
||||||
|
lhs.WithDataStore(&userdataStore)
|
||||||
|
|
||||||
|
hl, err := lhs.GetHandler()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
stateStore, err := menuStorageService.GetStateStore(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer stateStore.Close()
|
||||||
|
|
||||||
|
rp := &asyncRequestParser{
|
||||||
|
sessionId: sessionId,
|
||||||
|
}
|
||||||
|
sh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
|
||||||
|
cfg.SessionId = sessionId
|
||||||
|
rqs := handlers.RequestSession{
|
||||||
|
Ctx: ctx,
|
||||||
|
Writer: os.Stdout,
|
||||||
|
Config: cfg,
|
||||||
|
}
|
||||||
|
|
||||||
|
cint := make(chan os.Signal)
|
||||||
|
cterm := make(chan os.Signal)
|
||||||
|
signal.Notify(cint, os.Interrupt, syscall.SIGINT)
|
||||||
|
signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
|
||||||
|
go func() {
|
||||||
|
select {
|
||||||
|
case _ = <-cint:
|
||||||
|
case _ = <-cterm:
|
||||||
|
}
|
||||||
|
sh.Shutdown()
|
||||||
|
}()
|
||||||
|
|
||||||
|
for true {
|
||||||
|
rqs, err = sh.Process(rqs)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Errorf("error in process: %v", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
rqs, err = sh.Output(rqs)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Errorf("error in output: %v", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
rqs, err = sh.Reset(rqs)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Errorf("error in reset: %v", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
fmt.Println("")
|
||||||
|
_, err = fmt.Scanln(&rqs.Input)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Errorf("error in input: %v", err)
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
132
cmd/http/main.go
Normal file
132
cmd/http/main.go
Normal file
@ -0,0 +1,132 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"flag"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
"os/signal"
|
||||||
|
"path"
|
||||||
|
"strconv"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/logging"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
httpserver "git.grassecon.net/urdt/ussd/internal/http"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
logg = logging.NewVanilla()
|
||||||
|
scriptDir = path.Join("services", "registration")
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
var dbDir string
|
||||||
|
var resourceDir string
|
||||||
|
var size uint
|
||||||
|
var engineDebug bool
|
||||||
|
var stateDebug bool
|
||||||
|
var host string
|
||||||
|
var port uint
|
||||||
|
flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
|
||||||
|
flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
|
||||||
|
flag.BoolVar(&engineDebug, "engine-debug", false, "use engine debug output")
|
||||||
|
flag.BoolVar(&stateDebug, "state-debug", false, "use engine debug output")
|
||||||
|
flag.UintVar(&size, "s", 160, "max size of output")
|
||||||
|
flag.StringVar(&host, "h", "127.0.0.1", "http host")
|
||||||
|
flag.UintVar(&port, "p", 7123, "http port")
|
||||||
|
flag.Parse()
|
||||||
|
|
||||||
|
logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
pfp := path.Join(scriptDir, "pp.csv")
|
||||||
|
|
||||||
|
cfg := engine.Config{
|
||||||
|
Root: "root",
|
||||||
|
OutputSize: uint32(size),
|
||||||
|
FlagCount: uint32(16),
|
||||||
|
}
|
||||||
|
if stateDebug {
|
||||||
|
cfg.StateDebug = true
|
||||||
|
}
|
||||||
|
if engineDebug {
|
||||||
|
cfg.EngineDebug = true
|
||||||
|
}
|
||||||
|
|
||||||
|
menuStorageService := storage.MenuStorageService{}
|
||||||
|
rs, err := menuStorageService.GetResource(scriptDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
err = menuStorageService.EnsureDbDir(dbDir)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
userdataStore := menuStorageService.GetUserdataDb(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer userdataStore.Close()
|
||||||
|
|
||||||
|
dbResource, ok := rs.(*resource.DbResource)
|
||||||
|
if !ok {
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
|
||||||
|
lhs.WithDataStore(&userdataStore)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
hl, err := lhs.GetHandler()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
stateStore, err := menuStorageService.GetStateStore(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
defer stateStore.Close()
|
||||||
|
|
||||||
|
rp := &httpserver.DefaultRequestParser{}
|
||||||
|
bsh := handlers.NewBaseSessionHandler(cfg, rs, stateStore, userdataStore, rp, hl)
|
||||||
|
sh := httpserver.ToSessionHandler(bsh)
|
||||||
|
s := &http.Server{
|
||||||
|
Addr: fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
|
||||||
|
Handler: sh,
|
||||||
|
}
|
||||||
|
s.RegisterOnShutdown(sh.Shutdown)
|
||||||
|
|
||||||
|
cint := make(chan os.Signal)
|
||||||
|
cterm := make(chan os.Signal)
|
||||||
|
signal.Notify(cint, os.Interrupt, syscall.SIGINT)
|
||||||
|
signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
|
||||||
|
go func() {
|
||||||
|
select {
|
||||||
|
case _ = <-cint:
|
||||||
|
case _ = <-cterm:
|
||||||
|
}
|
||||||
|
s.Shutdown(ctx)
|
||||||
|
}()
|
||||||
|
err = s.ListenAndServe()
|
||||||
|
if err != nil {
|
||||||
|
logg.Infof("Server closed with error", "err", err)
|
||||||
|
}
|
||||||
|
}
|
132
cmd/main.go
132
cmd/main.go
@ -7,15 +7,11 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
|
||||||
"git.defalsify.org/vise.git/asm"
|
|
||||||
"git.defalsify.org/vise.git/db"
|
|
||||||
fsdb "git.defalsify.org/vise.git/db/fs"
|
|
||||||
gdbmdb "git.defalsify.org/vise.git/db/gdbm"
|
|
||||||
"git.defalsify.org/vise.git/engine"
|
"git.defalsify.org/vise.git/engine"
|
||||||
"git.defalsify.org/vise.git/logging"
|
"git.defalsify.org/vise.git/logging"
|
||||||
"git.defalsify.org/vise.git/persist"
|
|
||||||
"git.defalsify.org/vise.git/resource"
|
"git.defalsify.org/vise.git/resource"
|
||||||
"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -23,116 +19,22 @@ var (
|
|||||||
scriptDir = path.Join("services", "registration")
|
scriptDir = path.Join("services", "registration")
|
||||||
)
|
)
|
||||||
|
|
||||||
func getParser(fp string, debug bool) (*asm.FlagParser, error) {
|
|
||||||
flagParser := asm.NewFlagParser().WithDebug()
|
|
||||||
_, err := flagParser.Load(fp)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return flagParser, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.Persister, userdataStore db.Db) (*ussd.Handlers, error) {
|
|
||||||
|
|
||||||
ussdHandlers, err := ussd.NewHandlers(appFlags, pe, userdataStore)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
|
|
||||||
rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
|
|
||||||
rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
|
|
||||||
rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
|
|
||||||
rs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
|
|
||||||
rs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
|
|
||||||
rs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
|
|
||||||
rs.AddLocalFunc("quit", ussdHandlers.Quit)
|
|
||||||
rs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
|
|
||||||
rs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
|
|
||||||
rs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
|
|
||||||
rs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
|
|
||||||
rs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
|
|
||||||
rs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
|
|
||||||
rs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
|
|
||||||
rs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
|
|
||||||
rs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
|
|
||||||
rs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
|
|
||||||
rs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
|
|
||||||
rs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
|
|
||||||
rs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
|
|
||||||
rs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
|
|
||||||
rs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
|
|
||||||
rs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
|
|
||||||
rs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
|
|
||||||
rs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
|
|
||||||
rs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
|
|
||||||
rs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
|
|
||||||
rs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
|
|
||||||
rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
|
|
||||||
rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
|
|
||||||
rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
|
|
||||||
|
|
||||||
return ussdHandlers, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getPersister(dbDir string, ctx context.Context) (*persist.Persister, error) {
|
|
||||||
err := os.MkdirAll(dbDir, 0700)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("state dir create exited with error: %v\n", err)
|
|
||||||
}
|
|
||||||
store := gdbmdb.NewGdbmDb()
|
|
||||||
storeFile := path.Join(dbDir, "state.gdbm")
|
|
||||||
store.Connect(ctx, storeFile)
|
|
||||||
pr := persist.NewPersister(store)
|
|
||||||
return pr, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getUserdataDb(dbDir string, ctx context.Context) db.Db {
|
|
||||||
store := gdbmdb.NewGdbmDb()
|
|
||||||
storeFile := path.Join(dbDir, "userdata.gdbm")
|
|
||||||
store.Connect(ctx, storeFile)
|
|
||||||
|
|
||||||
return store
|
|
||||||
}
|
|
||||||
|
|
||||||
func getResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
|
|
||||||
store := fsdb.NewFsDb()
|
|
||||||
err := store.Connect(ctx, resourceDir)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
rfs := resource.NewDbResource(store)
|
|
||||||
return rfs, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func getEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) *engine.DefaultEngine {
|
|
||||||
en := engine.NewEngine(cfg, rs)
|
|
||||||
en = en.WithPersister(pr)
|
|
||||||
return en
|
|
||||||
}
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var dbDir string
|
var dbDir string
|
||||||
var resourceDir string
|
|
||||||
var size uint
|
var size uint
|
||||||
var sessionId string
|
var sessionId string
|
||||||
var debug bool
|
var debug bool
|
||||||
flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
|
flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
|
||||||
flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
|
flag.StringVar(&dbDir, "dbdir", ".state", "database dir to read from")
|
||||||
flag.StringVar(&resourceDir, "resourcedir", path.Join("services", "registration"), "resource dir")
|
|
||||||
flag.BoolVar(&debug, "d", false, "use engine debug output")
|
flag.BoolVar(&debug, "d", false, "use engine debug output")
|
||||||
flag.UintVar(&size, "s", 160, "max size of output")
|
flag.UintVar(&size, "s", 160, "max size of output")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
logg.Infof("start command", "dbdir", dbDir, "resourcedir", resourceDir, "outputsize", size)
|
logg.Infof("start command", "dbdir", dbDir, "outputsize", size)
|
||||||
|
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
ctx = context.WithValue(ctx, "SessionId", sessionId)
|
||||||
pfp := path.Join(scriptDir, "pp.csv")
|
pfp := path.Join(scriptDir, "pp.csv")
|
||||||
flagParser, err := getParser(pfp, true)
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg := engine.Config{
|
cfg := engine.Config{
|
||||||
Root: "root",
|
Root: "root",
|
||||||
@ -141,19 +43,27 @@ func main() {
|
|||||||
FlagCount: uint32(16),
|
FlagCount: uint32(16),
|
||||||
}
|
}
|
||||||
|
|
||||||
rs, err := getResource(resourceDir, ctx)
|
menuStorageService := storage.MenuStorageService{}
|
||||||
|
|
||||||
|
err := menuStorageService.EnsureDbDir(dbDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, err.Error())
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
pr, err := getPersister(dbDir, ctx)
|
rs, err := menuStorageService.GetResource(scriptDir, ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, err.Error())
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
store := getUserdataDb(dbDir, ctx)
|
pe, err := menuStorageService.GetPersister(dbDir, ctx)
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
userdatastore := menuStorageService.GetUserdataDb(dbDir, ctx)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, err.Error())
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
@ -161,16 +71,26 @@ func main() {
|
|||||||
|
|
||||||
dbResource, ok := rs.(*resource.DbResource)
|
dbResource, ok := rs.(*resource.DbResource)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
hl, err := getHandler(flagParser, dbResource, pr, store)
|
lhs, err := handlers.NewLocalHandlerService(pfp, true, dbResource, cfg, rs)
|
||||||
|
lhs.WithDataStore(&userdatastore)
|
||||||
|
lhs.WithPersister(pe)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, err.Error())
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
en := getEngine(cfg, rs, pr)
|
hl, err := lhs.GetHandler()
|
||||||
|
if err != nil {
|
||||||
|
fmt.Fprintf(os.Stderr, err.Error())
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
en := lhs.GetEngine()
|
||||||
en = en.WithFirst(hl.Init)
|
en = en.WithFirst(hl.Init)
|
||||||
if debug {
|
if debug {
|
||||||
en = en.WithDebug(nil)
|
en = en.WithDebug(nil)
|
||||||
|
13
go.mod
13
go.mod
@ -2,6 +2,13 @@ module git.grassecon.net/urdt/ussd
|
|||||||
|
|
||||||
go 1.22.6
|
go 1.22.6
|
||||||
|
|
||||||
|
require (
|
||||||
|
git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f
|
||||||
|
github.com/alecthomas/assert/v2 v2.2.2
|
||||||
|
github.com/peteole/testdata-loader v0.3.0
|
||||||
|
gopkg.in/leonelquinteros/gotext.v1 v1.3.1
|
||||||
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/alecthomas/participle/v2 v2.0.0 // indirect
|
github.com/alecthomas/participle/v2 v2.0.0 // indirect
|
||||||
github.com/alecthomas/repr v0.2.0 // indirect
|
github.com/alecthomas/repr v0.2.0 // indirect
|
||||||
@ -17,9 +24,3 @@ require (
|
|||||||
github.com/x448/float16 v0.8.4 // indirect
|
github.com/x448/float16 v0.8.4 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
|
||||||
git.defalsify.org/vise.git v0.1.0-rc.1.0.20240906020635-400f69d01a89
|
|
||||||
github.com/alecthomas/assert/v2 v2.2.2
|
|
||||||
gopkg.in/leonelquinteros/gotext.v1 v1.3.1
|
|
||||||
)
|
|
||||||
|
4
go.sum
4
go.sum
@ -1,5 +1,5 @@
|
|||||||
git.defalsify.org/vise.git v0.1.0-rc.1.0.20240906020635-400f69d01a89 h1:YyQODhMwSM5YD9yKHM5jCF0HC0RQtE3MkVXcTnOhXJo=
|
git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f h1:CuJvG3NyMoRtHUim4aZdrfjjJBg2AId7z0yp7Q97bRM=
|
||||||
git.defalsify.org/vise.git v0.1.0-rc.1.0.20240906020635-400f69d01a89/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
|
git.defalsify.org/vise.git v0.1.0-rc.3.0.20240911231817-0d23e0dbb57f/go.mod h1:JDguWmcoWBdsnpw7PUjVZAEpdC/ubBmjdUBy3tjP63M=
|
||||||
github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
|
github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
|
||||||
github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
|
github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
|
||||||
github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
|
github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
|
||||||
|
117
internal/handlers/base.go
Normal file
117
internal/handlers/base.go
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/persist"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
type BaseSessionHandler struct {
|
||||||
|
cfgTemplate engine.Config
|
||||||
|
rp RequestParser
|
||||||
|
rs resource.Resource
|
||||||
|
hn *ussd.Handlers
|
||||||
|
provider storage.StorageProvider
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewBaseSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp RequestParser, hn *ussd.Handlers) *BaseSessionHandler {
|
||||||
|
return &BaseSessionHandler{
|
||||||
|
cfgTemplate: cfg,
|
||||||
|
rs: rs,
|
||||||
|
hn: hn,
|
||||||
|
rp: rp,
|
||||||
|
provider: storage.NewSimpleStorageProvider(stateDb, userdataDb),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f* BaseSessionHandler) Shutdown() {
|
||||||
|
err := f.provider.Close()
|
||||||
|
if err != nil {
|
||||||
|
logg.Errorf("handler shutdown error", "err", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *BaseSessionHandler) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
|
||||||
|
en := engine.NewEngine(cfg, rs)
|
||||||
|
en = en.WithPersister(pr)
|
||||||
|
return en
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *BaseSessionHandler) Process(rqs RequestSession) (RequestSession, error) {
|
||||||
|
var r bool
|
||||||
|
var err error
|
||||||
|
var ok bool
|
||||||
|
|
||||||
|
logg.InfoCtxf(rqs.Ctx, "new request", rqs)
|
||||||
|
|
||||||
|
rqs.Storage, err = f.provider.Get(rqs.Config.SessionId)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "storage get error", err)
|
||||||
|
return rqs, ErrStorage
|
||||||
|
}
|
||||||
|
|
||||||
|
f.hn = f.hn.WithPersister(rqs.Storage.Persister)
|
||||||
|
eni := f.GetEngine(rqs.Config, f.rs, rqs.Storage.Persister)
|
||||||
|
en, ok := eni.(*engine.DefaultEngine)
|
||||||
|
if !ok {
|
||||||
|
perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
|
||||||
|
rqs.Storage = nil
|
||||||
|
if perr != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
|
||||||
|
}
|
||||||
|
return rqs, ErrEngineType
|
||||||
|
}
|
||||||
|
en = en.WithFirst(f.hn.Init)
|
||||||
|
if rqs.Config.EngineDebug {
|
||||||
|
en = en.WithDebug(nil)
|
||||||
|
}
|
||||||
|
rqs.Engine = en
|
||||||
|
|
||||||
|
r, err = rqs.Engine.Init(rqs.Ctx)
|
||||||
|
if err != nil {
|
||||||
|
perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
|
||||||
|
rqs.Storage = nil
|
||||||
|
if perr != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
|
||||||
|
}
|
||||||
|
return rqs, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if r && len(rqs.Input) > 0 {
|
||||||
|
r, err = rqs.Engine.Exec(rqs.Ctx, rqs.Input)
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
perr := f.provider.Put(rqs.Config.SessionId, rqs.Storage)
|
||||||
|
rqs.Storage = nil
|
||||||
|
if perr != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "storage put error", perr)
|
||||||
|
}
|
||||||
|
return rqs, err
|
||||||
|
}
|
||||||
|
|
||||||
|
rqs.Continue = r
|
||||||
|
return rqs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *BaseSessionHandler) Output(rqs RequestSession) (RequestSession, error) {
|
||||||
|
var err error
|
||||||
|
_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
|
||||||
|
return rqs, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *BaseSessionHandler) Reset(rqs RequestSession) (RequestSession, error) {
|
||||||
|
defer f.provider.Put(rqs.Config.SessionId, rqs.Storage)
|
||||||
|
return rqs, rqs.Engine.Finish()
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *BaseSessionHandler) GetConfig() engine.Config {
|
||||||
|
return f.cfgTemplate
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *BaseSessionHandler) GetRequestParser() RequestParser {
|
||||||
|
return f.rp
|
||||||
|
}
|
105
internal/handlers/handlerservice.go
Normal file
105
internal/handlers/handlerservice.go
Normal file
@ -0,0 +1,105 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.defalsify.org/vise.git/asm"
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/persist"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers/ussd"
|
||||||
|
)
|
||||||
|
|
||||||
|
type HandlerService interface {
|
||||||
|
GetHandler() (*ussd.Handlers, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func getParser(fp string, debug bool) (*asm.FlagParser, error) {
|
||||||
|
flagParser := asm.NewFlagParser().WithDebug()
|
||||||
|
_, err := flagParser.Load(fp)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return flagParser, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type LocalHandlerService struct {
|
||||||
|
Parser *asm.FlagParser
|
||||||
|
DbRs *resource.DbResource
|
||||||
|
Pe *persist.Persister
|
||||||
|
UserdataStore *db.Db
|
||||||
|
Cfg engine.Config
|
||||||
|
Rs resource.Resource
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLocalHandlerService(fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
|
||||||
|
parser, err := getParser(fp, debug)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &LocalHandlerService{
|
||||||
|
Parser: parser,
|
||||||
|
DbRs: dbResource,
|
||||||
|
Cfg: cfg,
|
||||||
|
Rs: rs,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (localHandlerService *LocalHandlerService) WithPersister(Pe *persist.Persister) {
|
||||||
|
localHandlerService.Pe = Pe
|
||||||
|
}
|
||||||
|
|
||||||
|
func (localHandlerService *LocalHandlerService) WithDataStore(db *db.Db) {
|
||||||
|
localHandlerService.UserdataStore = db
|
||||||
|
}
|
||||||
|
|
||||||
|
func (localHandlerService *LocalHandlerService) GetHandler() (*ussd.Handlers, error) {
|
||||||
|
ussdHandlers, err := ussd.NewHandlers(localHandlerService.Parser, *localHandlerService.UserdataStore)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
ussdHandlers = ussdHandlers.WithPersister(localHandlerService.Pe)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("check_identifier", ussdHandlers.CheckIdentifier)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("check_account_status", ussdHandlers.CheckAccountStatus)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("authorize_account", ussdHandlers.Authorize)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("quit", ussdHandlers.Quit)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("check_balance", ussdHandlers.CheckBalance)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("validate_recipient", ussdHandlers.ValidateRecipient)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("transaction_reset", ussdHandlers.TransactionReset)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("max_amount", ussdHandlers.MaxAmount)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("validate_amount", ussdHandlers.ValidateAmount)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("reset_transaction_amount", ussdHandlers.ResetTransactionAmount)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("get_recipient", ussdHandlers.GetRecipient)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("get_sender", ussdHandlers.GetSender)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("get_amount", ussdHandlers.GetAmount)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("reset_incorrect", ussdHandlers.ResetIncorrectPin)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_firstname", ussdHandlers.SaveFirstname)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_familyname", ussdHandlers.SaveFamilyname)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_gender", ussdHandlers.SaveGender)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_location", ussdHandlers.SaveLocation)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_yob", ussdHandlers.SaveYob)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_offerings", ussdHandlers.SaveOfferings)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("quit_with_balance", ussdHandlers.QuitWithBalance)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("reset_account_authorized", ussdHandlers.ResetAccountAuthorized)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("reset_allow_update", ussdHandlers.ResetAllowUpdate)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("get_profile_info", ussdHandlers.GetProfileInfo)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("verify_yob", ussdHandlers.VerifyYob)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
|
||||||
|
localHandlerService.DbRs.AddLocalFunc("quit_with_help", ussdHandlers.QuitWithHelp)
|
||||||
|
|
||||||
|
return ussdHandlers, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (localHandlerService *LocalHandlerService) GetEngine() *engine.DefaultEngine {
|
||||||
|
en := engine.NewEngine(localHandlerService.Cfg, localHandlerService.Rs)
|
||||||
|
en = en.WithPersister(localHandlerService.Pe)
|
||||||
|
return en
|
||||||
|
}
|
56
internal/handlers/single.go
Normal file
56
internal/handlers/single.go
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
"git.defalsify.org/vise.git/persist"
|
||||||
|
"git.defalsify.org/vise.git/logging"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/storage"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
logg = logging.NewVanilla().WithDomain("handlers")
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrInvalidRequest = errors.New("invalid request for context")
|
||||||
|
ErrSessionMissing = errors.New("missing session")
|
||||||
|
ErrInvalidInput = errors.New("invalid input")
|
||||||
|
ErrStorage = errors.New("storage retrieval fail")
|
||||||
|
ErrEngineType = errors.New("incompatible engine")
|
||||||
|
ErrEngineInit = errors.New("engine init fail")
|
||||||
|
ErrEngineExec = errors.New("engine exec fail")
|
||||||
|
)
|
||||||
|
|
||||||
|
type RequestSession struct {
|
||||||
|
Ctx context.Context
|
||||||
|
Config engine.Config
|
||||||
|
Engine engine.Engine
|
||||||
|
Input []byte
|
||||||
|
Storage *storage.Storage
|
||||||
|
Writer io.Writer
|
||||||
|
Continue bool
|
||||||
|
}
|
||||||
|
|
||||||
|
type engineMaker func(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine
|
||||||
|
|
||||||
|
// TODO: seems like can remove this.
|
||||||
|
type RequestParser interface {
|
||||||
|
GetSessionId(rq any) (string, error)
|
||||||
|
GetInput(rq any) ([]byte, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type RequestHandler interface {
|
||||||
|
GetConfig() engine.Config
|
||||||
|
GetRequestParser() RequestParser
|
||||||
|
GetEngine(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine
|
||||||
|
Process(rs RequestSession) (RequestSession, error)
|
||||||
|
Output(rs RequestSession) (RequestSession, error)
|
||||||
|
Reset(rs RequestSession) (RequestSession, error)
|
||||||
|
Shutdown()
|
||||||
|
}
|
@ -29,11 +29,6 @@ var (
|
|||||||
translationDir = path.Join(scriptDir, "locale")
|
translationDir = path.Join(scriptDir, "locale")
|
||||||
)
|
)
|
||||||
|
|
||||||
type FSData struct {
|
|
||||||
Path string
|
|
||||||
St *state.State
|
|
||||||
}
|
|
||||||
|
|
||||||
// FlagManager handles centralized flag management
|
// FlagManager handles centralized flag management
|
||||||
type FlagManager struct {
|
type FlagManager struct {
|
||||||
parser *asm.FlagParser
|
parser *asm.FlagParser
|
||||||
@ -66,20 +61,16 @@ type Handlers struct {
|
|||||||
accountService server.AccountServiceInterface
|
accountService server.AccountServiceInterface
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewHandlers(parser *asm.FlagParser, pe *persist.Persister, userdataStore db.Db) (*Handlers, error) {
|
func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db) (*Handlers, error) {
|
||||||
userDb := utils.UserDataStore{
|
|
||||||
Store: userdataStore,
|
|
||||||
}
|
|
||||||
if pe == nil {
|
|
||||||
return nil, fmt.Errorf("cannot create handler with nil persister")
|
|
||||||
}
|
|
||||||
if userdataStore == nil {
|
if userdataStore == nil {
|
||||||
return nil, fmt.Errorf("cannot create handler with nil userdata store")
|
return nil, fmt.Errorf("cannot create handler with nil userdata store")
|
||||||
}
|
}
|
||||||
|
userDb := &utils.UserDataStore{
|
||||||
|
Db: userdataStore,
|
||||||
|
}
|
||||||
h := &Handlers{
|
h := &Handlers{
|
||||||
pe: pe,
|
|
||||||
userdataStore: userDb,
|
userdataStore: userDb,
|
||||||
flagManager: parser,
|
flagManager: appFlags,
|
||||||
accountService: &server.AccountService{},
|
accountService: &server.AccountService{},
|
||||||
}
|
}
|
||||||
return h, nil
|
return h, nil
|
||||||
@ -94,6 +85,14 @@ func isValidPIN(pin string) bool {
|
|||||||
return match
|
return match
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handlers) WithPersister(pe *persist.Persister) *Handlers {
|
||||||
|
if h.pe != nil {
|
||||||
|
panic("persister already set")
|
||||||
|
}
|
||||||
|
h.pe = pe
|
||||||
|
return h
|
||||||
|
}
|
||||||
|
|
||||||
func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var r resource.Result
|
var r resource.Result
|
||||||
|
|
||||||
@ -117,15 +116,15 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
|
|||||||
// SetLanguage sets the language across the menu
|
// SetLanguage sets the language across the menu
|
||||||
func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
var err error
|
|
||||||
|
|
||||||
inputStr := string(input)
|
sym, _ = h.st.Where()
|
||||||
switch inputStr {
|
|
||||||
case "0":
|
switch sym {
|
||||||
res.FlagSet = []uint32{state.FLAG_LANG}
|
case "set_default":
|
||||||
|
res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
|
||||||
res.Content = "eng"
|
res.Content = "eng"
|
||||||
case "1":
|
case "set_swa":
|
||||||
res.FlagSet = []uint32{state.FLAG_LANG}
|
res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
|
||||||
res.Content = "swa"
|
res.Content = "swa"
|
||||||
default:
|
default:
|
||||||
}
|
}
|
||||||
@ -212,6 +211,74 @@ func (h *Handlers) SavePin(ctx context.Context, sym string, input []byte) (resou
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *Handlers) VerifyNewPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
|
res := resource.Result{}
|
||||||
|
_, ok := ctx.Value("SessionId").(string)
|
||||||
|
if !ok {
|
||||||
|
return res, fmt.Errorf("missing session")
|
||||||
|
}
|
||||||
|
flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
|
||||||
|
pinInput := string(input)
|
||||||
|
// Validate that the PIN is a 4-digit number
|
||||||
|
if isValidPIN(pinInput) {
|
||||||
|
res.FlagSet = append(res.FlagSet, flag_valid_pin)
|
||||||
|
} else {
|
||||||
|
res.FlagReset = append(res.FlagReset, flag_valid_pin)
|
||||||
|
}
|
||||||
|
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
|
var res resource.Result
|
||||||
|
var err error
|
||||||
|
|
||||||
|
sessionId, ok := ctx.Value("SessionId").(string)
|
||||||
|
if !ok {
|
||||||
|
return res, fmt.Errorf("missing session")
|
||||||
|
}
|
||||||
|
flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
|
||||||
|
|
||||||
|
accountPIN := string(input)
|
||||||
|
|
||||||
|
// Validate that the PIN is a 4-digit number
|
||||||
|
if !isValidPIN(accountPIN) {
|
||||||
|
res.FlagSet = append(res.FlagSet, flag_incorrect_pin)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
store := h.userdataStore
|
||||||
|
err = store.WriteEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(accountPIN))
|
||||||
|
if err != nil {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *Handlers) ConfirmPinChange(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
|
var res resource.Result
|
||||||
|
sessionId, ok := ctx.Value("SessionId").(string)
|
||||||
|
if !ok {
|
||||||
|
return res, fmt.Errorf("missing session")
|
||||||
|
}
|
||||||
|
flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch")
|
||||||
|
|
||||||
|
store := h.userdataStore
|
||||||
|
temporaryPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_TEMPORARY_PIN)
|
||||||
|
if err != nil {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
if bytes.Equal(temporaryPin, input) {
|
||||||
|
res.FlagReset = append(res.FlagReset, flag_pin_mismatch)
|
||||||
|
} else {
|
||||||
|
res.FlagSet = append(res.FlagSet, flag_pin_mismatch)
|
||||||
|
}
|
||||||
|
err = store.WriteEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(temporaryPin))
|
||||||
|
if err != nil {
|
||||||
|
return res, err
|
||||||
|
}
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
// SetResetSingleEdit sets and resets flags to allow gradual editing of profile information.
|
// SetResetSingleEdit sets and resets flags to allow gradual editing of profile information.
|
||||||
func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) SetResetSingleEdit(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
@ -254,7 +321,7 @@ func (h *Handlers) VerifyPin(ctx context.Context, sym string, input []byte) (res
|
|||||||
}
|
}
|
||||||
|
|
||||||
//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
|
//AccountPin, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_ACCOUNT_PIN)
|
||||||
store := h.userdataStore.(utils.UserDataStore)
|
store := h.userdataStore
|
||||||
AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
|
AccountPin, err := store.ReadEntry(ctx, sessionId, utils.DATA_ACCOUNT_PIN)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
@ -318,9 +385,6 @@ func (h *Handlers) SaveFamilyname(ctx context.Context, sym string, input []byte)
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
if err != nil {
|
|
||||||
return res, nil
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return res, fmt.Errorf("a family name cannot be less than one character")
|
return res, fmt.Errorf("a family name cannot be less than one character")
|
||||||
}
|
}
|
||||||
@ -477,8 +541,6 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err == nil {
|
|
||||||
if len(input) == 4 {
|
if len(input) == 4 {
|
||||||
if bytes.Equal(input, AccountPin) {
|
if bytes.Equal(input, AccountPin) {
|
||||||
if h.st.MatchFlag(flag_account_authorized, false) {
|
if h.st.MatchFlag(flag_account_authorized, false) {
|
||||||
@ -493,11 +555,9 @@ func (h *Handlers) Authorize(ctx context.Context, sym string, input []byte) (res
|
|||||||
res.FlagReset = append(res.FlagReset, flag_account_authorized)
|
res.FlagReset = append(res.FlagReset, flag_account_authorized)
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -523,7 +583,7 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
|
|||||||
if !ok {
|
if !ok {
|
||||||
return res, fmt.Errorf("missing session")
|
return res, fmt.Errorf("missing session")
|
||||||
}
|
}
|
||||||
store := h.userdataStore.(utils.UserDataStore)
|
store := h.userdataStore
|
||||||
trackingId, err := store.ReadEntry(ctx, sessionId, utils.DATA_TRACKING_ID)
|
trackingId, err := store.ReadEntry(ctx, sessionId, utils.DATA_TRACKING_ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
@ -565,6 +625,22 @@ func (h *Handlers) Quit(ctx context.Context, sym string, input []byte) (resource
|
|||||||
return res, nil
|
return res, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// QuitWithHelp displays helpline information then exits the menu
|
||||||
|
func (h *Handlers) QuitWithHelp(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
|
var res resource.Result
|
||||||
|
|
||||||
|
flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
|
||||||
|
|
||||||
|
code := codeFromCtx(ctx)
|
||||||
|
l := gotext.NewLocale(translationDir, code)
|
||||||
|
l.AddDomain("default")
|
||||||
|
|
||||||
|
res.Content = l.Get("For more help,please call: 0757628885")
|
||||||
|
res.FlagReset = append(res.FlagReset, flag_account_authorized)
|
||||||
|
return res, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// VerifyYob verifies the length of the given input
|
// VerifyYob verifies the length of the given input
|
||||||
func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||||
var res resource.Result
|
var res resource.Result
|
||||||
@ -610,7 +686,7 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
|
|||||||
return res, fmt.Errorf("missing session")
|
return res, fmt.Errorf("missing session")
|
||||||
}
|
}
|
||||||
|
|
||||||
store := h.userdataStore.(utils.UserDataStore)
|
store := h.userdataStore
|
||||||
publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
|
publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
@ -744,7 +820,8 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
|
|||||||
|
|
||||||
flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
|
flag_invalid_amount, _ := h.flagManager.GetFlag("flag_invalid_amount")
|
||||||
|
|
||||||
publicKey, _ := utils.ReadEntry(ctx, h.userdataStore, sessionId, utils.DATA_PUBLIC_KEY)
|
store := h.userdataStore
|
||||||
|
publicKey, _ := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
|
||||||
|
|
||||||
amountStr := string(input)
|
amountStr := string(input)
|
||||||
|
|
||||||
@ -788,7 +865,6 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
|
|||||||
}
|
}
|
||||||
|
|
||||||
res.Content = fmt.Sprintf("%.3f", inputAmount) // Format to 3 decimal places
|
res.Content = fmt.Sprintf("%.3f", inputAmount) // Format to 3 decimal places
|
||||||
store := h.userdataStore
|
|
||||||
err = store.WriteEntry(ctx, sessionId, utils.DATA_AMOUNT, []byte(amountStr))
|
err = store.WriteEntry(ctx, sessionId, utils.DATA_AMOUNT, []byte(amountStr))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
@ -862,7 +938,7 @@ func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte
|
|||||||
l := gotext.NewLocale(translationDir, code)
|
l := gotext.NewLocale(translationDir, code)
|
||||||
l.AddDomain("default")
|
l.AddDomain("default")
|
||||||
|
|
||||||
store := h.userdataStore.(utils.UserDataStore)
|
store := h.userdataStore
|
||||||
publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
|
publicKey, err := store.ReadEntry(ctx, sessionId, utils.DATA_PUBLIC_KEY)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,69 +0,0 @@
|
|||||||
package mocks
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"git.defalsify.org/vise.git/lang"
|
|
||||||
"git.grassecon.net/urdt/ussd/internal/utils"
|
|
||||||
"github.com/stretchr/testify/mock"
|
|
||||||
)
|
|
||||||
|
|
||||||
type MockUserDataStore struct {
|
|
||||||
mock.Mock
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) SetPrefix(prefix uint8) {
|
|
||||||
m.Called(prefix)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) SetSession(sessionId string) {
|
|
||||||
m.Called(sessionId)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) Get(ctx context.Context, key []byte) ([]byte, error) {
|
|
||||||
args := m.Called(ctx, key)
|
|
||||||
return args.Get(0).([]byte), args.Error(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) ReadEntry(ctx context.Context, sessionId string, typ utils.DataTyp) ([]byte, error) {
|
|
||||||
args := m.Called(ctx, sessionId, typ)
|
|
||||||
return args.Get(0).([]byte), args.Error(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) WriteEntry(ctx context.Context, sessionId string, typ utils.DataTyp, value []byte) error {
|
|
||||||
args := m.Called(ctx, sessionId, typ, value)
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) Prefix() uint8 {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Get(0).(uint8)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) Safe() bool {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Get(0).(bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) SetLanguage(language *lang.Language) {
|
|
||||||
m.Called(language)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) SetLock(uint8, bool) error {
|
|
||||||
args := m.Called()
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) Connect(ctx context.Context, connectionStr string) error {
|
|
||||||
args := m.Called(ctx, connectionStr)
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockUserDataStore) Put(ctx context.Context, key, value []byte) error {
|
|
||||||
args := m.Called(ctx, key, value)
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
||||||
func (m *MockUserDataStore) Close() error {
|
|
||||||
args := m.Called(nil)
|
|
||||||
return args.Error(0)
|
|
||||||
}
|
|
92
internal/http/at_session_handler.go
Normal file
92
internal/http/at_session_handler.go
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ATSessionHandler struct {
|
||||||
|
*SessionHandler
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewATSessionHandler(h handlers.RequestHandler) *ATSessionHandler {
|
||||||
|
return &ATSessionHandler{
|
||||||
|
SessionHandler: ToSessionHandler(h),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ash *ATSessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
||||||
|
var code int
|
||||||
|
var err error
|
||||||
|
|
||||||
|
rqs := handlers.RequestSession{
|
||||||
|
Ctx: req.Context(),
|
||||||
|
Writer: w,
|
||||||
|
}
|
||||||
|
|
||||||
|
rp := ash.GetRequestParser()
|
||||||
|
cfg := ash.GetConfig()
|
||||||
|
cfg.SessionId, err = rp.GetSessionId(req)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
|
||||||
|
ash.writeError(w, 400, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
rqs.Config = cfg
|
||||||
|
rqs.Input, err = rp.GetInput(req)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
|
||||||
|
ash.writeError(w, 400, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rqs, err = ash.Process(rqs)
|
||||||
|
switch err {
|
||||||
|
case nil: // set code to 200 if no err
|
||||||
|
code = 200
|
||||||
|
case handlers.ErrStorage, handlers.ErrEngineInit, handlers.ErrEngineExec, handlers.ErrEngineType:
|
||||||
|
code = 500
|
||||||
|
default:
|
||||||
|
code = 500
|
||||||
|
}
|
||||||
|
|
||||||
|
if code != 200 {
|
||||||
|
ash.writeError(w, 500, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(200)
|
||||||
|
w.Header().Set("Content-Type", "text/plain")
|
||||||
|
rqs, err = ash.Output(rqs)
|
||||||
|
if err != nil {
|
||||||
|
ash.writeError(w, 500, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rqs, err = ash.Reset(rqs)
|
||||||
|
if err != nil {
|
||||||
|
ash.writeError(w, 500, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ash *ATSessionHandler) Output(rqs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
var err error
|
||||||
|
var prefix string
|
||||||
|
|
||||||
|
if rqs.Continue {
|
||||||
|
prefix = "CON "
|
||||||
|
} else {
|
||||||
|
prefix = "END "
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = io.WriteString(rqs.Writer, prefix)
|
||||||
|
if err != nil {
|
||||||
|
return rqs, err
|
||||||
|
}
|
||||||
|
|
||||||
|
_, err = rqs.Engine.WriteResult(rqs.Ctx, rqs.Writer)
|
||||||
|
return rqs, err
|
||||||
|
}
|
449
internal/http/http_test.go
Normal file
449
internal/http/http_test.go
Normal file
@ -0,0 +1,449 @@
|
|||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"errors"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/mocks/httpmocks"
|
||||||
|
)
|
||||||
|
|
||||||
|
// invalidRequestType is a custom type to test invalid request scenarios
|
||||||
|
type invalidRequestType struct{}
|
||||||
|
|
||||||
|
// errorReader is a helper type that always returns an error when Read is called
|
||||||
|
type errorReader struct{}
|
||||||
|
|
||||||
|
func (e *errorReader) Read(p []byte) (n int, err error) {
|
||||||
|
return 0, errors.New("read error")
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNewATSessionHandler(t *testing.T) {
|
||||||
|
mockHandler := &httpmocks.MockRequestHandler{}
|
||||||
|
ash := NewATSessionHandler(mockHandler)
|
||||||
|
|
||||||
|
if ash == nil {
|
||||||
|
t.Fatal("NewATSessionHandler returned nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
if ash.SessionHandler == nil {
|
||||||
|
t.Fatal("SessionHandler is nil")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestATSessionHandler_ServeHTTP(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
setupMocks func(*httpmocks.MockRequestHandler, *httpmocks.MockRequestParser, *httpmocks.MockEngine)
|
||||||
|
formData url.Values
|
||||||
|
expectedStatus int
|
||||||
|
expectedBody string
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Successful request",
|
||||||
|
setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
|
||||||
|
mrp.GetSessionIdFunc = func(rq any) (string, error) {
|
||||||
|
req := rq.(*http.Request)
|
||||||
|
return req.FormValue("phoneNumber"), nil
|
||||||
|
}
|
||||||
|
mrp.GetInputFunc = func(rq any) ([]byte, error) {
|
||||||
|
req := rq.(*http.Request)
|
||||||
|
text := req.FormValue("text")
|
||||||
|
parts := strings.Split(text, "*")
|
||||||
|
return []byte(parts[len(parts)-1]), nil
|
||||||
|
}
|
||||||
|
mh.ProcessFunc = func(rqs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
rqs.Continue = true
|
||||||
|
rqs.Engine = me
|
||||||
|
return rqs, nil
|
||||||
|
}
|
||||||
|
mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
|
||||||
|
mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
|
||||||
|
mh.OutputFunc = func(rs handlers.RequestSession) (handlers.RequestSession, error) { return rs, nil }
|
||||||
|
mh.ResetFunc = func(rs handlers.RequestSession) (handlers.RequestSession, error) { return rs, nil }
|
||||||
|
me.WriteResultFunc = func(context.Context, io.Writer) (int, error) { return 0, nil }
|
||||||
|
},
|
||||||
|
formData: url.Values{
|
||||||
|
"phoneNumber": []string{"+1234567890"},
|
||||||
|
"text": []string{"1*2*3"},
|
||||||
|
},
|
||||||
|
expectedStatus: http.StatusOK,
|
||||||
|
expectedBody: "CON ",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "GetSessionId error",
|
||||||
|
setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
|
||||||
|
mrp.GetSessionIdFunc = func(rq any) (string, error) {
|
||||||
|
return "", errors.New("no phone number found")
|
||||||
|
}
|
||||||
|
mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
|
||||||
|
mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
|
||||||
|
},
|
||||||
|
formData: url.Values{
|
||||||
|
"text": []string{"1*2*3"},
|
||||||
|
},
|
||||||
|
expectedStatus: http.StatusBadRequest,
|
||||||
|
expectedBody: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "GetInput error",
|
||||||
|
setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
|
||||||
|
mrp.GetSessionIdFunc = func(rq any) (string, error) {
|
||||||
|
req := rq.(*http.Request)
|
||||||
|
return req.FormValue("phoneNumber"), nil
|
||||||
|
}
|
||||||
|
mrp.GetInputFunc = func(rq any) ([]byte, error) {
|
||||||
|
return nil, errors.New("no input found")
|
||||||
|
}
|
||||||
|
mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
|
||||||
|
mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
|
||||||
|
},
|
||||||
|
formData: url.Values{
|
||||||
|
"phoneNumber": []string{"+1234567890"},
|
||||||
|
},
|
||||||
|
expectedStatus: http.StatusBadRequest,
|
||||||
|
expectedBody: "",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Process error",
|
||||||
|
setupMocks: func(mh *httpmocks.MockRequestHandler, mrp *httpmocks.MockRequestParser, me *httpmocks.MockEngine) {
|
||||||
|
mrp.GetSessionIdFunc = func(rq any) (string, error) {
|
||||||
|
req := rq.(*http.Request)
|
||||||
|
return req.FormValue("phoneNumber"), nil
|
||||||
|
}
|
||||||
|
mrp.GetInputFunc = func(rq any) ([]byte, error) {
|
||||||
|
req := rq.(*http.Request)
|
||||||
|
text := req.FormValue("text")
|
||||||
|
parts := strings.Split(text, "*")
|
||||||
|
return []byte(parts[len(parts)-1]), nil
|
||||||
|
}
|
||||||
|
mh.ProcessFunc = func(rqs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return rqs, handlers.ErrStorage
|
||||||
|
}
|
||||||
|
mh.GetConfigFunc = func() engine.Config { return engine.Config{} }
|
||||||
|
mh.GetRequestParserFunc = func() handlers.RequestParser { return mrp }
|
||||||
|
},
|
||||||
|
formData: url.Values{
|
||||||
|
"phoneNumber": []string{"+1234567890"},
|
||||||
|
"text": []string{"1*2*3"},
|
||||||
|
},
|
||||||
|
expectedStatus: http.StatusInternalServerError,
|
||||||
|
expectedBody: "",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
mockHandler := &httpmocks.MockRequestHandler{}
|
||||||
|
mockRequestParser := &httpmocks.MockRequestParser{}
|
||||||
|
mockEngine := &httpmocks.MockEngine{}
|
||||||
|
tt.setupMocks(mockHandler, mockRequestParser, mockEngine)
|
||||||
|
|
||||||
|
ash := NewATSessionHandler(mockHandler)
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(tt.formData.Encode()))
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
|
||||||
|
ash.ServeHTTP(w, req)
|
||||||
|
|
||||||
|
if w.Code != tt.expectedStatus {
|
||||||
|
t.Errorf("Expected status %d, got %d", tt.expectedStatus, w.Code)
|
||||||
|
}
|
||||||
|
|
||||||
|
if tt.expectedBody != "" && w.Body.String() != tt.expectedBody {
|
||||||
|
t.Errorf("Expected body %q, got %q", tt.expectedBody, w.Body.String())
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestATSessionHandler_Output(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
input handlers.RequestSession
|
||||||
|
expectedPrefix string
|
||||||
|
expectedError bool
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Continue true",
|
||||||
|
input: handlers.RequestSession{
|
||||||
|
Continue: true,
|
||||||
|
Engine: &httpmocks.MockEngine{
|
||||||
|
WriteResultFunc: func(context.Context, io.Writer) (int, error) {
|
||||||
|
return 0, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Writer: &httpmocks.MockWriter{},
|
||||||
|
},
|
||||||
|
expectedPrefix: "CON ",
|
||||||
|
expectedError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Continue false",
|
||||||
|
input: handlers.RequestSession{
|
||||||
|
Continue: false,
|
||||||
|
Engine: &httpmocks.MockEngine{
|
||||||
|
WriteResultFunc: func(context.Context, io.Writer) (int, error) {
|
||||||
|
return 0, nil
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Writer: &httpmocks.MockWriter{},
|
||||||
|
},
|
||||||
|
expectedPrefix: "END ",
|
||||||
|
expectedError: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "WriteResult error",
|
||||||
|
input: handlers.RequestSession{
|
||||||
|
Continue: true,
|
||||||
|
Engine: &httpmocks.MockEngine{
|
||||||
|
WriteResultFunc: func(context.Context, io.Writer) (int, error) {
|
||||||
|
return 0, errors.New("write error")
|
||||||
|
},
|
||||||
|
},
|
||||||
|
Writer: &httpmocks.MockWriter{},
|
||||||
|
},
|
||||||
|
expectedPrefix: "CON ",
|
||||||
|
expectedError: true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
ash := &ATSessionHandler{}
|
||||||
|
_, err := ash.Output(tt.input)
|
||||||
|
|
||||||
|
if tt.expectedError && err == nil {
|
||||||
|
t.Error("Expected an error, but got nil")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !tt.expectedError && err != nil {
|
||||||
|
t.Errorf("Unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
mw := tt.input.Writer.(*httpmocks.MockWriter)
|
||||||
|
if !mw.WriteStringCalled {
|
||||||
|
t.Error("WriteString was not called")
|
||||||
|
}
|
||||||
|
|
||||||
|
if mw.WrittenString != tt.expectedPrefix {
|
||||||
|
t.Errorf("Expected prefix %q, got %q", tt.expectedPrefix, mw.WrittenString)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSessionHandler_ServeHTTP(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
sessionID string
|
||||||
|
input []byte
|
||||||
|
parserErr error
|
||||||
|
processErr error
|
||||||
|
outputErr error
|
||||||
|
resetErr error
|
||||||
|
expectedStatus int
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Success",
|
||||||
|
sessionID: "123",
|
||||||
|
input: []byte("test input"),
|
||||||
|
expectedStatus: http.StatusOK,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Missing Session ID",
|
||||||
|
sessionID: "",
|
||||||
|
parserErr: handlers.ErrSessionMissing,
|
||||||
|
expectedStatus: http.StatusBadRequest,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Process Error",
|
||||||
|
sessionID: "123",
|
||||||
|
input: []byte("test input"),
|
||||||
|
processErr: handlers.ErrStorage,
|
||||||
|
expectedStatus: http.StatusInternalServerError,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Output Error",
|
||||||
|
sessionID: "123",
|
||||||
|
input: []byte("test input"),
|
||||||
|
outputErr: errors.New("output error"),
|
||||||
|
expectedStatus: http.StatusOK,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Reset Error",
|
||||||
|
sessionID: "123",
|
||||||
|
input: []byte("test input"),
|
||||||
|
resetErr: errors.New("reset error"),
|
||||||
|
expectedStatus: http.StatusOK,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
mockRequestParser := &httpmocks.MockRequestParser{
|
||||||
|
GetSessionIdFunc: func(any) (string, error) {
|
||||||
|
return tt.sessionID, tt.parserErr
|
||||||
|
},
|
||||||
|
GetInputFunc: func(any) ([]byte, error) {
|
||||||
|
return tt.input, nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
mockRequestHandler := &httpmocks.MockRequestHandler{
|
||||||
|
ProcessFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return rs, tt.processErr
|
||||||
|
},
|
||||||
|
OutputFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return rs, tt.outputErr
|
||||||
|
},
|
||||||
|
ResetFunc: func(rs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return rs, tt.resetErr
|
||||||
|
},
|
||||||
|
GetRequestParserFunc: func() handlers.RequestParser {
|
||||||
|
return mockRequestParser
|
||||||
|
},
|
||||||
|
GetConfigFunc: func() engine.Config {
|
||||||
|
return engine.Config{}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
sessionHandler := ToSessionHandler(mockRequestHandler)
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/", bytes.NewBuffer(tt.input))
|
||||||
|
req.Header.Set("X-Vise-Session", tt.sessionID)
|
||||||
|
|
||||||
|
rr := httptest.NewRecorder()
|
||||||
|
|
||||||
|
sessionHandler.ServeHTTP(rr, req)
|
||||||
|
|
||||||
|
if status := rr.Code; status != tt.expectedStatus {
|
||||||
|
t.Errorf("handler returned wrong status code: got %v want %v",
|
||||||
|
status, tt.expectedStatus)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSessionHandler_writeError(t *testing.T) {
|
||||||
|
handler := &SessionHandler{}
|
||||||
|
mockWriter := &httpmocks.MockWriter{}
|
||||||
|
err := errors.New("test error")
|
||||||
|
|
||||||
|
handler.writeError(mockWriter, http.StatusBadRequest, err)
|
||||||
|
|
||||||
|
if mockWriter.WrittenString != "" {
|
||||||
|
t.Errorf("Expected empty body, got %s", mockWriter.WrittenString)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDefaultRequestParser_GetSessionId(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
request any
|
||||||
|
expectedID string
|
||||||
|
expectedError error
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Valid Session ID",
|
||||||
|
request: func() *http.Request {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, "/", nil)
|
||||||
|
req.Header.Set("X-Vise-Session", "123456")
|
||||||
|
return req
|
||||||
|
}(),
|
||||||
|
expectedID: "123456",
|
||||||
|
expectedError: nil,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Missing Session ID",
|
||||||
|
request: httptest.NewRequest(http.MethodPost, "/", nil),
|
||||||
|
expectedID: "",
|
||||||
|
expectedError: handlers.ErrSessionMissing,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Invalid Request Type",
|
||||||
|
request: invalidRequestType{},
|
||||||
|
expectedID: "",
|
||||||
|
expectedError: handlers.ErrInvalidRequest,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
parser := &DefaultRequestParser{}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
id, err := parser.GetSessionId(tt.request)
|
||||||
|
|
||||||
|
if id != tt.expectedID {
|
||||||
|
t.Errorf("Expected session ID %s, got %s", tt.expectedID, id)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != tt.expectedError {
|
||||||
|
t.Errorf("Expected error %v, got %v", tt.expectedError, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestDefaultRequestParser_GetInput(t *testing.T) {
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
request any
|
||||||
|
expectedInput []byte
|
||||||
|
expectedError error
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "Valid Input",
|
||||||
|
request: func() *http.Request {
|
||||||
|
return httptest.NewRequest(http.MethodPost, "/", bytes.NewBufferString("test input"))
|
||||||
|
}(),
|
||||||
|
expectedInput: []byte("test input"),
|
||||||
|
expectedError: nil,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Empty Input",
|
||||||
|
request: httptest.NewRequest(http.MethodPost, "/", nil),
|
||||||
|
expectedInput: []byte{},
|
||||||
|
expectedError: nil,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Invalid Request Type",
|
||||||
|
request: invalidRequestType{},
|
||||||
|
expectedInput: nil,
|
||||||
|
expectedError: handlers.ErrInvalidRequest,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "Read Error",
|
||||||
|
request: func() *http.Request {
|
||||||
|
return httptest.NewRequest(http.MethodPost, "/", &errorReader{})
|
||||||
|
}(),
|
||||||
|
expectedInput: nil,
|
||||||
|
expectedError: errors.New("read error"),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
parser := &DefaultRequestParser{}
|
||||||
|
|
||||||
|
for _, tt := range tests {
|
||||||
|
t.Run(tt.name, func(t *testing.T) {
|
||||||
|
input, err := parser.GetInput(tt.request)
|
||||||
|
|
||||||
|
if !bytes.Equal(input, tt.expectedInput) {
|
||||||
|
t.Errorf("Expected input %s, got %s", tt.expectedInput, input)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != tt.expectedError && (err == nil || err.Error() != tt.expectedError.Error()) {
|
||||||
|
t.Errorf("Expected error %v, got %v", tt.expectedError, err)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
122
internal/http/server.go
Normal file
122
internal/http/server.go
Normal file
@ -0,0 +1,122 @@
|
|||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/logging"
|
||||||
|
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
logg = logging.NewVanilla().WithDomain("httpserver")
|
||||||
|
)
|
||||||
|
|
||||||
|
type DefaultRequestParser struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
func(rp *DefaultRequestParser) GetSessionId(rq any) (string, error) {
|
||||||
|
rqv, ok := rq.(*http.Request)
|
||||||
|
if !ok {
|
||||||
|
return "", handlers.ErrInvalidRequest
|
||||||
|
}
|
||||||
|
v := rqv.Header.Get("X-Vise-Session")
|
||||||
|
if v == "" {
|
||||||
|
return "", handlers.ErrSessionMissing
|
||||||
|
}
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func(rp *DefaultRequestParser) GetInput(rq any) ([]byte, error) {
|
||||||
|
rqv, ok := rq.(*http.Request)
|
||||||
|
if !ok {
|
||||||
|
return nil, handlers.ErrInvalidRequest
|
||||||
|
}
|
||||||
|
defer rqv.Body.Close()
|
||||||
|
v, err := ioutil.ReadAll(rqv.Body)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return v, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type SessionHandler struct {
|
||||||
|
handlers.RequestHandler
|
||||||
|
}
|
||||||
|
|
||||||
|
func ToSessionHandler(h handlers.RequestHandler) *SessionHandler {
|
||||||
|
return &SessionHandler{
|
||||||
|
RequestHandler: h,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *SessionHandler) writeError(w http.ResponseWriter, code int, err error) {
|
||||||
|
s := err.Error()
|
||||||
|
w.Header().Set("Content-Length", strconv.Itoa(len(s)))
|
||||||
|
w.WriteHeader(code)
|
||||||
|
_, err = w.Write([]byte{})
|
||||||
|
if err != nil {
|
||||||
|
logg.Errorf("error writing error!!", "err", err, "olderr", s)
|
||||||
|
w.WriteHeader(500)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
func(f *SessionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
||||||
|
var code int
|
||||||
|
var err error
|
||||||
|
var perr error
|
||||||
|
|
||||||
|
rqs := handlers.RequestSession{
|
||||||
|
Ctx: req.Context(),
|
||||||
|
Writer: w,
|
||||||
|
}
|
||||||
|
|
||||||
|
rp := f.GetRequestParser()
|
||||||
|
cfg := f.GetConfig()
|
||||||
|
cfg.SessionId, err = rp.GetSessionId(req)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
|
||||||
|
f.writeError(w, 400, err)
|
||||||
|
}
|
||||||
|
rqs.Config = cfg
|
||||||
|
rqs.Input, err = rp.GetInput(req)
|
||||||
|
if err != nil {
|
||||||
|
logg.ErrorCtxf(rqs.Ctx, "", "header processing error", err)
|
||||||
|
f.writeError(w, 400, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rqs, err = f.Process(rqs)
|
||||||
|
switch err {
|
||||||
|
case handlers.ErrStorage:
|
||||||
|
code = 500
|
||||||
|
case handlers.ErrEngineInit:
|
||||||
|
code = 500
|
||||||
|
case handlers.ErrEngineExec:
|
||||||
|
code = 500
|
||||||
|
default:
|
||||||
|
code = 200
|
||||||
|
}
|
||||||
|
|
||||||
|
if code != 200 {
|
||||||
|
f.writeError(w, 500, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w.WriteHeader(200)
|
||||||
|
w.Header().Set("Content-Type", "text/plain")
|
||||||
|
rqs, err = f.Output(rqs)
|
||||||
|
rqs, perr = f.Reset(rqs)
|
||||||
|
if err != nil {
|
||||||
|
f.writeError(w, 500, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if perr != nil {
|
||||||
|
f.writeError(w, 500, perr)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
30
internal/mocks/httpmocks/enginemock.go
Normal file
30
internal/mocks/httpmocks/enginemock.go
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
package httpmocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"io"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MockEngine implements the engine.Engine interface for testing
|
||||||
|
type MockEngine struct {
|
||||||
|
InitFunc func(context.Context) (bool, error)
|
||||||
|
ExecFunc func(context.Context, []byte) (bool, error)
|
||||||
|
WriteResultFunc func(context.Context, io.Writer) (int, error)
|
||||||
|
FinishFunc func() error
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockEngine) Init(ctx context.Context) (bool, error) {
|
||||||
|
return m.InitFunc(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockEngine) Exec(ctx context.Context, input []byte) (bool, error) {
|
||||||
|
return m.ExecFunc(ctx, input)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockEngine) WriteResult(ctx context.Context, w io.Writer) (int, error) {
|
||||||
|
return m.WriteResultFunc(ctx, w)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockEngine) Finish() error {
|
||||||
|
return m.FinishFunc()
|
||||||
|
}
|
47
internal/mocks/httpmocks/requesthandlermock.go
Normal file
47
internal/mocks/httpmocks/requesthandlermock.go
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
package httpmocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.defalsify.org/vise.git/engine"
|
||||||
|
"git.defalsify.org/vise.git/persist"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/handlers"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MockRequestHandler implements handlers.RequestHandler interface for testing
|
||||||
|
type MockRequestHandler struct {
|
||||||
|
ProcessFunc func(handlers.RequestSession) (handlers.RequestSession, error)
|
||||||
|
GetConfigFunc func() engine.Config
|
||||||
|
GetEngineFunc func(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine
|
||||||
|
OutputFunc func(rs handlers.RequestSession) (handlers.RequestSession, error)
|
||||||
|
ResetFunc func(rs handlers.RequestSession) (handlers.RequestSession, error)
|
||||||
|
ShutdownFunc func()
|
||||||
|
GetRequestParserFunc func() handlers.RequestParser
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) Process(rqs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return m.ProcessFunc(rqs)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) GetConfig() engine.Config {
|
||||||
|
return m.GetConfigFunc()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) GetEngine(cfg engine.Config, rs resource.Resource, pe *persist.Persister) engine.Engine {
|
||||||
|
return m.GetEngineFunc(cfg, rs, pe)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) Output(rs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return m.OutputFunc(rs)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) Reset(rs handlers.RequestSession) (handlers.RequestSession, error) {
|
||||||
|
return m.ResetFunc(rs)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) Shutdown() {
|
||||||
|
m.ShutdownFunc()
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestHandler) GetRequestParser() handlers.RequestParser {
|
||||||
|
return m.GetRequestParserFunc()
|
||||||
|
}
|
15
internal/mocks/httpmocks/requestparsermock.go
Normal file
15
internal/mocks/httpmocks/requestparsermock.go
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
package httpmocks
|
||||||
|
|
||||||
|
// MockRequestParser implements the handlers.RequestParser interface for testing
|
||||||
|
type MockRequestParser struct {
|
||||||
|
GetSessionIdFunc func(any) (string, error)
|
||||||
|
GetInputFunc func(any) ([]byte, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestParser) GetSessionId(rq any) (string, error) {
|
||||||
|
return m.GetSessionIdFunc(rq)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockRequestParser) GetInput(rq any) ([]byte, error) {
|
||||||
|
return m.GetInputFunc(rq)
|
||||||
|
}
|
25
internal/mocks/httpmocks/writermock.go
Normal file
25
internal/mocks/httpmocks/writermock.go
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
package httpmocks
|
||||||
|
|
||||||
|
import "net/http"
|
||||||
|
|
||||||
|
// MockWriter implements a mock io.Writer for testing
|
||||||
|
type MockWriter struct {
|
||||||
|
WriteStringCalled bool
|
||||||
|
WrittenString string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockWriter) Write(p []byte) (n int, err error) {
|
||||||
|
return len(p), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockWriter) WriteString(s string) (n int, err error) {
|
||||||
|
m.WriteStringCalled = true
|
||||||
|
m.WrittenString = s
|
||||||
|
return len(s), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockWriter) Header() http.Header {
|
||||||
|
return http.Header{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockWriter) WriteHeader(statusCode int) {}
|
24
internal/mocks/userdbmock.go
Normal file
24
internal/mocks/userdbmock.go
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
package mocks
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
"git.grassecon.net/urdt/ussd/internal/utils"
|
||||||
|
"github.com/stretchr/testify/mock"
|
||||||
|
)
|
||||||
|
|
||||||
|
type MockUserDataStore struct {
|
||||||
|
db.Db
|
||||||
|
mock.Mock
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockUserDataStore) ReadEntry(ctx context.Context, sessionId string, typ utils.DataTyp) ([]byte, error) {
|
||||||
|
args := m.Called(ctx, sessionId, typ)
|
||||||
|
return args.Get(0).([]byte), args.Error(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *MockUserDataStore) WriteEntry(ctx context.Context, sessionId string, typ utils.DataTyp, value []byte) error {
|
||||||
|
args := m.Called(ctx, sessionId, typ, value)
|
||||||
|
return args.Error(0)
|
||||||
|
}
|
44
internal/storage/storage.go
Normal file
44
internal/storage/storage.go
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
"git.defalsify.org/vise.git/persist"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Storage struct {
|
||||||
|
Persister *persist.Persister
|
||||||
|
UserdataDb db.Db
|
||||||
|
}
|
||||||
|
|
||||||
|
type StorageProvider interface {
|
||||||
|
Get(sessionId string) (*Storage, error)
|
||||||
|
Put(sessionId string, storage *Storage) error
|
||||||
|
Close() error
|
||||||
|
}
|
||||||
|
|
||||||
|
type SimpleStorageProvider struct {
|
||||||
|
*Storage
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewSimpleStorageProvider(stateStore db.Db, userdataStore db.Db) StorageProvider {
|
||||||
|
pe := persist.NewPersister(stateStore)
|
||||||
|
pe = pe.WithFlush()
|
||||||
|
return &SimpleStorageProvider{
|
||||||
|
Storage: &Storage{
|
||||||
|
Persister: pe,
|
||||||
|
UserdataDb: userdataStore,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *SimpleStorageProvider) Get(sessionId string) (*Storage, error) {
|
||||||
|
return p.Storage, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *SimpleStorageProvider) Put(sessionId string, storage *Storage) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *SimpleStorageProvider) Close() error {
|
||||||
|
return p.Storage.UserdataDb.Close()
|
||||||
|
}
|
64
internal/storage/storageservice.go
Normal file
64
internal/storage/storageservice.go
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
package storage
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"path"
|
||||||
|
|
||||||
|
"git.defalsify.org/vise.git/db"
|
||||||
|
fsdb "git.defalsify.org/vise.git/db/fs"
|
||||||
|
gdbmdb "git.defalsify.org/vise.git/db/gdbm"
|
||||||
|
"git.defalsify.org/vise.git/persist"
|
||||||
|
"git.defalsify.org/vise.git/resource"
|
||||||
|
)
|
||||||
|
|
||||||
|
type StorageService interface {
|
||||||
|
GetPersister(dbDir string, ctx context.Context) (*persist.Persister, error)
|
||||||
|
GetUserdataDb(dbDir string, ctx context.Context) db.Db
|
||||||
|
GetResource(resourceDir string, ctx context.Context) (resource.Resource, error)
|
||||||
|
EnsureDbDir(dbDir string) error
|
||||||
|
}
|
||||||
|
|
||||||
|
type MenuStorageService struct{}
|
||||||
|
|
||||||
|
func (menuStorageService *MenuStorageService) GetPersister(dbDir string, ctx context.Context) (*persist.Persister, error) {
|
||||||
|
store := gdbmdb.NewGdbmDb()
|
||||||
|
storeFile := path.Join(dbDir, "state.gdbm")
|
||||||
|
store.Connect(ctx, storeFile)
|
||||||
|
pr := persist.NewPersister(store)
|
||||||
|
return pr, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (menuStorageService *MenuStorageService) GetUserdataDb(dbDir string, ctx context.Context) db.Db {
|
||||||
|
store := gdbmdb.NewGdbmDb()
|
||||||
|
storeFile := path.Join(dbDir, "userdata.gdbm")
|
||||||
|
store.Connect(ctx, storeFile)
|
||||||
|
|
||||||
|
return store
|
||||||
|
}
|
||||||
|
|
||||||
|
func (menuStorageService *MenuStorageService) GetResource(resourceDir string, ctx context.Context) (resource.Resource, error) {
|
||||||
|
store := fsdb.NewFsDb()
|
||||||
|
err := store.Connect(ctx, resourceDir)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
rfs := resource.NewDbResource(store)
|
||||||
|
return rfs, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (menuStorageService *MenuStorageService) GetStateStore(dbDir string, ctx context.Context) (db.Db, error) {
|
||||||
|
store := gdbmdb.NewGdbmDb()
|
||||||
|
storeFile := path.Join(dbDir, "state.gdbm")
|
||||||
|
store.Connect(ctx, storeFile)
|
||||||
|
return store, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (menuStorageService *MenuStorageService) EnsureDbDir(dbDir string) error {
|
||||||
|
err := os.MkdirAll(dbDir, 0700)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("state dir create exited with error: %v\n", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
@ -1,44 +0,0 @@
|
|||||||
package utils
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
|
|
||||||
"git.defalsify.org/vise.git/db"
|
|
||||||
)
|
|
||||||
|
|
||||||
type AccountFileHandler struct {
|
|
||||||
store db.Db
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewAccountFileHandler(store db.Db) *AccountFileHandler {
|
|
||||||
return &AccountFileHandler{
|
|
||||||
store: store,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (afh *AccountFileHandler) ReadAccountData(ctx context.Context, sessionId string) (map[string]string, error) {
|
|
||||||
var accountData map[string]string
|
|
||||||
jsonData, err := ReadEntry(ctx, afh.store, sessionId, DATA_ACCOUNT)
|
|
||||||
if err != nil {
|
|
||||||
return nil,err
|
|
||||||
}
|
|
||||||
err = json.Unmarshal(jsonData, &accountData)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return accountData, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (afh *AccountFileHandler) WriteAccountData(ctx context.Context, sessionId string, accountData map[string]string) error {
|
|
||||||
_, err := json.Marshal(accountData)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (afh *AccountFileHandler) EnsureFileExists() error {
|
|
||||||
return nil
|
|
||||||
}
|
|
@ -1,10 +1,7 @@
|
|||||||
package utils
|
package utils
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
|
|
||||||
"git.defalsify.org/vise.git/db"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type DataTyp uint16
|
type DataTyp uint16
|
||||||
@ -25,6 +22,7 @@ const (
|
|||||||
DATA_OFFERINGS
|
DATA_OFFERINGS
|
||||||
DATA_RECIPIENT
|
DATA_RECIPIENT
|
||||||
DATA_AMOUNT
|
DATA_AMOUNT
|
||||||
|
DATA_TEMPORARY_PIN
|
||||||
)
|
)
|
||||||
|
|
||||||
func typToBytes(typ DataTyp) []byte {
|
func typToBytes(typ DataTyp) []byte {
|
||||||
@ -37,22 +35,3 @@ func PackKey(typ DataTyp, data []byte) []byte {
|
|||||||
v := typToBytes(typ)
|
v := typToBytes(typ)
|
||||||
return append(v, data...)
|
return append(v, data...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func ReadEntry(ctx context.Context, store db.Db, sessionId string, typ DataTyp) ([]byte, error) {
|
|
||||||
|
|
||||||
store.SetPrefix(db.DATATYPE_USERDATA)
|
|
||||||
store.SetSession(sessionId)
|
|
||||||
k := PackKey(typ, []byte(sessionId))
|
|
||||||
b, err := store.Get(ctx, k)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return b, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func WriteEntry(ctx context.Context, store db.Db, sessionId string, typ DataTyp, value []byte) error {
|
|
||||||
store.SetPrefix(db.DATATYPE_USERDATA)
|
|
||||||
store.SetSession(sessionId)
|
|
||||||
k := PackKey(typ, []byte(sessionId))
|
|
||||||
return store.Put(ctx, k, value)
|
|
||||||
}
|
|
||||||
|
@ -4,78 +4,29 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
|
|
||||||
"git.defalsify.org/vise.git/db"
|
"git.defalsify.org/vise.git/db"
|
||||||
"git.defalsify.org/vise.git/lang"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type DataStore interface {
|
type DataStore interface {
|
||||||
SetPrefix(prefix uint8)
|
db.Db
|
||||||
SetSession(sessionId string)
|
|
||||||
Get(ctx context.Context, key []byte) ([]byte, error)
|
|
||||||
ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error)
|
ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error)
|
||||||
WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error
|
WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error
|
||||||
Connect(ctx context.Context, connStr string) error
|
|
||||||
SetLanguage(*lang.Language)
|
|
||||||
Close() error
|
|
||||||
Prefix() uint8
|
|
||||||
Put(ctx context.Context, key []byte, val []byte) error
|
|
||||||
Safe() bool
|
|
||||||
SetLock(typ uint8, locked bool) error
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type UserDataStore struct {
|
type UserDataStore struct {
|
||||||
Store db.Db
|
db.Db
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) SetPrefix(prefix uint8) {
|
|
||||||
store.Store.SetPrefix(prefix)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) SetLanguage(lang *lang.Language) {
|
|
||||||
store.Store.SetLanguage(lang)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) SetLock(typ uint8, locked bool) error {
|
|
||||||
return store.Store.SetLock(typ, locked)
|
|
||||||
}
|
|
||||||
func (store UserDataStore) Safe() bool {
|
|
||||||
return store.Store.Safe()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) Put(ctx context.Context, key []byte, val []byte) error {
|
|
||||||
return store.Store.Put(ctx, key, val)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) Connect(ctx context.Context, connectionStr string) error {
|
|
||||||
return store.Store.Connect(ctx, connectionStr)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) Close() error {
|
|
||||||
return store.Store.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) Prefix() uint8 {
|
|
||||||
return store.Store.Prefix()
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) SetSession(sessionId string) {
|
|
||||||
store.Store.SetSession(sessionId)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (store UserDataStore) Get(ctx context.Context, key []byte) ([]byte, error) {
|
|
||||||
return store.Store.Get(ctx, key)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadEntry retrieves an entry from the store based on the provided parameters.
|
// ReadEntry retrieves an entry from the store based on the provided parameters.
|
||||||
func (store UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error) {
|
func (store *UserDataStore) ReadEntry(ctx context.Context, sessionId string, typ DataTyp) ([]byte, error) {
|
||||||
store.Store.SetPrefix(db.DATATYPE_USERDATA)
|
store.SetPrefix(db.DATATYPE_USERDATA)
|
||||||
store.Store.SetSession(sessionId)
|
store.SetSession(sessionId)
|
||||||
k := PackKey(typ, []byte(sessionId))
|
k := PackKey(typ, []byte(sessionId))
|
||||||
return store.Get(ctx, k)
|
return store.Get(ctx, k)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (store UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
|
func (store *UserDataStore) WriteEntry(ctx context.Context, sessionId string, typ DataTyp, value []byte) error {
|
||||||
store.Store.SetPrefix(db.DATATYPE_USERDATA)
|
store.SetPrefix(db.DATATYPE_USERDATA)
|
||||||
store.Store.SetSession(sessionId)
|
store.SetSession(sessionId)
|
||||||
k := PackKey(typ, []byte(sessionId))
|
k := PackKey(typ, []byte(sessionId))
|
||||||
return store.Store.Put(ctx, k, value)
|
return store.Put(ctx, k, value)
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
# Variables to match files in the current directory
|
# Variables to match files in the current directory
|
||||||
INPUTS = $(wildcard ./*.vis)
|
INPUTS = $(wildcard ./*.vis)
|
||||||
TXTS = $(wildcard ./*.txt.orig)
|
TXTS = $(wildcard ./*.txt.orig)
|
||||||
|
VISE_PATH := ../../go-vise
|
||||||
|
|
||||||
# Rule to build .bin files from .vis files
|
# Rule to build .bin files from .vis files
|
||||||
%.vis:
|
%.vis:
|
||||||
go run ../../go-vise/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
|
go run $(VISE_PATH)/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
|
||||||
@echo "Built $(basename $@).bin from $(basename $@).vis"
|
@echo "Built $(basename $@).bin from $(basename $@).vis"
|
||||||
|
|
||||||
# Rule to copy .orig files to .txt
|
# Rule to copy .orig files to .txt
|
||||||
|
@ -1 +1 @@
|
|||||||
Salio
|
Salio:
|
1
services/registration/change_language
Normal file
1
services/registration/change_language
Normal file
@ -0,0 +1 @@
|
|||||||
|
Select language:
|
10
services/registration/change_language.vis
Normal file
10
services/registration/change_language.vis
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
LOAD reset_account_authorized 0
|
||||||
|
LOAD reset_incorrect 0
|
||||||
|
CATCH incorrect_pin flag_incorrect_pin 1
|
||||||
|
CATCH pin_entry flag_account_authorized 0
|
||||||
|
MOUT english 0
|
||||||
|
MOUT kiswahili 1
|
||||||
|
HALT
|
||||||
|
INCMP set_default 0
|
||||||
|
INCMP set_swa 1
|
||||||
|
INCMP . *
|
1
services/registration/change_language_swa
Normal file
1
services/registration/change_language_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Chagua lugha:
|
@ -1,2 +1 @@
|
|||||||
Your community balance is: 0.00SRF
|
Your community balance is: 0.00SRF
|
||||||
|
|
||||||
|
1
services/registration/confirm_pin_change
Normal file
1
services/registration/confirm_pin_change
Normal file
@ -0,0 +1 @@
|
|||||||
|
Confirm your new PIN:
|
7
services/registration/confirm_pin_change.vis
Normal file
7
services/registration/confirm_pin_change.vis
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
CATCH invalid_pin flag_valid_pin 0
|
||||||
|
MOUT back 0
|
||||||
|
HALT
|
||||||
|
INCMP _ 0
|
||||||
|
INCMP * pin_reset_success
|
||||||
|
|
||||||
|
|
1
services/registration/confirm_pin_change_swa
Normal file
1
services/registration/confirm_pin_change_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Thibitisha PIN yako mpya:
|
2
services/registration/help.vis
Normal file
2
services/registration/help.vis
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
LOAD quit_with_help 0
|
||||||
|
HALT
|
1
services/registration/invalid_pin
Normal file
1
services/registration/invalid_pin
Normal file
@ -0,0 +1 @@
|
|||||||
|
The PIN you entered is invalid.The PIN must be different from your current PIN.For help call +254757628885
|
3
services/registration/invalid_pin.vis
Normal file
3
services/registration/invalid_pin.vis
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
MOUT back 0
|
||||||
|
HALT
|
||||||
|
INCMP _ 0
|
1
services/registration/invalid_pin_swa
Normal file
1
services/registration/invalid_pin_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
PIN mpya na udhibitisho wa pin mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
|
1
services/registration/language_changed
Normal file
1
services/registration/language_changed
Normal file
@ -0,0 +1 @@
|
|||||||
|
Your language change request was successful.
|
5
services/registration/language_changed.vis
Normal file
5
services/registration/language_changed.vis
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
MOUT back 0
|
||||||
|
MOUT quit 9
|
||||||
|
HALT
|
||||||
|
INCMP ^ 0
|
||||||
|
INCMP quit 9
|
1
services/registration/language_changed_swa
Normal file
1
services/registration/language_changed_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Ombi lako la kubadilisha lugha limefanikiwa.
|
@ -6,3 +6,7 @@ msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
|
|||||||
|
|
||||||
msgid "Thank you for using Sarafu. Goodbye!"
|
msgid "Thank you for using Sarafu. Goodbye!"
|
||||||
msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
|
msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
|
||||||
|
|
||||||
|
|
||||||
|
msgid "For more help,please call: 0757628885"
|
||||||
|
msgstr "Kwa usaidizi zaidi,piga: 0757628885"
|
||||||
|
@ -10,6 +10,6 @@ HALT
|
|||||||
INCMP send 1
|
INCMP send 1
|
||||||
INCMP quit 2
|
INCMP quit 2
|
||||||
INCMP my_account 3
|
INCMP my_account 3
|
||||||
INCMP quit 4
|
INCMP help 4
|
||||||
INCMP quit 9
|
INCMP quit 9
|
||||||
INCMP . *
|
INCMP . *
|
||||||
|
@ -9,6 +9,7 @@ MOUT back 0
|
|||||||
HALT
|
HALT
|
||||||
INCMP _ 0
|
INCMP _ 0
|
||||||
INCMP edit_profile 1
|
INCMP edit_profile 1
|
||||||
|
INCMP change_language 2
|
||||||
INCMP balances 3
|
INCMP balances 3
|
||||||
INCMP pin_management 5
|
INCMP pin_management 5
|
||||||
INCMP address 6
|
INCMP address 6
|
||||||
|
1
services/registration/new_pin
Normal file
1
services/registration/new_pin
Normal file
@ -0,0 +1 @@
|
|||||||
|
Enter a new four number pin
|
13
services/registration/new_pin.vis
Normal file
13
services/registration/new_pin.vis
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
LOAD authorize_account 12
|
||||||
|
RELOAD authorize_account
|
||||||
|
CATCH incorrect_pin flag_incorrect_pin 1
|
||||||
|
CATCH old_pin flag_allow_update 0
|
||||||
|
MOUT back 0
|
||||||
|
HALT
|
||||||
|
INCMP _ 0
|
||||||
|
LOAD save_temporary_pin 6
|
||||||
|
LOAD verify_new_pin 0
|
||||||
|
RELOAD save_temporary_pin
|
||||||
|
RELOAD verify_new_pin
|
||||||
|
INCMP * confirm_pin_change
|
||||||
|
|
2
services/registration/new_pin_swa
Normal file
2
services/registration/new_pin_swa
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
Weka PIN mpya ya nne nambari:
|
||||||
|
|
1
services/registration/old_pin
Normal file
1
services/registration/old_pin
Normal file
@ -0,0 +1 @@
|
|||||||
|
Enter your old PIN
|
7
services/registration/old_pin.vis
Normal file
7
services/registration/old_pin.vis
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
LOAD reset_allow_update 0
|
||||||
|
MOUT back 0
|
||||||
|
HALT
|
||||||
|
RELOAD reset_allow_update
|
||||||
|
INCMP _ 0
|
||||||
|
INCMP new_pin *
|
||||||
|
|
1
services/registration/old_pin_swa
Normal file
1
services/registration/old_pin_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Weka PIN yako ya zamani:
|
@ -4,3 +4,5 @@ MOUT guard_pin 3
|
|||||||
MOUT back 0
|
MOUT back 0
|
||||||
HALT
|
HALT
|
||||||
INCMP _ 0
|
INCMP _ 0
|
||||||
|
INCMP old_pin 1
|
||||||
|
|
||||||
|
1
services/registration/pin_reset_mismatch
Normal file
1
services/registration/pin_reset_mismatch
Normal file
@ -0,0 +1 @@
|
|||||||
|
The PIN is not a match. Try again
|
6
services/registration/pin_reset_mismatch.vis
Normal file
6
services/registration/pin_reset_mismatch.vis
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
MOUT retry 1
|
||||||
|
MOUT quit 9
|
||||||
|
HALT
|
||||||
|
INCMP confirm_pin_change 1
|
||||||
|
INCMP quit 9
|
||||||
|
|
1
services/registration/pin_reset_success
Normal file
1
services/registration/pin_reset_success
Normal file
@ -0,0 +1 @@
|
|||||||
|
Your PIN change request has been successful
|
10
services/registration/pin_reset_success.vis
Normal file
10
services/registration/pin_reset_success.vis
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
LOAD confirm_pin_change 0
|
||||||
|
RELOAD confirm_pin_change
|
||||||
|
CATCH pin_reset_mismatch flag_pin_mismatch 1
|
||||||
|
MOUT back 0
|
||||||
|
MOUT quit 9
|
||||||
|
HALT
|
||||||
|
INCMP main 0
|
||||||
|
INCMP quit 9
|
||||||
|
|
||||||
|
|
1
services/registration/pin_reset_success_swa
Normal file
1
services/registration/pin_reset_success_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Ombi lako la kubadili PIN limefanikiwa
|
1
services/registration/quit_menu
Normal file
1
services/registration/quit_menu
Normal file
@ -0,0 +1 @@
|
|||||||
|
Quit
|
1
services/registration/quit_menu_swa
Normal file
1
services/registration/quit_menu_swa
Normal file
@ -0,0 +1 @@
|
|||||||
|
Ondoka
|
@ -1,6 +1,6 @@
|
|||||||
MOUT english 0
|
MOUT english 0
|
||||||
MOUT kiswahili 1
|
MOUT kiswahili 1
|
||||||
HALT
|
HALT
|
||||||
INCMP terms 0
|
INCMP set_default 0
|
||||||
INCMP terms 1
|
INCMP set_swa 1
|
||||||
INCMP . *
|
INCMP . *
|
||||||
|
3
services/registration/set_default.vis
Normal file
3
services/registration/set_default.vis
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
LOAD set_language 6
|
||||||
|
CATCH terms flag_account_created 0
|
||||||
|
MOVE language_changed
|
3
services/registration/set_swa.vis
Normal file
3
services/registration/set_swa.vis
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
LOAD set_language 6
|
||||||
|
CATCH terms flag_account_created 0
|
||||||
|
MOVE language_changed
|
@ -1,5 +1,3 @@
|
|||||||
LOAD select_language 0
|
|
||||||
RELOAD select_language
|
|
||||||
MOUT yes 0
|
MOUT yes 0
|
||||||
MOUT no 1
|
MOUT no 1
|
||||||
HALT
|
HALT
|
||||||
|
@ -1 +1,2 @@
|
|||||||
Wasifu wangu
|
Wasifu wangu:
|
||||||
|
{{.get_profile_info}}
|
Loading…
Reference in New Issue
Block a user