ref: Move net/http

I was young and naive, fasthttp does not fit my needs and make
development slower. I'll move to net/http since it has a wider support
and will spare some time on implementation detail things (like CSRF). It
will allow me to reduce a bit of the code since there may be lib for
handling cookie encryption and auth in general.

1 files changed, 36 insertions, 38 deletions

diff --git a/pkg/ext/middleware.go b/pkg/ext/middleware.go
index bcc6c5f..fe2d185 100644
--- a/pkg/ext/middleware.go
+++ b/pkg/ext/middleware.go
@@ -1,22 +1,22 @@
 package ext
 
 import (
+	"context"
 	"encoding/base64"
+	"errors"
+	"net/http"
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"github.com/valyala/fasthttp"
 
 	"git.sr.ht/~gabrielgio/img/pkg/database/repository"
 	"git.sr.ht/~gabrielgio/img/pkg/service"
 )
 
-func HTML(next fasthttp.RequestHandler) fasthttp.RequestHandler {
-	return func(ctx *fasthttp.RequestCtx) {
-		if len(ctx.Request.Header.ContentType()) > 0 {
-			ctx.Response.Header.SetContentType("text/html")
-		}
-		next(ctx)
+func HTML(next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "text/html")
+		next(w, r)
 	}
 }
 
@@ -30,17 +30,15 @@ func NewLogMiddleare(log *logrus.Entry) *LogMiddleware {
 	}
 }
 
-func (l *LogMiddleware) HTTP(next fasthttp.RequestHandler) fasthttp.RequestHandler {
-	return func(ctx *fasthttp.RequestCtx) {
+func (l *LogMiddleware) HTTP(next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		start := time.Now()
-		next(ctx)
+		next(w, r)
 		elapsed := time.Since(start)
 		l.entry.
 			WithField("time", elapsed).
-			WithField("code", ctx.Response.StatusCode()).
-			WithField("path", string(ctx.Path())).
-			WithField("bytes", len(ctx.Response.Body())).
-			Info(string(ctx.Request.Header.Method()))
+			WithField("path", r.URL.Path).
+			Info(r.Method)
 	}
 }
 
@@ -56,23 +54,23 @@ func NewAuthMiddleware(key []byte, log *logrus.Entry) *AuthMiddleware {
 	}
 }
 
-func (a *AuthMiddleware) LoggedIn(next fasthttp.RequestHandler) fasthttp.RequestHandler {
-	return func(ctx *fasthttp.RequestCtx) {
-		path := string(ctx.Path())
+func (a *AuthMiddleware) LoggedIn(next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		path := string(r.URL.Path)
 		if path == "/login" || path == "/initial" {
-			next(ctx)
+			next(w, r)
 			return
 		}
 
 		redirectLogin := "/login?redirect=" + path
-		authBase64 := ctx.Request.Header.Cookie("auth")
-		if authBase64 == nil {
+		authBase64, err := r.Cookie("auth")
+		if errors.Is(err, http.ErrNoCookie) {
 			a.entry.Info("No auth provided")
-			ctx.Redirect(redirectLogin, 307)
+			http.Redirect(w, r, redirectLogin, http.StatusTemporaryRedirect)
 			return
 		}
 
-		auth, err := base64.StdEncoding.DecodeString(string(authBase64))
+		auth, err := base64.StdEncoding.DecodeString(authBase64.Value)
 		if err != nil {
 			a.entry.Error(err)
 			return
@@ -81,20 +79,20 @@ func (a *AuthMiddleware) LoggedIn(next fasthttp.RequestHandler) fasthttp.Request
 		token, err := service.ReadToken(auth, a.key)
 		if err != nil {
 			a.entry.Error(err)
-			ctx.Redirect(redirectLogin, 307)
+			http.Redirect(w, r, redirectLogin, http.StatusTemporaryRedirect)
 			return
 		}
-		ctx.SetUserValue("token", token)
+		r = r.WithContext(context.WithValue(r.Context(), "token", token))
 		a.entry.
 			WithField("userID", token.UserID).
 			WithField("username", token.Username).
 			Info("user recognized")
-		next(ctx)
+		next(w, r)
 	}
 }
 
-func GetTokenFromCtx(ctx *fasthttp.RequestCtx) *service.Token {
-	tokenValue := ctx.UserValue("token")
+func GetTokenFromCtx(w http.ResponseWriter, r *http.Request) *service.Token {
+	tokenValue := r.Context().Value("token")
 	if token, ok := tokenValue.(*service.Token); ok {
 		return token
 	}
@@ -111,31 +109,31 @@ func NewInitialSetupMiddleware(userRepository repository.UserRepository) *Initia
 	}
 }
 
-func (i *InitialSetupMiddleware) Check(next fasthttp.RequestHandler) fasthttp.RequestHandler {
-	return func(ctx *fasthttp.RequestCtx) {
+func (i *InitialSetupMiddleware) Check(next http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
 		// if user has been set to context it is logged in already
-		_, ok := ctx.UserValue("token").(*service.Token)
-		if ok {
-			next(ctx)
+		token := GetTokenFromCtx(w, r)
+		if token == nil {
+			next(w, r)
 			return
 		}
 
-		path := string(ctx.Path())
+		path := r.URL.Path
 		if path == "/initial" {
-			next(ctx)
+			next(w, r)
 			return
 		}
 
-		exists, err := i.userRepository.Any(ctx)
+		exists, err := i.userRepository.Any(r.Context())
 		if err != nil {
-			InternalServerError(ctx, err)
+			InternalServerError(w, err)
 			return
 		}
 
 		if exists {
-			next(ctx)
+			next(w, r)
 			return
 		}
-		ctx.Redirect("/initial", 307)
+		http.Redirect(w, r, "/initial", http.StatusTemporaryRedirect)
 	}
 }