sendnrw/flod
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix3
All checks were successful
release-tag / release-image (push) Successful in 1m46s
Details

Browse Source
This commit is contained in:
jbergner
2025-06-21 22:42:43 +02:00
parent 9cb11db43a
commit 8a4ec32861
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
main.go
View File

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