bugfixes and updated go.mod

pkg/server/handler.go

@@ -20,6 +20,43 @@ func (nf *notFoundHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	newContext(w, r, nf.s).NotFound()
 }
 
+func jwtHandler(h ctxHandler) ctxHandler {
+	return func(ctx *Context) {
+		if c, err := ctx.Request.Cookie(cookieName); err == nil {
+			t, err := jwt.DecodeToken(c.Value)
+			if err != nil {
+				ctx.LogSetCookie("DecodeToken:", err)
+				return
+			}
+			if err = ctx.Srv.JWT.Verify(t); err != nil {
+				ctx.LogSetCookie("VerifyToken:", err)
+				return
+			}
+			if t.Claims.GetString(totpClaim) != "" {
+				path := ctx.Path()
+				if path == core.TotpURI || path == core.LoginURI || path == core.LogoutURI {
+					ctx.Token = *t
+					h(ctx)
+					return
+				}
+				ctx.Redirect(core.TotpURI, http.StatusFound)
+				return
+
+			}
+			if !ctx.Srv.DB.LockedOut(t.Claims.GetString(userClaim), t.Claims.GetString(userCreatedClaim)) {
+				ctx.Token = *t
+				h(ctx)
+				return
+			}
+			if err = ctx.Srv.JWT.Invalidate(t); err != nil {
+				log.Println("Invalidate:", err)
+			}
+		}
+		ctx.SetCookie(nil, 0)
+		h(ctx)
+	}
+}
+
 func totpAuthHandler(h ctxHandler) ctxHandler {
 	return func(ctx *Context) {
 		if ctx.Totp() != "" {
@@ -69,11 +106,11 @@ func staticHandler(ctx *Context) {
 	ctx.SetHeader("Content-Type", "text/css; charset=utf-8")
 	ctx.SetHeader("Expires", time.Now().UTC().Add(max).Format(http.TimeFormat))
 	switch ctx.Path() {
-	case "/bootstrap.css":
+	case core.BootstrapCSS:
 		err = ctx.Write(ctx.Srv.res["bootstrap.css"])
-	case "/custom.css":
+	case core.CustomCSS:
 		err = ctx.Write(ctx.Srv.res["custom.css"])
-	case "/favicon.ico":
+	case core.Favicon:
 		ctx.SetHeader("Content-Type", "image/x-icon")
 		err = ctx.Write(ctx.Srv.res["favicon.ico"])
 	}
@@ -458,8 +495,8 @@ func pageHandler(ctx *Context) {
 		return
 	}
 	ctx.Data.Data = page
-	ctx.Data.Title = page.Title
-	ctx.Data.BodyTitle = page.Title
+	ctx.Data.Title = section + " | " + page.Title
+	ctx.Data.BodyTitle = section
 	ctx.Exec()
 }