Compare commits

..

5 Commits
v0.7.9 ... main

Author SHA1 Message Date
Florian Walther
e8ba7f7390 mein bereinigt 2026-02-11 20:12:09 +01:00
Florian Walther
5d05592a90 updated screenshot 2026-02-09 18:54:12 +01:00
Florian Walther
ae081b12df added load time to HTML template
All checks were successful
Docker Release Build / push_to_registry (push) Successful in 55s
2026-02-09 18:51:06 +01:00
Florian Walther
c69acecfd7 environment added to docker-compose.yml 2026-02-09 18:16:09 +01:00
Florian Walther
3101529fa7 debug modus im HTML eingebaut
All checks were successful
Docker Release Build / push_to_registry (push) Successful in 56s
2026-02-09 18:13:13 +01:00
5 changed files with 100 additions and 26 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 36 KiB

61
main.go
View File

@@ -3,11 +3,13 @@ package main
import ( import (
"crypto/rand" "crypto/rand"
"encoding/json" "encoding/json"
"fmt"
"html/template" "html/template"
"log" "log"
"net" "net"
"net/http" "net/http"
"os" "os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@@ -17,6 +19,7 @@ import (
const ( const (
passwordLength = 32 passwordLength = 32
chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
startTimeKey contextKey = "startTime"
) )
var ( var (
@@ -27,21 +30,7 @@ var (
mu sync.Mutex mu sync.Mutex
) )
func initConfig() { type contextKey string
// 1. Counter-Pfad auslesen
if envFile := os.Getenv("COUNTER_FILE"); envFile != "" {
counterFile = envFile
log.Printf("counterFile st to %s, by ENV\n", envFile)
}
// 2. Debug-Modus auslesen (String zu Bool)
envDebug := strings.ToLower(os.Getenv("DEBUG"))
if envDebug == "true" || envDebug == "1" {
debug = true
log.Println("DEBUG-Modus ist aktiviert")
}
}
type responseWriter struct { type responseWriter struct {
http.ResponseWriter http.ResponseWriter
statusCode int statusCode int
@@ -56,6 +45,24 @@ func newResponseWriter(w http.ResponseWriter) *responseWriter {
return &responseWriter{w, http.StatusOK} // Default 200 OK return &responseWriter{w, http.StatusOK} // Default 200 OK
} }
func initConfig() {
if envFile := os.Getenv("COUNTER_FILE"); envFile != "" {
counterFile = envFile
log.Printf("counterFile st to %s, by ENV\n", envFile)
// Prüfen, ob das Verzeichnis für die Datei existiert
dir := filepath.Dir(counterFile)
if _, err := os.Stat(dir); os.IsNotExist(err) {
log.Printf("WARNUNG: Verzeichnis %s existiert nicht. Counter wird evtl. fehlschlagen.", dir)
}
}
envDebug := strings.ToLower(os.Getenv("DEBUG"))
if envDebug == "true" || envDebug == "1" {
debug = true
log.Println("DEBUG-Modus ist aktiviert")
}
}
func LoggingMiddleware(next http.Handler) http.Handler { func LoggingMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
start := time.Now() start := time.Now()
@@ -131,14 +138,17 @@ func IncrementPasswordCount() {
} }
func loadTemplates() { func loadTemplates() {
// 1. FuncMap definieren
funcMap := template.FuncMap{ funcMap := template.FuncMap{
"getAppVersion": func() string { return AppVersion }, "getAppVersion": func() string { return AppVersion },
"getPassCount": func() int { return GetPasswordCount() }, "getPassCount": func() int { return GetPasswordCount() },
"isDebug": func() bool { return debug },
"dt": func(startTime time.Time) string {
duration := time.Since(startTime)
// Gibt die Zeit in Millisekunden mit 2 Nachkommastellen aus, z.B. "1.45ms"
return fmt.Sprintf("%.2fms", float64(duration.Nanoseconds())/1e6)
},
} }
// 2. Templates mit FuncMap laden
// Wir nutzen New("base.html"), da base.html meist das Haupt-Layout definiert
templates["index.html"] = template.Must(template.New("base.html").Funcs(funcMap).ParseFiles( templates["index.html"] = template.Must(template.New("base.html").Funcs(funcMap).ParseFiles(
"templates/base.html", "templates/base.html",
"templates/index.html", "templates/index.html",
@@ -200,13 +210,26 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
if debug { if debug {
log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL) log.Printf("call indexHandler: Request %s %s\n", r.Method, r.URL)
} }
startTime, ok := r.Context().Value(startTimeKey).(time.Time)
if !ok {
startTime = time.Now() // Fallback, falls die Middleware mal fehlt
}
password := generatePassword() password := generatePassword()
//password := "load..."
data := struct { data := struct {
Password string Password string
StartTime time.Time
Request *http.Request
RealIP string
}{ }{
Password: password, Password: password,
StartTime: startTime,
Request: r,
RealIP: getClientIP(r),
} }
if debug { if debug {
log.Printf("prepare template for index\n") log.Printf("prepare template for index\n")
} }

View File

@@ -3,6 +3,9 @@ services:
image: gitea.scu.si/florian.walther/password-generator:latest image: gitea.scu.si/florian.walther/password-generator:latest
container_name: password-generator container_name: password-generator
restart: always restart: always
environment:
- DEBUG=false
- COUNTER_FILE=/data/counter.txt
volumes: volumes:
- ./app_data:/data - ./app_data:/data
ports: ports:

View File

@@ -211,3 +211,27 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
.debug-banner {
position: absolute;
top: 1rem;
left: 4rem;
font-size: 1.2rem;
border-radius: 4px;
border: 1px solid var(--border-color);
}
.debug-only {
display: none;
}
.debug-footer {
position: absolute;
bottom: 4em;
left: 0;
}
body.is-debug .debug-only {
display: inline-block;
border: 1px dashed red;
}

View File

@@ -44,11 +44,35 @@
</head> </head>
<body> <body>
<button id="theme-toggle">🌓</button> <button id="theme-toggle">🌓</button>
{{if isDebug}}
<div class="debug-banner" style="background: #ffeb3b; color: #000; text-align: center; font-size: 12px; padding: 5px; font-weight: bold;">
⚠️ DEBUG-MODUS AKTIVIERT
</div>
{{end}}
{{ block "body" . }}{{end}} {{ block "body" . }}{{end}}
{{if isDebug}}
<div class="debug-footer" style="background: #333; color: #0f0; font-family: monospace; font-size: 11px; padding: 10px; border-top: 2px solid #0f0;">
<div>
<strong>DEBUG INFO:</strong>
<span>Ladezeit: {{dt .StartTime}}</span> |
<span>Method: {{.Request.Method}}</span> |
<span>Path: {{.Request.URL.Path}}</span> |
<span>Remote: {{.Request.RemoteAddr}}</span> |
<span>Real IP: {{.RealIP}}</span>
</div>
<div style="margin-top: 5px; color: #888;">
User-Agent: {{.Request.UserAgent}}
</div>
</div>
{{end}}
<!-- <footer>Version: {{getAppVersion}} | made with golang and ♥️ {{ block "footer" . }}{{ end }}</footer> --> <!-- <footer>Version: {{getAppVersion}} | made with golang and ♥️ {{ block "footer" . }}{{ end }}</footer> -->
<footer> <footer>
<div class="footer-container"> <div class="footer-container">
<div class="footer-item">
<span>Ladezeit: {{dt .StartTime}}</span>
</div>
<div class="footer-item"> <div class="footer-item">
Passwörter generiert: <span id="global-counter">{{getPassCount}}</span> Passwörter generiert: <span id="global-counter">{{getPassCount}}</span>
</div> </div>