Fix branch

api/models.go

@@ -0,0 +1,42 @@
+package api
+
+type (
+	BankIdV6Response struct {
+		OrderRef       string                  `json:"orderRef"`
+		CollectError   string                  `json:"error,omitempty"`
+		ErrorCode      string                  `json:"errorCode,omitempty"`
+		URI            string                  `json:"uri,omitempty"`
+		QR             string                  `json:"qr,omitempty"`
+		Status         string                  `json:"status,omitempty"`
+		HintCode       string                  `json:"hintCode,omitempty"`
+		CompletionData *BankIdV6CompletionData `json:"completionData,omitempty"`
+	}
+	BankIdV6CompletionData struct {
+		User            BankIdV6User   `json:"user,omitempty"`
+		Device          BankIdV6Device `json:"device,omitempty"`
+		BankIdIssueDate string         `json:"bankIdIssueDate,omitempty"`
+		StepUp          BankIdV6StepUp `json:"stepUp,omitempty"`
+		Signature       string         `json:"signature,omitempty"`
+		OcspResponse    string         `json:"ocspResponse,omitempty"`
+	}
+	BankIdV6User struct {
+		PersonalNumber string `json:"personalNumber,omitempty"`
+		Name           string `json:"name,omitempty"`
+		GivenName      string `json:"givenName,omitempty"`
+		SurName        string `json:"surName,omitempty"`
+	}
+	BankIdV6Device struct {
+		IpAddress string `json:"ipAddress,omitempty"`
+		UHI       string `json:"uhi,omitempty"`
+	}
+	BankIdV6StepUp struct {
+		MRTD bool `json:"mrtd,omitempty"`
+	}
+)
+
+const (
+	StatusPending  = "pending"
+	StatusComplete = "complete"
+	StatusFailed   = "failed"
+	StatusError    = "error"
+)

cmd/twoferd/Dockerfile.build

@@ -1,6 +1,6 @@
-FROM golang:1.20.3-alpine3.17 as builder
+FROM golang:1.21.9-alpine3.19 as builder
 
-RUN apk add --no-cache git curl build-base bash shadow
+#RUN apk add --no-cache git curl build-base bash shadow
 
 RUN mkdir -p /go/src/twofer
 WORKDIR /go/src/twofer
@@ -9,10 +9,11 @@ COPY . /go/src/twofer
 
 RUN ls
 
-RUN go build -o /twoferd ./cmd/twoferd/main.go
+RUN CGO_ENABLE=0 go build -o /twoferd ./cmd/twoferd/main.go
 
-FROM alpine:3.17.3
-RUN apk add --no-cache tzdata ca-certificates
+#FROM alpine:3.19.1
+#RUN apk add --no-cache tzdata ca-certificates
+FROM scratch
 EXPOSE 8080
 COPY --from=builder /twoferd /
-CMD /twoferd
+CMD [ "/twoferd" ]

cmd/twoferd/Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM golang:1.20.3
+FROM golang:1.21.9
 
 RUN apt-get update && apt-get install -y inotify-hookable
 

cmd/twoferd/main.go

@@ -2,25 +2,31 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+
 	"github.com/modfin/twofer/internal/config"
 	"github.com/modfin/twofer/internal/eid/bankid"
 	"github.com/modfin/twofer/internal/httpserve"
 	"github.com/modfin/twofer/internal/serveid"
 	"github.com/modfin/twofer/internal/servotp"
 	"github.com/modfin/twofer/internal/servpwd"
 	"github.com/modfin/twofer/internal/servqr"
-	"log"
-	"os"
-	"os/signal"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/labstack/echo/v4"
+	"github.com/modfin/twofer/stream/ndjson"
+	"github.com/modfin/twofer/stream/sse"
 )
 
+const shutdownGracePeriod = time.Second * 200 // A BankID auth order is only valid for 30 seconds, unless it's scanned, then it's valid for 180 seconds.
+
 func main() {
 	cfg := config.Get()
 	e := echo.New()
@@ -89,28 +95,31 @@ func main() {
 }
 
 func startServer(e *echo.Echo) {
+	appCtx, appClose := context.WithCancel(context.Background())
 	go func() {
-		fmt.Println(e.Start(":8080"))
+		err := e.Start(":8080")
+		if !errors.Is(err, http.ErrServerClosed) {
+			fmt.Println(err)
+		}
+		appClose()
 	}()
 
 	signalChannel := make(chan os.Signal, 1)
 	signal.Notify(signalChannel, syscall.SIGTERM)
 
-	<-signalChannel
-	wg := sync.WaitGroup{}
-	wg.Add(1)
-	go func() {
-		timeout, cancel := context.WithTimeout(context.Background(), time.Second*30)
-		defer cancel()
+	select {
+	case <-signalChannel:
+		appClose() // Cancel 'app context' when we receive SIGTERM
+	case <-appCtx.Done():
+	}
 
-		err := e.Shutdown(timeout)
-		if err != nil {
-			log.Fatalf("failure during Echo's shutdown: %v", err)
-		}
-		wg.Done()
-	}()
+	timeout, cancel := context.WithTimeout(context.Background(), shutdownGracePeriod)
+	defer cancel()
 
-	wg.Wait()
+	err := e.Shutdown(timeout)
+	if err != nil {
+		log.Fatalf("failure during Echo's shutdown: %v", err)
+	}
 }
 
 func startEid(e *echo.Echo) {
@@ -149,6 +158,15 @@ func startEid(e *echo.Echo) {
 	} else {
 		fmt.Println("  - Adding BankId v6.0")
 		fmt.Println("  - BankId Client Cert NotAfter:", bankid.ParsedClientCert().NotAfter)
-		httpserve.RegisterBankIDServer(e, bankid.APIv60)
+		httpserve.RegisterBankIDServer(e, bankid.APIv60, getStreamEncoder(config.Get().StreamEncoder))
+	}
+}
+
+func getStreamEncoder(encoder string) httpserve.NewStreamEncoder {
+	switch encoder {
+	case "SSE":
+		return sse.NewEncoder
+	default:
+		return ndjson.NewEncoder
 	}
 }

go.mod

@@ -1,52 +1,39 @@
 module github.com/modfin/twofer
 
-go 1.19
+go 1.21
 
 require (
 	github.com/caarlos0/env/v6 v6.10.1
-	github.com/davecgh/go-spew v1.1.1
 	github.com/go-webauthn/webauthn v0.8.2
-	github.com/golang/protobuf v1.5.3
-	github.com/gorilla/mux v1.8.0
-	github.com/labstack/echo/v4 v4.10.2
-	github.com/mdp/qrterminal/v3 v3.0.0
+	github.com/google/uuid v1.3.0
+	github.com/labstack/echo/v4 v4.12.0
 	github.com/pquerna/otp v1.4.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	github.com/stretchr/testify v1.8.2
-	github.com/urfave/cli/v2 v2.20.2
-	golang.org/x/crypto v0.8.0
-	golang.org/x/net v0.9.0
-	golang.org/x/oauth2 v0.7.0
-	google.golang.org/grpc v1.52.0-dev
+	github.com/stretchr/testify v1.8.4
+	golang.org/x/crypto v0.22.0
+	golang.org/x/net v0.24.0
 )
 
 require (
 	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
 	github.com/go-webauthn/revoke v0.1.9 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/go-tpm v0.3.3 // indirect
-	github.com/google/uuid v1.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
-	github.com/labstack/gommon v0.4.0 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
-	google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	rsc.io/qr v0.2.0 // indirect
 )