More stuff for login

editor.go

@@ -13,6 +13,18 @@ import (
 //go:embed embed
 var editorFS embed.FS
 
+const loginPage = `
+<script src="https://unpkg.com/htmx-ext-json-enc@2.0.1/json-enc.js"></script>
+<form id="loginForm" hx-post="https://api.darkstorm.tech/user/login" hx-ext="json-enc">
+	<label for="username">Username:</label>
+	<input name="username" id="usernameInput"></input>
+	<label for="password">Password:</label>
+	<input name="password" type="password" id="passwordInput"></input>
+	<p id="formResult"></p>
+	<button id="loginButton" type="submit">Login</button>
+</form>
+`
+
 type Editor struct {
 	blogApp *blog.BlogApp
 	back    *backend.Backend
@@ -23,20 +35,11 @@ func NewBlogEditor(blogApp *blog.BlogApp, back *backend.Backend) Editor {
 }
 
 func (e Editor) LoginPage(w http.ResponseWriter, r *http.Request) {
-	page, err := editorFS.Open("embed/login.html")
+	sendContent(w, r, loginPage, "", "")
-	defer page.Close()
+}
-	if err != nil {
+
-		log.Println("error getting login.html:", err)
+func (e Editor) TrueLogin(w http.ResponseWriter, r *http.Request) {
-		sendContent(w, r, "error getting page", "", "")
+	//TODO
-		return
-	}
-	dat, err := io.ReadAll(page)
-	if err != nil {
-		log.Println("error reading login.html:", err)
-		sendContent(w, r, "error getting page", "", "")
-		return
-	}
-	sendContent(w, r, string(dat), "", "")
 }
 
 func (e Editor) Editor(w http.ResponseWriter, r *http.Request) {

embed/login.html

@@ -1,9 +0,0 @@
-<div id="invisiblePusher" hx-push-url="/editor"></div>
-<form id="loginForm" onsubmit="login(event)">
-	<label for="username">Username:</label>
-	<input name="username" id="usernameInput"></input>
-	<label for="password">Password:</label>
-	<input name="password" type="password" id="passwordInput"></input>
-	<p id="formResult"></p>
-	<button id="loginButton" type="submit">Login</button>
-</form>

internal/backend/darkstorm.go

@@ -25,16 +25,16 @@ type Backend struct {
 	corsAddr        string
 	jwtPriv         ed25519.PrivateKey
 	jwtPub          ed25519.PublicKey
-	userMutex       sync.RWMutex
+	userCreateMutex sync.Mutex
 }
 
 // Create a new Backend with the given apps. keyTable must be specified.
 func NewBackend(keyTable Table[ApiKey], apps ...App) (*Backend, error) {
 	b := &Backend{
-		keyTable:  keyTable,
+		keyTable:        keyTable,
-		m:         &http.ServeMux{},
+		m:               &http.ServeMux{},
-		apps:      make(map[string]App),
+		apps:            make(map[string]App),
-		userMutex: sync.RWMutex{},
+		userCreateMutex: sync.Mutex{},
 	}
 	b.m.Handle("GET /robots.txt", http.FileServerFS(robotEmbed))
 	var hasLog, hasCrash bool

internal/backend/user.go

@@ -6,9 +6,9 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"log"
 	"net/http"
-	"strconv"
 	"time"
 
 	"github.com/golang-jwt/jwt/v5"
@@ -56,6 +56,38 @@ type User struct {
 	PasswordChange int64             `json:"passwordChange" bson:"passwordChange"`
 }
 
+var (
+	ErrLoginTimeout   = errors.New("user is timed out")
+	ErrLoginIncorrect = errors.New("username or password is incorrect")
+)
+
+// Tries to login with the given username and password.
+// If the user exists, but is timed out, the user is still returned.
+func (b *Backend) TryLogin(ctx context.Context, username, password string) (User, error) {
+	users, err := b.userTable.Find(ctx, map[string]any{"username": username})
+	if err == ErrNotFound {
+		return User{}, ErrLoginIncorrect
+	}
+	if len(users) > 0 {
+		log.Println("duplicate username detected, fix immediately:", username)
+	}
+	user := users[0]
+	if time.Unix(user.Timeout, 0).After(time.Now()) {
+		return user, ErrLoginTimeout
+	}
+	if valid, _ := user.ValidatePassword(password); !valid {
+		upd := map[string]any{"fails": user.Fails + 1}
+		if (user.Fails+1)%3 == 0 {
+			minutes := 3 ^ (((user.Fails + 1) / 3) - 1)
+			upd["timeout"] = time.Now().Add(time.Minute * time.Duration(minutes)).Unix()
+			b.userTable.PartUpdate(ctx, user.ID, upd)
+			return user, ErrLoginTimeout
+		}
+		return User{}, ErrLoginIncorrect
+	}
+	return user, nil
+}
+
 func NewUser(username, password, email string) (User, error) {
 	id, err := uuid.NewV7()
 	if err != nil {
@@ -139,8 +171,8 @@ func (b *Backend) createUser(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	// TODO: filter offensive words/phrases
-	b.userMutex.Lock()
+	b.userCreateMutex.Lock()
-	defer b.userMutex.Unlock()
+	defer b.userCreateMutex.Unlock()
 	matchUsername, err := b.userTable.Find(r.Context(), map[string]any{"username": req.Username})
 	if err != nil && !errors.Is(err, ErrNotFound) {
 		log.Println("error when checking for username collisions:", err)
@@ -196,8 +228,6 @@ func (b *Backend) deleteUser(w http.ResponseWriter, r *http.Request) {
 		ReturnError(w, http.StatusBadRequest, "badRequest", "Bad Request")
 		return
 	}
-	b.userMutex.Lock()
-	defer b.userMutex.Unlock()
 	err = b.userTable.Remove(r.Context(), userID)
 	if err != nil && err != ErrNotFound {
 		log.Println("error deleting user:", err)
@@ -231,58 +261,23 @@ func (b *Backend) login(w http.ResponseWriter, r *http.Request) {
 		ReturnError(w, http.StatusBadRequest, "invalidBody", "Bad request")
 		return
 	}
-	b.userMutex.RLock()
-	defer b.userMutex.RUnlock()
 	var ret loginReturn
-	users, err := b.userTable.Find(r.Context(), map[string]any{"username": req.Username})
+	u, err := b.TryLogin(r.Context(), req.Username, req.Password)
-	if errors.Is(err, ErrNotFound) || len(users) != 1 {
+	if err == nil {
-		ret.Error = "invalid"
-		ret.ErrorMsg = "Incorrect username or password"
-		w.WriteHeader(http.StatusUnauthorized)
-		json.NewEncoder(w).Encode(ret)
-		return
-	}
-	u := users[0]
-	if time.Unix(u.Timeout, 0).After(time.Now()) {
-		ret.Error = "timeout"
-		ret.Timeout = u.Timeout - time.Now().Unix()
-		ret.ErrorMsg = "Timed out for " + strconv.Itoa(int(ret.Timeout)) + " seconds"
-		w.WriteHeader(http.StatusUnauthorized)
-		json.NewEncoder(w).Encode(ret)
-		return
-	}
-	hash, err := u.HashPassword(req.Password)
-	if err != nil {
-		log.Println("error hashing request password:", err)
-		ReturnError(w, http.StatusInternalServerError, "internal", "Server error")
-		return
-	}
-	if u.Password == hash {
 		ret.Token, err = b.GenerateJWT(u.toReqUser())
 		if err != nil {
-			log.Println("error generating token:", err)
 			ReturnError(w, http.StatusInternalServerError, "internal", "Server error")
 			return
 		}
-		json.NewEncoder(w).Encode(ret)
-		if u.Fails != 0 {
-			err = b.userTable.PartUpdate(context.Background(), u.ID, map[string]any{"fails": 0})
-			if err != nil {
-				log.Println("error resetting fails after successful login:", err)
-			}
-		}
 	} else {
-		ret.Error = "invalid"
+		if err == ErrLoginTimeout {
-		ret.ErrorMsg = "Incorrect username or password"
+			ret.Error = "timeout"
-		upd := map[string]any{"fails": u.Fails + 1}
+			ret.ErrorMsg = fmt.Sprint("Timed out for", u.Timeout, "seconds")
-		if (u.Fails+1)%3 == 0 {
+			ret.Timeout = u.Timeout
-			minutes := 3 ^ ((u.Fails / 3) - 1)
+		} else {
-			timeout := time.Now().Add(time.Duration(minutes) * time.Minute).Unix()
+			ret.Error = "incorrect"
-			upd["timeout"] = timeout
+			ret.ErrorMsg = "Incorrect username or password"
-			ret.Timeout = timeout - time.Now().Unix()
 		}
-		b.userTable.PartUpdate(r.Context(), u.ID, upd)
-		w.WriteHeader(http.StatusUnauthorized)
-		json.NewEncoder(w).Encode(ret)
 	}
+	json.NewEncoder(w).Encode(ret)
 }