From 10f500744f6649a99424767100b436d1e1bb5928 Mon Sep 17 00:00:00 2001
From: MDLeom <2809763-curben@users.noreply.gitlab.com>
Date: Sat, 21 May 2022 02:51:52 +0000
Subject: [PATCH] fix: migrate to malware-filter group

- BREAKING CHANGE
- gitlab.com/malware-filter/malware-filter
---
 README.md            | 6 +++---
 src/build.js         | 6 +++---
 src/gitlab_status.sh | 4 ++--
 src/script.sh        | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 0c0df5d..9d8f5c7 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Malicious URL Blocklist
 
-> Announcement: curben.gitlab.io will be migrated to malware-filter.gitlab.io on 2022/05/21
+> Announcement (2055/05/21): curben.gitlab.io has been migrated to malware-filter.gitlab.io
 
-Blocklists mirror of [urlhaus-filter](https://gitlab.com/curben/urlhaus-filter), [phishing-filter](https://gitlab.com/curben/phishing-filter), [pup-filter](https://gitlab.com/curben/pup-filter) and [tracking-filter](https://gitlab.com/malware-filter/tracking-filter).
+Blocklists mirror of [urlhaus-filter](https://gitlab.com/malware-filter/urlhaus-filter), [phishing-filter](https://gitlab.com/malware-filter/phishing-filter), [pup-filter](https://gitlab.com/malware-filter/pup-filter) and [tracking-filter](https://gitlab.com/malware-filter/tracking-filter).
 
 ## FAQ and Guides
 
-See [wiki](https://gitlab.com/curben/malware-filter/-/wikis/home)
+See [wiki](https://gitlab.com/malware-filter/malware-filter/-/wikis/home)
diff --git a/src/build.js b/src/build.js
index c85ef97..0232c9f 100644
--- a/src/build.js
+++ b/src/build.js
@@ -45,9 +45,9 @@ const pipelineStatus = async (url) => {
 
 const dl = async (project) => {
   const filename = project + '.zip'
-  const link = `https://gitlab.com/curben/${project}/-/jobs/artifacts/main/download?job=pages`
+  const link = `https://gitlab.com/malware-filter/${project}/-/jobs/artifacts/main/download?job=pages`
   const zipPath = join(tmpPath, filename)
-  const pipelineUrl = `https://gitlab.com/curben/${project}/badges/main/pipeline.svg`
+  const pipelineUrl = `https://gitlab.com/malware-filter/${project}/badges/main/pipeline.svg`
   let isMirror = false
 
   console.log(`Downloading ${filename} from "${link}"`)
@@ -115,7 +115,7 @@ const f = async () => {
 
 const oisd = async () => {
   await mkdir(publicPath, { recursive: true })
-  if (Object.prototype.hasOwnProperty.call(envVar, 'CI_PROJECT_PATH') && envVar.CI_PROJECT_PATH === 'curben/malware-filter') {
+  if (Object.prototype.hasOwnProperty.call(envVar, 'CI_PROJECT_PATH') && envVar.CI_PROJECT_PATH === 'malware-filter/malware-filter') {
     await Promise.all(Object.entries(oisdFilters).map(([link, filename]) => { return oisdDl(link, filename) }))
   }
 }
diff --git a/src/gitlab_status.sh b/src/gitlab_status.sh
index 56095c0..0318253 100644
--- a/src/gitlab_status.sh
+++ b/src/gitlab_status.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/curben/urlhaus-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
-PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/curben/urlhaus-filter/badges/main/pipeline.svg" | grep -F "failed")
+ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/malware-filter/urlhaus-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
+PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/malware-filter/urlhaus-filter/badges/main/pipeline.svg" | grep -F "failed")
 GITLAB_STATUS="up"
 
 if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then
diff --git a/src/script.sh b/src/script.sh
index 33af7e0..cce476d 100644
--- a/src/script.sh
+++ b/src/script.sh
@@ -14,11 +14,11 @@ alias unzip="unzip -jo"
 mkdir "tmp/"
 cd "tmp/"
 
-curl "https://gitlab.com/curben/urlhaus-filter/-/jobs/artifacts/main/download?job=pages" -o "urlhaus-filter.zip"
-curl "https://gitlab.com/curben/phishing-filter/-/jobs/artifacts/main/download?job=pages" -o "phishing-filter.zip"
-curl "https://gitlab.com/curben/pup-filter/-/jobs/artifacts/main/download?job=pages" -o "pup-filter.zip"
+curl "https://gitlab.com/malware-filter/urlhaus-filter/-/jobs/artifacts/main/download?job=pages" -o "urlhaus-filter.zip"
+curl "https://gitlab.com/malware-filter/phishing-filter/-/jobs/artifacts/main/download?job=pages" -o "phishing-filter.zip"
+curl "https://gitlab.com/malware-filter/pup-filter/-/jobs/artifacts/main/download?job=pages" -o "pup-filter.zip"
 curl "https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages" -o "tracking-filter.zip"
-curl "https://gitlab.com/curben/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages" -o "vn-badsite-filter.zip"
+curl "https://gitlab.com/malware-filter/vn-badsite-filter/-/jobs/artifacts/main/download?job=pages" -o "vn-badsite-filter.zip"
 
 for zipfile in $(find . -name "*.zip" -type f)
 do