Florian.Walther/Web-Password
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mein bereinigt

Browse Source
This commit is contained in:
Florian Walther
2026-02-11 20:12:09 +01:00
parent 5d05592a90
commit e8ba7f7390
1 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
main.go
View File

@@ -3,13 +3,13 @@ package main
import ( import (
"crypto/rand" "crypto/rand"
"encoding/json" "encoding/json"
"fmt"
"html/template" "html/template"
"path/filepath"
"log" "log"
"net" "net"
"fmt"
"net/http" "net/http"
"os" "os"
"path/filepath"
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
@@ -22,8 +22,6 @@ const (
startTimeKey contextKey = "startTime" startTimeKey contextKey = "startTime"
) )
type contextKey string
var ( var (
debug = false debug = false
templates = make(map[string]*template.Template) templates = make(map[string]*template.Template)
@@ -32,26 +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)
// 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)
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
@@ -66,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()
@@ -141,7 +138,6 @@ 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() },
@@ -153,8 +149,6 @@ func loadTemplates() {
}, },
} }
// 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",
@@ -212,13 +206,6 @@ func passwordAPIHandler(w http.ResponseWriter, r *http.Request) {
w.Write([]byte(password)) 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) { 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)