Commit test program

.gitignore

@@ -1,2 +1 @@
 .idea/
-cardcal-auth-tester

auth.go

@@ -3,7 +3,9 @@ package cardcaldav
 import (
 	"cardcaldav/database"
 	"context"
+	"database/sql"
 	"errors"
+	"github.com/charmbracelet/log"
 	"golang.org/x/crypto/bcrypt"
 	"net/http"
 	"strings"
@@ -34,6 +36,21 @@ type ProviderMiddleware interface {
 
 var authError = errors.New("auth context error")
 
+func NewAuth(dbStr string, logger *log.Logger) *Auth {
+	dbOpen, err := sql.Open("mysql", dbStr)
+	if err != nil {
+		logger.Fatal("sql.Open()", "err", err)
+	}
+	err = dbOpen.Ping()
+	if err != nil {
+		logger.Fatal("db.Ping()", "err", err)
+	}
+
+	dbQueries := database.New(dbOpen)
+
+	return &Auth{DB: dbQueries}
+}
+
 type Auth struct {
 	DB *database.Queries
 }
@@ -58,7 +75,6 @@ func (a *Auth) Middleware(next http.Handler) http.Handler {
 		}
 
 		r = r.WithContext(NewContext(r.Context(), &Context{UserName: username}))
-		r.BasicAuth()
 		next.ServeHTTP(w, r)
 	})
 }

cmd/cardcal-auth-tester/main.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"cardcaldav"
+	"context"
+	"flag"
+	"fmt"
+	"github.com/charmbracelet/log"
+	"golang.org/x/term"
+	"os"
+)
+
+var Logger = log.NewWithOptions(os.Stderr, log.Options{
+	ReportTimestamp: true,
+	ReportCaller:    true,
+})
+
+func main() {
+	var un, dbStr string
+	var debugMode bool
+	flag.StringVar(&un, "un", "", "username of user to authenticate")
+	flag.StringVar(&dbStr, "db", "", "Connection string for the database - user:password@tcp(127.0.0.1:3306)/dbname")
+	flag.BoolVar(&debugMode, "debug", false, "enable debug logging")
+	flag.Parse()
+
+	if debugMode {
+		Logger.SetLevel(log.DebugLevel)
+	}
+
+	if !term.IsTerminal(int(os.Stdin.Fd())) {
+		Logger.Fatal("No terminal input found")
+	}
+
+	auth := cardcaldav.NewAuth(dbStr, Logger)
+
+	_, _ = fmt.Fprint(os.Stderr, "Password: ")
+	password, err := term.ReadPassword(int(os.Stdin.Fd()))
+	if err != nil {
+		Logger.Fatal("ReadPassword()", "err", err)
+	}
+	_, _ = fmt.Fprintln(os.Stderr)
+	Logger.Info("Verifying password...")
+
+	err = auth.ValidateCredentials(context.Background(), un, string(password))
+	if err != nil {
+		Logger.Fatal("auth.ValidateCredentials()", "err", err)
+	}
+
+	Logger.Info("Password verified")
+}