Merge remote-tracking branch 'urdt' into lash/purify-more

Reviewed-on: urdt/ussd#243

.dockerignore

@@ -1,5 +1,6 @@
 /**
 !/cmd/africastalking
+!/cmd/ssh
 !/common
 !/config
 !/initializers

Dockerfile

@@ -19,6 +19,7 @@ WORKDIR /build
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
 RUN go build -tags logtrace -o ussd-africastalking -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+RUN go build -tags logtrace -o ussd-ssh -ldflags="-X main.build=${BUILD} -s -w" cmd/ssh/main.go
 
 FROM debian:bookworm-slim
 
@@ -30,6 +31,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/*
 WORKDIR /service
 
 COPY --from=build /build/ussd-africastalking .
+COPY --from=build /build/ussd-ssh .
 COPY --from=build /build/LICENSE .
 COPY --from=build /build/README.md .
 COPY --from=build /build/services ./services
@@ -37,5 +39,6 @@ COPY --from=build /build/.env.example .
 RUN mv .env.example .env
 
 EXPOSE 7123
+EXPOSE 7122
 
 CMD ["./ussd-africastalking"]

cmd/ssh/main.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"path"
 	"os"
 	"os/signal"
+	"path"
 	"sync"
 	"syscall"
 
@@ -18,10 +18,12 @@ import (
 )
 
 var (
-	wg sync.WaitGroup
+	wg        sync.WaitGroup
-	keyStore db.Db
+	keyStore  db.Db
 	logg      = logging.NewVanilla()
 	scriptDir = path.Join("services", "registration")
+
+	build = "dev"
 )
 
 func main() {
@@ -76,7 +78,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "keystore file open error: %v", err)
 		os.Exit(1)
 	}
-	defer func () {
+	defer func() {
 		logg.TraceCtxf(ctx, "shutdown auth key store reached")
 		err = authKeyStore.Close()
 		if err != nil {
@@ -90,14 +92,14 @@ func main() {
 	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
 
 	runner := &ssh.SshRunner{
-		Cfg: cfg,
+		Cfg:         cfg,
-		Debug: engineDebug,
+		Debug:       engineDebug,
-		FlagFile: pfp,
+		FlagFile:    pfp,
-		DbDir: dbDir,
+		DbDir:       dbDir,
 		ResourceDir: resourceDir,
-		SrvKeyFile: sshKeyFile,
+		SrvKeyFile:  sshKeyFile,
-		Host: host,
+		Host:        host,
-		Port: port,
+		Port:        port,
 	}
 	go func() {
 		select {
@@ -109,7 +111,7 @@ func main() {
 		if err != nil {
 			logg.ErrorCtxf(ctx, "runner stop error", "err", err)
 		}
-		
+
 	}()
 	runner.Run(ctx, authKeyStore)
 }

devtools/store/dump/main.go

@@ -25,6 +25,15 @@ func init() {
 }
 
 
+func formatItem(k []byte, v []byte) (string, error) {
+	o, err := debug.FromKey(k)
+	if err != nil {
+		return "", err
+	}
+	s := fmt.Sprintf("%vValue: %v\n\n", o, string(v))
+	return s, nil
+}
+
 func main() {
 	config.LoadConfig()
 
@@ -75,12 +84,12 @@ func main() {
 		if k == nil {
 			break
 		}
-		o, err := debug.FromKey(k)
+		r, err := formatItem(k, v)
 		if err != nil {
-			fmt.Fprintf(os.Stderr, err.Error())
+			fmt.Fprintf(os.Stderr, "format db item error: %v", err)
 			os.Exit(1)
 		}
-		fmt.Printf("%vValue: %v\n\n", o, string(v))
+		fmt.Printf(r)
 	}
 
 	err = store.Close()