changed log to combined log format

main.go

@@ -2,9 +2,16 @@ package main
 
 import (
 	"crypto/rand"
+	"encoding/json"
 	"html/template"
 	"log"
+	"net"
 	"net/http"
+	"os"
+	"strconv"
+	"strings"
+	"sync"
+	"time"
 )
 
 const (
@@ -12,15 +19,107 @@ const (
 	chars          = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
 )
 
-var templates = make(map[string]*template.Template)
-var AppVersion = "development"
+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()
+		rw := newResponseWriter(w)
+		next.ServeHTTP(rw, r)
+		duration := time.Since(start)
+		clientIP := getClientIP(r)
+		userAgent := r.UserAgent()
+		// Format: IP - - [Datum] "Method Path Proto" Status Duration User-Agent
+		// "Combined Log Format"
+		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,
+			userAgent,
+		)
+	})
+}
+
+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)
+	if err != nil {
+		return 0
+	}
+	count, _ := strconv.Atoi(strings.TrimSpace(string(data)))
+	return count
+}
+
+// Öffentliche Funktion für das Template (mit Lock)
+func GetPasswordCount() int {
+	mu.Lock()
+	defer mu.Unlock()
+	return getCount()
+}
+
+// Öffentliche Funktion zum Erhöhen (mit Lock)
+func IncrementPasswordCount() {
+	mu.Lock()
+	defer mu.Unlock()
+
+	// Wir rufen jetzt die interne Funktion auf, die NICHT versucht,
+	// den Mutex erneut zu sperren
+	count := getCount()
+	count++
+	os.WriteFile(counterFile, []byte(strconv.Itoa(count)), 0644)
+}
 
 func loadTemplates() {
 	// 1. FuncMap definieren
 	funcMap := template.FuncMap{
-        "getAppVersion": func() string {
-            return AppVersion
-        },
+		"getAppVersion": func() string { return AppVersion },
+		"getPassCount":  func() int { return GetPasswordCount() },
 	}
 
 	// 2. Templates mit FuncMap laden
@@ -39,6 +138,9 @@ func loadTemplates() {
 }
 
 func generatePassword() string {
+	if debug {
+		log.Printf("called generatePassword\n")
+	}
 	password := make([]byte, passwordLength)
 	_, err := rand.Read(password)
 	if err != nil {
@@ -47,23 +149,52 @@ func generatePassword() string {
 	for i := 0; i < passwordLength; i++ {
 		password[i] = chars[int(password[i])%len(chars)]
 	}
+	IncrementPasswordCount()
 	return string(password)
 }
 
 func passwordHandler(w http.ResponseWriter, r *http.Request) {
+	if debug {
+		log.Printf("called passwordHandler\n")
+	}
+	password := generatePassword()
+	currentCount := GetPasswordCount()
+	response := map[string]interface{}{
+		"password": password,
+		"count":    currentCount,
+	}
+	w.Header().Set("Content-Type", "application/json")
+	err := json.NewEncoder(w).Encode(response)
+	if err != nil {
+		log.Printf("Fehler beim Senden des JSON: %v", err)
+		http.Error(w, "Interner Fehler", http.StatusInternalServerError)
+		return
+	}
+}
+
+func passwordAPIHandler(w http.ResponseWriter, r *http.Request) {
+	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) {
+	if debug {
 		log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL)
+	}
 	password := generatePassword()
+	//password := "load..."
 	data := struct {
 		Password string
 	}{
 		Password: password,
 	}
+	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)
@@ -72,7 +203,9 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func helpHandler(w http.ResponseWriter, r *http.Request) {
+	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)
@@ -82,13 +215,19 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
 
 func main() {
 	loadTemplates()
-	fs := http.FileServer(http.Dir("static"))
-	http.Handle("/static/", http.StripPrefix("/static/", fs))
+	mux := http.NewServeMux()
 
-	http.HandleFunc("/", indexHandler)
-	http.HandleFunc("/api/password", passwordHandler)
-	http.HandleFunc("/help", helpHandler)
+	fs := http.FileServer(http.Dir("static"))
+	mux.Handle("/static/", http.StripPrefix("/static/", fs))
+
+	mux.HandleFunc("/", indexHandler)
+	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", nil))
+
+	log.Fatal(http.ListenAndServe(":8080", loggingRouter))
 }

misc/docker-compose.traefik.yml

@@ -3,6 +3,8 @@ services:
     image: gitea.scu.si/florian.walther/password-generator:latest
     container_name: password-generator
     restart: always
+    volumes:
+      - ./app_data:/data
     expose:
       - "8080:8080"
     labels:

misc/docker-compose.yml

@@ -3,6 +3,8 @@ services:
     image: gitea.scu.si/florian.walther/password-generator:latest
     container_name: password-generator
     restart: always
+    volumes:
+      - ./app_data:/data
     ports:
       - "8080:8080"
     # Falls die Registry privat ist, muss der Host zuvor mit 

static/style.css

@@ -1,6 +1,7 @@
 :root {
   --bg-color: #f5f5f5;
   --text-color: #333;
+  --highlight-color: #1d4ed8;
   --container-bg: white;
   --button-bg: #007BFF;
   --button-hover: #0056b3;
@@ -14,6 +15,7 @@
 .dark {
   --bg-color: #121212;
   --text-color: #e0e0e0;
+  --highlight-color: #fcf803;
   --container-bg: #1e1e1e;
   --button-bg: #2a7df4;
   --button-hover: #1a5fb4;
@@ -34,6 +36,7 @@ body {
   background-color: var(--bg-color);
   color: var(--text-color);
   transition: background-color 0.3s, color 0.3s;
+  margin-bottom: 60px;
 }
 
 .container {
@@ -48,30 +51,42 @@ body {
 }
 
 footer {
-    /* Fixierung am unteren Rand */
     position: fixed;
     bottom: 0;
     left: 0;
-    
-    /* Ausdehnung */
     width: 100%;
-    
-    /* Design & Abstände */
-    background: var(--password-bg);
-    border-top: 1px solid #e0e0e0;
-    padding: 8px 16px;
-    
-    /* Text-Ausrichtung */
-    text-align: left;
-    font-family: monospace; /* Monospace sieht für Versionen oft "technischer" aus */
-    font-size: 12px;
-    color: var(--text-color);
-    
-    /* Sicherstellen, dass nichts drüber liegt */
-    z-index: 9999;
-    
-    /* Padding in die Breite einrechnen */
+    background-color: var(--bg-color);
+    border-top: 1px solid var(--border-color);
+    padding: 10px 20px;
     box-sizing: border-box;
+    box-shadow: 0 2px 10px var(--shadow-color);
+    z-index: 1000;
+}
+
+.footer-container {
+    display: flex;
+    justify-content: flex-end; /* Schiebt alles nach rechts */
+    gap: 20px;                 /* Abstand zwischen Counter und Version */
+    align-items: center;
+}
+
+.footer-item {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    font-family: monospace; /* Monospace sieht für Versionen oft "technischer" aus */
+    font-size: 13px;
+    color:var(--text-color);
+}
+
+@keyframes pulse {
+    0% { transform: scale(1); color: var(--shadow-color); }
+    50% { transform: scale(1.2); color: var(--highlight-color); font-weight: bold; }
+    100% { transform: scale(1); color: var(--shadow-color); }
+}
+
+.counter-update {
+    animation: pulse 0.4s ease-out;
 }
 
 #password {

templates/base.html

@@ -46,6 +46,19 @@
     <button id="theme-toggle">🌓</button>
     {{ block "body" . }}{{end}}
 
-<footer>Version: {{getAppVersion}} | made with golang and ♥️  {{ block "footer" . }}{{ end }}</footer>
+<!-- <footer>Version: {{getAppVersion}} | made with golang and ♥️  {{ block "footer" . }}{{ end }}</footer> -->
+<footer>
+    <div class="footer-container">
+        <div class="footer-item">
+            Passwörter generiert: <span id="global-counter">{{getPassCount}}</span>
+        </div>
+        <div class="footer-item">
+            Version: {{getAppVersion}}
+        </div>
+        <div class="footer-item">
+            made with golang and ♥️
+        </div>
+    </div>
+</footer>
 </body>
 </html>

templates/index.html

@@ -17,13 +17,25 @@
     }
 
     function generateNewPassword() {
-        fetch("/api/password")
-            .then(response => response.text())
-            .then(password => {
-                document.getElementById("password").innerText = password;
+        fetch("/json/password")
+            .then(response => response.json()) // Jetzt .json() statt .text()
+            .then(data => {
+               // Passwort aktualisieren
+               document.getElementById("password").innerText = data.password;
+            
+               // Counter im Footer aktualisieren
+               // Wir suchen das Element mit der Klasse 'badge-blue' (oder gib ihm eine ID)
+               const counterElement = document.getElementById("global-counter");
+               if (counterElement) {
+                   document.getElementById("global-counter").innerText = data.count;
+                   // Animation triggern
+                   counterElement.classList.remove("counter-update"); // Vorherige Animation zurücksetzen
+                   void counterElement.offsetWidth;                 // Trick, um CSS-Reflow zu erzwingen
+                   counterElement.classList.add("counter-update");
+               }
         })
         .catch(error => console.error("Fehler:", error));
-    }
+}
 </script>
 {{ end }}
 
@@ -31,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>