diff --git a/main.go b/main.go index a97b6ab..92a2601 100644 --- a/main.go +++ b/main.go @@ -204,14 +204,18 @@ func fetchAndSave(client *http.Client, t target, outDir string) error { // Import-Logik func importBlocklists() error { client := &http.Client{Timeout: 60 * time.Second} - t := target{Name: "Catalog", URL: os.Getenv("FLOD_IMPORT_URL") + "/lists.json"} - if err := os.MkdirAll("./lists/", 0o755); err != nil { + t := target{Name: "Catalog", URL: os.Getenv("FLOD_IMPORT_URL")} + if err := os.MkdirAll("/lists/", 0o755); err != nil { fmt.Println("creating output dir", err) } - if err := fetchAndSave(client, t, "./lists/"); err != nil { + if err := fetchAndSave(client, t, "/lists/"); err != nil { log.Printf("ERROR %s → %v", t.URL, err) } - blocklistURLs, _ = ImportListJSON("./lists/lists.json") + fileName := filepath.Base(t.URL) + if fileName == "" { + fileName = strings.ReplaceAll(strings.ToLower(strings.ReplaceAll(t.Name, " ", "_")), "..", "") + } + blocklistURLs, _ = ImportListJSON("/lists/" + fileName) var wg sync.WaitGroup errCh := make(chan error, len(blocklistURLs)) @@ -658,7 +662,7 @@ func errorhtml(w http.ResponseWriter, r *http.Request) { - Too Many Requests - Error 429 + Blocked by the First-Line-Of-Defense-Project