aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middleware
diff options
context:
space:
mode:
Diffstat (limited to 'server/middleware')
-rw-r--r--server/middleware/basic_auth.go10
-rw-r--r--server/middleware/fever.go10
-rw-r--r--server/middleware/session.go8
-rw-r--r--server/middleware/token.go12
4 files changed, 20 insertions, 20 deletions
diff --git a/server/middleware/basic_auth.go b/server/middleware/basic_auth.go
index 887acc0..c4a2736 100644
--- a/server/middleware/basic_auth.go
+++ b/server/middleware/basic_auth.go
@@ -6,9 +6,9 @@ package middleware
import (
"context"
- "log"
"net/http"
+ "github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/storage"
)
@@ -25,14 +25,14 @@ func (b *BasicAuthMiddleware) Handler(next http.Handler) http.Handler {
username, password, authOK := r.BasicAuth()
if !authOK {
- log.Println("[Middleware:BasicAuth] No authentication headers sent")
+ logger.Debug("[Middleware:BasicAuth] No authentication headers sent")
w.WriteHeader(http.StatusUnauthorized)
w.Write([]byte(errorResponse))
return
}
if err := b.store.CheckPassword(username, password); err != nil {
- log.Println("[Middleware:BasicAuth] Invalid username or password:", username)
+ logger.Info("[Middleware:BasicAuth] Invalid username or password: %s", username)
w.WriteHeader(http.StatusUnauthorized)
w.Write([]byte(errorResponse))
return
@@ -40,13 +40,13 @@ func (b *BasicAuthMiddleware) Handler(next http.Handler) http.Handler {
user, err := b.store.UserByUsername(username)
if err != nil || user == nil {
- log.Println("[Middleware:BasicAuth] User not found:", username)
+ logger.Info("[Middleware:BasicAuth] User not found: %s", username)
w.WriteHeader(http.StatusUnauthorized)
w.Write([]byte(errorResponse))
return
}
- log.Println("[Middleware:BasicAuth] User authenticated:", username)
+ logger.Info("[Middleware:BasicAuth] User authenticated: %s", username)
b.store.SetLastLogin(user.ID)
ctx := r.Context()
diff --git a/server/middleware/fever.go b/server/middleware/fever.go
index 7334d3d..54eb0ca 100644
--- a/server/middleware/fever.go
+++ b/server/middleware/fever.go
@@ -6,9 +6,9 @@ package middleware
import (
"context"
- "log"
"net/http"
+ "github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/storage"
)
@@ -20,25 +20,25 @@ type FeverMiddleware struct {
// Handler executes the middleware.
func (f *FeverMiddleware) Handler(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- log.Println("[Middleware:Fever]")
+ logger.Debug("[Middleware:Fever]")
apiKey := r.FormValue("api_key")
user, err := f.store.UserByFeverToken(apiKey)
if err != nil {
- log.Println(err)
+ logger.Error("[Fever] %v", err)
w.Header().Set("Content-Type", "application/json")
w.Write([]byte(`{"api_version": 3, "auth": 0}`))
return
}
if user == nil {
- log.Println("[Middleware:Fever] Fever authentication failure")
+ logger.Info("[Middleware:Fever] Fever authentication failure")
w.Header().Set("Content-Type", "application/json")
w.Write([]byte(`{"api_version": 3, "auth": 0}`))
return
}
- log.Printf("[Middleware:Fever] User #%d is authenticated\n", user.ID)
+ logger.Info("[Middleware:Fever] User #%d is authenticated", user.ID)
f.store.SetLastLogin(user.ID)
ctx := r.Context()
diff --git a/server/middleware/session.go b/server/middleware/session.go
index 2ef7151..edaa59b 100644
--- a/server/middleware/session.go
+++ b/server/middleware/session.go
@@ -6,9 +6,9 @@ package middleware
import (
"context"
- "log"
"net/http"
+ "github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/server/route"
"github.com/miniflux/miniflux/storage"
@@ -28,14 +28,14 @@ func (s *SessionMiddleware) Handler(next http.Handler) http.Handler {
session := s.getSessionFromCookie(r)
if session == nil {
- log.Println("[Middleware:Session] Session not found")
+ logger.Debug("[Middleware:Session] Session not found")
if s.isPublicRoute(r) {
next.ServeHTTP(w, r)
} else {
http.Redirect(w, r, route.Path(s.router, "login"), http.StatusFound)
}
} else {
- log.Println("[Middleware:Session]", session)
+ logger.Debug("[Middleware:Session] %s", session)
ctx := r.Context()
ctx = context.WithValue(ctx, UserIDContextKey, session.UserID)
ctx = context.WithValue(ctx, IsAuthenticatedContextKey, true)
@@ -63,7 +63,7 @@ func (s *SessionMiddleware) getSessionFromCookie(r *http.Request) *model.Session
session, err := s.store.SessionByToken(sessionCookie.Value)
if err != nil {
- log.Println(err)
+ logger.Error("[SessionMiddleware] %v", err)
return nil
}
diff --git a/server/middleware/token.go b/server/middleware/token.go
index 5b24606..e1666f7 100644
--- a/server/middleware/token.go
+++ b/server/middleware/token.go
@@ -6,9 +6,9 @@ package middleware
import (
"context"
- "log"
"net/http"
+ "github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/model"
"github.com/miniflux/miniflux/storage"
)
@@ -25,10 +25,10 @@ func (t *TokenMiddleware) Handler(next http.Handler) http.Handler {
token := t.getTokenValueFromCookie(r)
if token == nil {
- log.Println("[Middleware:Token] Token not found")
+ logger.Debug("[Middleware:Token] Token not found")
token, err = t.store.CreateToken()
if err != nil {
- log.Println(err)
+ logger.Error("[Middleware:Token] %v", err)
http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
return
}
@@ -43,13 +43,13 @@ func (t *TokenMiddleware) Handler(next http.Handler) http.Handler {
http.SetCookie(w, cookie)
} else {
- log.Println("[Middleware:Token]", token)
+ logger.Info("[Middleware:Token] %s", token)
}
isTokenValid := token.Value == r.FormValue("csrf") || token.Value == r.Header.Get("X-Csrf-Token")
if r.Method == "POST" && !isTokenValid {
- log.Println("[Middleware:CSRF] Invalid or missing CSRF token!")
+ logger.Error("[Middleware:CSRF] Invalid or missing CSRF token!")
w.WriteHeader(http.StatusBadRequest)
w.Write([]byte("Invalid or missing CSRF token!"))
} else {
@@ -68,7 +68,7 @@ func (t *TokenMiddleware) getTokenValueFromCookie(r *http.Request) *model.Token
token, err := t.store.Token(tokenCookie.Value)
if err != nil {
- log.Println(err)
+ logger.Error("[Middleware:Token] %v", err)
return nil
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 02:12:46 +0000