diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6d30d10..828963df 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,12 +42,12 @@ deploy: # Process the Umbrella Top 1M - sh ../utils/umbrella-top-1m.sh - # Parse domains from URLhaus excluding popular domains - - sh ../utils/malware-domains.sh - # Parse popular domains that also appear in URLhaus - sh ../utils/urlhaus-top-domains.sh + # Parse domains from URLhaus excluding popular domains + - sh ../utils/malware-domains.sh + # Parse malware URLs from popular domains - sh ../utils/malware-url-top-domains.sh diff --git a/utils/malware-domains.sh b/utils/malware-domains.sh index d4632fc8..2606aa25 100644 --- a/utils/malware-domains.sh +++ b/utils/malware-domains.sh @@ -19,4 +19,4 @@ sed -e 's/^www\.//g' | \ sort -u | \ # Exclude Umbrella Top 1M and well-known domains # grep inverse match whole line -grep -Fx -vf top-1m-well-known.txt > malware-domains.txt +grep -Fx -vf urlhaus-top-domains.txt > malware-domains.txt diff --git a/utils/urlhaus-filter.sh b/utils/urlhaus-filter.sh index 8e2c87f7..b7462310 100644 --- a/utils/urlhaus-filter.sh +++ b/utils/urlhaus-filter.sh @@ -3,7 +3,6 @@ ## Merge malware-domains.txt malware-url-top-domains.txt, ## and append a header to instruct uBO to grab the filter daily. - CURRENT_TIME="$(date -R -u)" FIRST_LINE="! Title: abuse.ch URLhaus Malicious URL Blocklist" SECOND_LINE="! Updated: $CURRENT_TIME"