From 8a4ec32861203d93d6232447b677eeceabcc654e Mon Sep 17 00:00:00 2001
From: jbergner <jbergner@send.nrw>
Date: Sat, 21 Jun 2025 22:42:43 +0200
Subject: [PATCH] bugfix3

---
 main.go | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/main.go b/main.go
index 9be7abb..4b4a338 100644
--- a/main.go
+++ b/main.go
@@ -127,8 +127,9 @@ func main() {
 
 func updateBlocklistMetrics() {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	for cat := range blocklistURLs {
@@ -221,8 +222,9 @@ func importBlocklists() error {
 
 func importCategory(cat, url string) error {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	fmt.Printf("⬇️  Lade %s (%s)\n", cat, url)
@@ -295,8 +297,9 @@ func normalizePrefix(s string) (string, bool) {
 
 func handleWhitelist(w http.ResponseWriter, r *http.Request) {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	if r.Method != http.MethodPost {
@@ -338,8 +341,9 @@ func handleWhitelist(w http.ResponseWriter, r *http.Request) {
 // Check-Handler
 func handleCheck(w http.ResponseWriter, r *http.Request) {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	checkRequests.Inc()
@@ -379,8 +383,9 @@ func handleCheck(w http.ResponseWriter, r *http.Request) {
 // Check-Handler
 func handleTraefik(w http.ResponseWriter, r *http.Request) {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	checkRequests.Inc()
@@ -423,8 +428,9 @@ func handleTraefik(w http.ResponseWriter, r *http.Request) {
 // Check-Logik
 func checkIP(ip netip.Addr, cats []string) ([]string, error) {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	wl, err := rdb.Exists(ctx, "wl:"+ip.String()).Result()
@@ -453,8 +459,9 @@ func checkIP(ip netip.Addr, cats []string) ([]string, error) {
 
 func loadCategoryPrefixes(cat string) ([]netip.Prefix, error) {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	prefixCacheMu.Lock()
@@ -493,8 +500,9 @@ func writeJSON(w http.ResponseWriter, v any) {
 
 func handleDownload(w http.ResponseWriter, r *http.Request) {
 	var rdb = redis.NewClient(&redis.Options{
-		Addr:     "flodredis:6379",
+		Addr:     os.Getenv("REDIS_ADDR"),
 		DB:       0,
+		Username: os.Getenv("REDIS_USER"),
 		Password: os.Getenv("REDIS_PASS"),
 	})
 	cat := strings.TrimPrefix(r.URL.Path, "/download/")