refactor(web): auth

Author: ItsNotGoodName

README.md

@@ -234,7 +234,6 @@ make dev-web
 
 - Reload on config change
 - Add [Apprise](https://github.com/caronc/apprise) endpoint
-- HTTP and SMTP auth
 - CRUD endpoints and rules
 - SQLite full text search
 - Read mailbox files

internal/core/actor.go

@@ -3,6 +3,6 @@ package core
 type Actor int
 
 const (
-	ActorAnonymous Actor = iota
+	ActorUnknown Actor = iota
 	ActorSystem
 )

internal/core/app.go

@@ -35,7 +35,7 @@ func (a App) newContext(ctx context.Context, actor Actor) Context {
 }
 
 func (a App) Context(ctx context.Context) Context {
-	return a.newContext(ctx, ActorAnonymous)
+	return a.newContext(ctx, ActorUnknown)
 }
 
 func (a App) SystemContext(ctx context.Context) Context {

internal/procs/auth.go

@@ -9,8 +9,12 @@ import (
 
 var ErrorLogin = fmt.Errorf("login error")
 
-func HTTPLogin(cc core.Context, username, password string) error {
-	if cc.Config.AuthHTTP.Username == "" && cc.Config.AuthHTTP.Password == "" {
+func AuthHTTPAnonymous(cc core.Context) bool {
+	return cc.Config.AuthHTTP.Username == "" && cc.Config.AuthHTTP.Password == ""
+}
+
+func AuthHTTPLogin(cc core.Context, username, password string) error {
+	if AuthHTTPAnonymous(cc) {
 		return nil
 	}
 

web/controllers/auth.go

@@ -8,12 +8,12 @@ import (
 	"github.com/gofiber/fiber/v2/middleware/session"
 )
 
-type Flash struct {
+type LoginData struct {
 	Flash string
 }
 
 func Login(c *fiber.Ctx, cc core.Context) error {
-	return c.Render("login", Flash{})
+	return c.Render("login", LoginData{})
 }
 
 func AuthLogin(c *fiber.Ctx, cc core.Context, store *session.Store) error {
@@ -22,65 +22,73 @@ func AuthLogin(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	password := c.FormValue("password")
 
 	// Execute
-	err := procs.HTTPLogin(cc, username, password)
+	err := procs.AuthHTTPLogin(cc, username, password)
 	if err != nil {
 		if helpers.IsHTMXRequest(c) {
-			return c.Render("login", Flash{Flash: err.Error()}, "form")
+			return c.Render("login", LoginData{Flash: err.Error()}, "form")
 		}
-		return c.Render("login", Flash{Flash: err.Error()})
+		return c.Render("login", LoginData{Flash: err.Error()})
 	}
 
 	// Response
 	sess, err := store.Get(c)
 	if err != nil {
-		panic(err)
+		return helpers.Error(c, err)
 	}
 
 	sess.Set("auth", true)
 	if err := sess.Save(); err != nil {
-		panic(err)
+		return helpers.Error(c, err)
 	}
 
-	return redirect(c, "/")
+	return helpers.Redirect(c, "/")
 }
 
 func AuthLogout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	sess, err := store.Get(c)
 	if err != nil {
-		panic(err)
+		return helpers.Error(c, err)
 	}
 
 	sess.Delete("auth")
 	if err := sess.Save(); err != nil {
-		panic(err)
+		return helpers.Error(c, err)
 	}
 
-	return redirect(c, "/login")
+	return helpers.Redirect(c, "/login")
 }
 
 func AuthRequire(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	if procs.AuthHTTPAnonymous(cc) {
+		return c.Next()
+	}
+
 	sess, err := store.Get(c)
 	if err != nil {
 		panic(err)
 	}
 
 	auth := sess.Get("auth")
 	if auth == nil {
-		return redirect(c, "/login")
+		return helpers.Redirect(c, "/login")
 	}
 
 	return c.Next()
 }
 
 func AuthSkip(c *fiber.Ctx, cc core.Context, store *session.Store) error {
+	if procs.AuthHTTPAnonymous(cc) {
+		return helpers.Redirect(c, "/")
+	}
+
 	sess, err := store.Get(c)
 	if err != nil {
-		panic(err)
+		return helpers.Error(c, err)
 	}
 
 	auth := sess.Get("auth")
 	if auth != nil {
-		return redirect(c, "/")
+		return helpers.Redirect(c, "/")
 	}
 
 	return c.Next()

web/controllers/utils.go

@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"github.com/ItsNotGoodName/smtpbridge/web/helpers"
 	"github.com/gofiber/fiber/v2"
 )
 
@@ -13,11 +12,3 @@ func checkbox(c *fiber.Ctx, key string) bool {
 
 	return true
 }
-func redirect(c *fiber.Ctx, path string) error {
-	if helpers.IsHTMXRequest(c) {
-		c.Set("HX-Location", path)
-		return nil
-	} else {
-		return c.Redirect(path)
-	}
-}

web/helpers/helpers.go

@@ -8,7 +8,6 @@ import (
 	"github.com/ItsNotGoodName/smtpbridge/internal/build"
 	"github.com/ItsNotGoodName/smtpbridge/web"
 	"github.com/dustin/go-humanize"
-	"github.com/gofiber/fiber/v2"
 )
 
 var Map template.FuncMap = template.FuncMap{
@@ -42,8 +41,3 @@ var Map template.FuncMap = template.FuncMap{
 		return template.URL(Query(queries, vals...))
 	},
 }
-
-func IsHTMXRequest(c *fiber.Ctx) bool {
-	_, isHTMXRequest := c.GetReqHeaders()["Hx-Request"]
-	return isHTMXRequest
-}

web/helpers/http.go

@@ -4,6 +4,20 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
+func IsHTMXRequest(c *fiber.Ctx) bool {
+	_, isHTMXRequest := c.GetReqHeaders()["Hx-Request"]
+	return isHTMXRequest
+}
+
+func Redirect(c *fiber.Ctx, path string) error {
+	if IsHTMXRequest(c) {
+		c.Set("HX-Location", path)
+		return nil
+	} else {
+		return c.Redirect(path)
+	}
+}
+
 func Error(c *fiber.Ctx, err error, codes ...int) error {
 	if IsHTMXRequest(c) {
 		c.Set("HX-Redirect", "/something-went-wrong")

web/views/login.html

@@ -19,7 +19,7 @@ <h2>Login</h2>
         <input type="password" id="password" name="password" placeholder="Password" />
       </label>
 
-      <button data-loading-path="/login" data-loading-disable data-loading-aria-busy>
+      <button data-loading-path="/auth" data-loading-disable data-loading-aria-busy>
         Log in
       </button>
       {{with .Flash}}