logging middleware added

main.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"os"
+	"net"
+	"time"
 	"strconv"
 	"strings"
 	"sync"
@@ -18,12 +20,76 @@ const (
 )
 
 var (
+	debug = false
 	templates = make(map[string]*template.Template)
 	AppVersion = "development"
 	counterFile = "/data/counter.txt"
 	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
 func getCount() int {
 	data, err := os.ReadFile(counterFile)
@@ -76,7 +142,7 @@ func loadTemplates() {
 }
 
 func generatePassword() string {
-	log.Printf("called generatePassword\n")
+	if debug { log.Printf("called generatePassword\n") }
 	password := make([]byte, passwordLength)
 	_, err := rand.Read(password)
 	if err != nil {
@@ -90,7 +156,7 @@ func generatePassword() string {
 }
 
 func passwordHandler(w http.ResponseWriter, r *http.Request) {
-    log.Printf("called passwordHandler\n")
+    if debug { log.Printf("called passwordHandler\n") }
     password := generatePassword()
     currentCount := GetPasswordCount()
     response := map[string]interface{}{
@@ -107,14 +173,14 @@ func passwordHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func passwordAPIHandler(w http.ResponseWriter, r *http.Request) {
-	log.Printf("called passwordHandler\n")
+	if debug { log.Printf("called passwordHandler\n") }
 	password := generatePassword()
 	w.Header().Set("Content-Type", "text/plain")
 	w.Write([]byte(password))
 }
 
 func indexHandler(w http.ResponseWriter, r *http.Request) {
-	log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL)
+	if debug { log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL) }
 	password := generatePassword()
 	//password := "load..."
 	data := struct {
@@ -122,7 +188,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 	}{
 		Password: password,
 	}
-	log.Printf("prepare template for index\n")
+	if debug { log.Printf("prepare template for index\n") }
 	err := templates["index.html"].ExecuteTemplate(w, "base.html", data)
 	if err != nil {
 		log.Printf("Fehler beim Rendern des Templates: %v", err)
@@ -131,7 +197,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func helpHandler(w http.ResponseWriter, r *http.Request) {
-	log.Printf("call helpHandler\n")
+	if debug { log.Printf("call helpHandler\n") }
 	err := templates["help.html"].ExecuteTemplate(w, "base.html", nil)
 	if err != nil {
 		log.Printf("Fehler beim Rendern des Templates: %v", err)
@@ -140,15 +206,20 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-	loadTemplates()
-	fs := http.FileServer(http.Dir("static"))
-	http.Handle("/static/", http.StripPrefix("/static/", fs))
+    loadTemplates()
+    mux := http.NewServeMux()
+    
+    fs := http.FileServer(http.Dir("static"))
+    mux.Handle("/static/", http.StripPrefix("/static/", fs))
 
-	http.HandleFunc("/", indexHandler)
-	http.HandleFunc("/api/password", passwordAPIHandler)
-	http.HandleFunc("/json/password", passwordHandler)
-	http.HandleFunc("/help", helpHandler)
+    mux.HandleFunc("/", indexHandler)
+    mux.HandleFunc("/api/password", passwordAPIHandler)
+    mux.HandleFunc("/json/password", passwordHandler)
+    mux.HandleFunc("/help", helpHandler)
 
-	log.Println("Server läuft auf http://localhost:8080")
-	log.Fatal(http.ListenAndServe(":8080", nil))
+    loggingRouter := LoggingMiddleware(mux)
+
+    log.Println("Server läuft auf http://localhost:8080")
+    
+    log.Fatal(http.ListenAndServe(":8080", loggingRouter))
 }

templates/index.html

@@ -43,7 +43,7 @@
 <div class="container">
     <a href="/help" class="help-link">?</a>
     <a href="https://gitea.scu.si/Florian.Walther/Web-Password" class="code-link">Sourcecode</a>
-    <h1>Generiertes Passwort</h1>
+    <h1>Passwort Generator</h1>
     <div id="password">{{ .Password }}</div>
     <div class="buttons">
         <button class="copy-button" onclick="copyToClipboard()">In Zwischenablage kopieren</button>