Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ae081b12df | ||
|
|
c69acecfd7 | ||
|
|
3101529fa7 |
38
main.go
38
main.go
@@ -4,8 +4,10 @@ import (
|
||||
"crypto/rand"
|
||||
"encoding/json"
|
||||
"html/template"
|
||||
"path/filepath"
|
||||
"log"
|
||||
"net"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
@@ -17,8 +19,11 @@ import (
|
||||
const (
|
||||
passwordLength = 32
|
||||
chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
|
||||
startTimeKey contextKey = "startTime"
|
||||
)
|
||||
|
||||
type contextKey string
|
||||
|
||||
var (
|
||||
debug = false
|
||||
templates = make(map[string]*template.Template)
|
||||
@@ -32,6 +37,11 @@ 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)
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Debug-Modus auslesen (String zu Bool)
|
||||
@@ -135,6 +145,12 @@ func loadTemplates() {
|
||||
funcMap := template.FuncMap{
|
||||
"getAppVersion": func() string { return AppVersion },
|
||||
"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
|
||||
@@ -196,17 +212,37 @@ func passwordAPIHandler(w http.ResponseWriter, r *http.Request) {
|
||||
w.Write([]byte(password))
|
||||
}
|
||||
|
||||
type PageData struct {
|
||||
Title string
|
||||
StartTime time.Time
|
||||
Request *http.Request
|
||||
Data interface{} // Deine eigentlichen Seitendaten
|
||||
}
|
||||
|
||||
func indexHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if debug {
|
||||
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 := "load..."
|
||||
|
||||
data := struct {
|
||||
Password string
|
||||
StartTime time.Time
|
||||
Request *http.Request
|
||||
RealIP string
|
||||
}{
|
||||
Password: password,
|
||||
StartTime: startTime,
|
||||
Request: r,
|
||||
RealIP: getClientIP(r),
|
||||
}
|
||||
|
||||
if debug {
|
||||
log.Printf("prepare template for index\n")
|
||||
}
|
||||
|
||||
@@ -3,6 +3,9 @@ services:
|
||||
image: gitea.scu.si/florian.walther/password-generator:latest
|
||||
container_name: password-generator
|
||||
restart: always
|
||||
environment:
|
||||
- DEBUG=false
|
||||
- COUNTER_FILE=/data/counter.txt
|
||||
volumes:
|
||||
- ./app_data:/data
|
||||
ports:
|
||||
|
||||
@@ -211,3 +211,27 @@ a:hover {
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -44,11 +44,35 @@
|
||||
</head>
|
||||
<body>
|
||||
<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}}
|
||||
|
||||
{{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>
|
||||
<div class="footer-container">
|
||||
<div class="footer-item">
|
||||
<span>Ladezeit: {{dt .StartTime}}</span>
|
||||
</div>
|
||||
<div class="footer-item">
|
||||
Passwörter generiert: <span id="global-counter">{{getPassCount}}</span>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user