Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4a83ab6bd6 | ||
|
|
2c09ab8f87 | ||
|
|
75be4d3015 | ||
|
|
c208afabf1 |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 34 KiB |
88
main.go
88
main.go
@@ -2,6 +2,8 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
|
"net"
|
||||||
|
"time"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -25,6 +27,69 @@ var (
|
|||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type responseWriter struct {
|
||||||
|
http.ResponseWriter
|
||||||
|
statusCode int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (rw *responseWriter) WriteHeader(code int) {
|
||||||
|
rw.statusCode = code
|
||||||
|
rw.ResponseWriter.WriteHeader(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
func newResponseWriter(w http.ResponseWriter) *responseWriter {
|
||||||
|
return &responseWriter{w, http.StatusOK} // Default 200 OK
|
||||||
|
}
|
||||||
|
|
||||||
|
func LoggingMiddleware(next http.Handler) http.Handler {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
start := time.Now()
|
||||||
|
|
||||||
|
// ResponseWriter einpacken
|
||||||
|
rw := newResponseWriter(w)
|
||||||
|
|
||||||
|
// Den nächsten Handler ausführen
|
||||||
|
next.ServeHTTP(rw, r)
|
||||||
|
|
||||||
|
// Log-Daten sammeln
|
||||||
|
duration := time.Since(start)
|
||||||
|
clientIP := getClientIP(r) // Deine Funktion von vorhin
|
||||||
|
|
||||||
|
// Format: IP - - [Datum] "Method Path Proto" Status Duration
|
||||||
|
log.Printf("%s - - [%s] \"%s %s %s\" %d %v\n",
|
||||||
|
clientIP,
|
||||||
|
time.Now().Format("02/Jan/2006:15:04:05 -0700"),
|
||||||
|
r.Method,
|
||||||
|
r.URL.Path,
|
||||||
|
r.Proto,
|
||||||
|
rw.statusCode,
|
||||||
|
duration,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func getClientIP(r *http.Request) string {
|
||||||
|
// 1. Prüfe den X-Forwarded-For Header (Standard für Proxies)
|
||||||
|
xForwardedFor := r.Header.Get("X-Forwarded-For")
|
||||||
|
if xForwardedFor != "" {
|
||||||
|
// Der Header kann eine Liste von IPs sein (Client, Proxy1, Proxy2)
|
||||||
|
// Die erste IP in der Liste ist die echte Client-IP
|
||||||
|
ips := strings.Split(xForwardedFor, ",")
|
||||||
|
return strings.TrimSpace(ips[0])
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Fallback auf X-Real-IP (oft von Traefik/Nginx gesetzt)
|
||||||
|
xRealIP := r.Header.Get("X-Real-IP")
|
||||||
|
if xRealIP != "" {
|
||||||
|
return xRealIP
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Letzter Ausweg: Die direkte IP (wird in deinem Fall die Traefik-IP sein)
|
||||||
|
// RemoteAddr enthält oft auch den Port (z.B. "127.0.0.1:1234")
|
||||||
|
ip, _, _ := net.SplitHostPort(r.RemoteAddr)
|
||||||
|
return ip
|
||||||
|
}
|
||||||
|
|
||||||
// Diese Funktion wird nur intern aufgerufen, wenn der Mutex bereits gesperrt ist
|
// Diese Funktion wird nur intern aufgerufen, wenn der Mutex bereits gesperrt ist
|
||||||
func getCount() int {
|
func getCount() int {
|
||||||
data, err := os.ReadFile(counterFile)
|
data, err := os.ReadFile(counterFile)
|
||||||
@@ -141,15 +206,20 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
loadTemplates()
|
loadTemplates()
|
||||||
fs := http.FileServer(http.Dir("static"))
|
mux := http.NewServeMux()
|
||||||
http.Handle("/static/", http.StripPrefix("/static/", fs))
|
|
||||||
|
|
||||||
http.HandleFunc("/", indexHandler)
|
fs := http.FileServer(http.Dir("static"))
|
||||||
http.HandleFunc("/api/password", passwordAPIHandler)
|
mux.Handle("/static/", http.StripPrefix("/static/", fs))
|
||||||
http.HandleFunc("/json/password", passwordHandler)
|
|
||||||
http.HandleFunc("/help", helpHandler)
|
|
||||||
|
|
||||||
log.Println("Server läuft auf http://localhost:8080")
|
mux.HandleFunc("/", indexHandler)
|
||||||
log.Fatal(http.ListenAndServe(":8080", nil))
|
mux.HandleFunc("/api/password", passwordAPIHandler)
|
||||||
|
mux.HandleFunc("/json/password", passwordHandler)
|
||||||
|
mux.HandleFunc("/help", helpHandler)
|
||||||
|
|
||||||
|
loggingRouter := LoggingMiddleware(mux)
|
||||||
|
|
||||||
|
log.Println("Server läuft auf http://localhost:8080")
|
||||||
|
|
||||||
|
log.Fatal(http.ListenAndServe(":8080", loggingRouter))
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user