From 52e1ffbc0a1f360360f1d2e3d62bd55d021cb10c Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 13 Dec 2021 10:42:46 +0100 Subject: [PATCH 01/10] Add abuse scanner module --- dc | 5 +++++ docker-compose.abuse.yml | 26 ++++++++++++++++++++++++++ docker/abuse/Dockerfile | 16 ++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 docker-compose.abuse.yml create mode 100644 docker/abuse/Dockerfile diff --git a/dc b/dc index c041317a..fd37207f 100755 --- a/dc +++ b/dc @@ -13,6 +13,11 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.accounts.yml" fi + # abuse module - alias "c" + if [[ ${PORTAL_MODULES:i-1:1} == "c" ]]; then + COMPOSE_FILES+=" -f docker-compose.abuse.yml" + fi + # blocker module - alias "b" if [[ ${PORTAL_MODULES:i-1:1} == "b" ]]; then COMPOSE_FILES+=" -f docker-compose.blocker.yml" diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml new file mode 100644 index 00000000..57936253 --- /dev/null +++ b/docker-compose.abuse.yml @@ -0,0 +1,26 @@ +version: "3.7" + +x-logging: &default-logging + driver: json-file + options: + max-size: "10m" + max-file: "3" + +services: + blocker: + build: + context: ./docker/abuse + dockerfile: Dockerfile + container_name: abuse + restart: unless-stopped + logging: *default-logging + env_file: + - .env + environment: + - BLOCKER_API_URL=http://blocker + networks: + shared: + ipv4_address: 10.10.10.110 + depends_on: + - mongo + - blocker diff --git a/docker/abuse/Dockerfile b/docker/abuse/Dockerfile new file mode 100644 index 00000000..bccd2ed3 --- /dev/null +++ b/docker/abuse/Dockerfile @@ -0,0 +1,16 @@ +FROM golang:1.16.7 +LABEL maintainer="NebulousLabs " + +ENV GOOS linux +ENV GOARCH amd64 + +ARG branch=main + +WORKDIR /root + +RUN git clone --single-branch --branch ${branch} https://github.com/SkynetLabs/abuse-scanner.git && \ + cd abuse-scanner && \ + go mod download && \ + make release + +ENTRYPOINT ["abuse-scanner"] From 0a1b5e620b953b1d0319d6b3f2a89a2a59a48be3 Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 13 Dec 2021 11:57:10 +0100 Subject: [PATCH 02/10] Update service name --- docker-compose.abuse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 57936253..1406cd17 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -7,7 +7,7 @@ x-logging: &default-logging max-file: "3" services: - blocker: + abuse: build: context: ./docker/abuse dockerfile: Dockerfile From 4dded62b793a3c168c39d14fdd1cbdb43b0e4b16 Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 13 Dec 2021 13:28:47 +0100 Subject: [PATCH 03/10] Update blocker api url --- docker-compose.abuse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 1406cd17..6e1cdb02 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -17,7 +17,7 @@ services: env_file: - .env environment: - - BLOCKER_API_URL=http://blocker + - BLOCKER_API_URL=blocker networks: shared: ipv4_address: 10.10.10.110 From 918ceb78ec31d942e93e7f74b88ee7b70e793bee Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 13 Dec 2021 13:43:17 +0100 Subject: [PATCH 04/10] Add port --- docker-compose.abuse.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 6e1cdb02..14bc1f34 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -17,7 +17,7 @@ services: env_file: - .env environment: - - BLOCKER_API_URL=blocker + - BLOCKER_API_URL=blocker:4000 networks: shared: ipv4_address: 10.10.10.110 From e4f7cf4101e0fb163ecbff3f5598c5758f858ed7 Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 13 Dec 2021 15:45:22 +0100 Subject: [PATCH 05/10] Update maintainer --- docker/abuse/Dockerfile | 2 +- docker/blocker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/abuse/Dockerfile b/docker/abuse/Dockerfile index bccd2ed3..f27fb769 100644 --- a/docker/abuse/Dockerfile +++ b/docker/abuse/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.16.7 -LABEL maintainer="NebulousLabs " +LABEL maintainer="SkynetLabs " ENV GOOS linux ENV GOARCH amd64 diff --git a/docker/blocker/Dockerfile b/docker/blocker/Dockerfile index 3dbc2f61..70d572b9 100644 --- a/docker/blocker/Dockerfile +++ b/docker/blocker/Dockerfile @@ -1,5 +1,5 @@ FROM golang:1.16.7 -LABEL maintainer="NebulousLabs " +LABEL maintainer="SkynetLabs " ENV GOOS linux ENV GOARCH amd64 From 74023832736734185a1a62b271fbb997ce28f8b2 Mon Sep 17 00:00:00 2001 From: PJ Date: Tue, 14 Dec 2021 09:57:14 +0100 Subject: [PATCH 06/10] Add changelog, add env variables --- changelog/items/key-updates/abuse-scanner.md | 1 + dc | 2 +- docker-compose.abuse.yml | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 changelog/items/key-updates/abuse-scanner.md diff --git a/changelog/items/key-updates/abuse-scanner.md b/changelog/items/key-updates/abuse-scanner.md new file mode 100644 index 00000000..75fba8f8 --- /dev/null +++ b/changelog/items/key-updates/abuse-scanner.md @@ -0,0 +1 @@ +- Add abuse scanner service, activated by adding `c` to `PORTAL_MODULES` diff --git a/dc b/dc index fd37207f..231f5aaf 100755 --- a/dc +++ b/dc @@ -15,7 +15,7 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do # abuse module - alias "c" if [[ ${PORTAL_MODULES:i-1:1} == "c" ]]; then - COMPOSE_FILES+=" -f docker-compose.abuse.yml" + COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse.yml" fi # blocker module - alias "b" diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 14bc1f34..dea061c2 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -17,7 +17,14 @@ services: env_file: - .env environment: - - BLOCKER_API_URL=blocker:4000 + - ABUSE_LOG_LEVEL=${ABUSE_LOG_LEVEL} + - ABUSE_SPONSOR=${ABUSE_SPONSOR} + - BLOCKER_API_URL=${BLOCKER_API_URL} + - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} + - EMAIL_SERVER=${EMAIL_SERVER} + - EMAIL_USERNAME=${EMAIL_USERNAME} + - EMAIL_PASSWORD=${EMAIL_PASSWORD} + - MONGO_CONNECTIONSTRING=${MONGO_CONNECTIONSTRING} networks: shared: ipv4_address: 10.10.10.110 From 5c8951ef5da26a98e43889239b8c26a5c93a9d0c Mon Sep 17 00:00:00 2001 From: PJ Date: Wed, 15 Dec 2021 20:04:29 +0100 Subject: [PATCH 07/10] Update env --- docker-compose.abuse.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index dea061c2..44e00ab1 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -18,6 +18,7 @@ services: - .env environment: - ABUSE_LOG_LEVEL=${ABUSE_LOG_LEVEL} + - ABUSE_MAILBOX=${ABUSE_MAILBOX} - ABUSE_SPONSOR=${ABUSE_SPONSOR} - BLOCKER_API_URL=${BLOCKER_API_URL} - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} From 25f1915aa65950b9e236acefa2ee8a909c48afbf Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 20 Dec 2021 13:15:28 +0100 Subject: [PATCH 08/10] Implement MR remarks --- dc | 12 ++++++------ docker-compose.abuse.yml | 10 +++++++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dc b/dc index 231f5aaf..648621fd 100755 --- a/dc +++ b/dc @@ -13,11 +13,6 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.accounts.yml" fi - # abuse module - alias "c" - if [[ ${PORTAL_MODULES:i-1:1} == "c" ]]; then - COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse.yml" - fi - # blocker module - alias "b" if [[ ${PORTAL_MODULES:i-1:1} == "b" ]]; then COMPOSE_FILES+=" -f docker-compose.blocker.yml" @@ -28,10 +23,15 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do COMPOSE_FILES+=" -f docker-compose.jaeger.yml" fi - # mongodb module - alias "m". implied by "a" + # mongodb module - alias "m". implied by "a" or "u" if [[ ${PORTAL_MODULES:i-1:1} == "m" ]]; then COMPOSE_FILES+=" -f docker-compose.mongodb.yml" fi + + # abuse module - alias "u" + if [[ ${PORTAL_MODULES:i-1:1} == "u" ]]; then + COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml -f docker-compose.abuse.yml" + fi done # override file if exists diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 44e00ab1..87af6718 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -20,15 +20,19 @@ services: - ABUSE_LOG_LEVEL=${ABUSE_LOG_LEVEL} - ABUSE_MAILBOX=${ABUSE_MAILBOX} - ABUSE_SPONSOR=${ABUSE_SPONSOR} - - BLOCKER_API_URL=${BLOCKER_API_URL} + - BLOCKER_IP=${BLOCKER_IP} + - BLOCKER_PORT=${BLOCKER_PORT} - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} - EMAIL_SERVER=${EMAIL_SERVER} - EMAIL_USERNAME=${EMAIL_USERNAME} - EMAIL_PASSWORD=${EMAIL_PASSWORD} - - MONGO_CONNECTIONSTRING=${MONGO_CONNECTIONSTRING} + - SKYNET_DB_HOST=${SKYNET_DB_HOST} + - SKYNET_DB_PORT=${SKYNET_DB_PORT} + - SKYNET_DB_USER=${SKYNET_DB_USER} + - SKYNET_DB_PASS=${SKYNET_DB_PASS} networks: shared: - ipv4_address: 10.10.10.110 + ipv4_address: 10.10.10.120 depends_on: - mongo - blocker From c79310f08a3e29ce4aa0f8375cecd8b109bcc00d Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 20 Dec 2021 13:44:47 +0100 Subject: [PATCH 09/10] Update changelog --- changelog/items/key-updates/abuse-scanner.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/items/key-updates/abuse-scanner.md b/changelog/items/key-updates/abuse-scanner.md index 75fba8f8..54788f19 100644 --- a/changelog/items/key-updates/abuse-scanner.md +++ b/changelog/items/key-updates/abuse-scanner.md @@ -1 +1 @@ -- Add abuse scanner service, activated by adding `c` to `PORTAL_MODULES` +- Add abuse scanner service, activated by adding `u` to `PORTAL_MODULES` From a75c88bee2085cd9576633e2b16e41d494f8180e Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 20 Dec 2021 16:43:56 +0100 Subject: [PATCH 10/10] Update env vars --- docker-compose.abuse.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.abuse.yml b/docker-compose.abuse.yml index 87af6718..21adfb9b 100644 --- a/docker-compose.abuse.yml +++ b/docker-compose.abuse.yml @@ -18,9 +18,10 @@ services: - .env environment: - ABUSE_LOG_LEVEL=${ABUSE_LOG_LEVEL} + - ABUSE_MAILADDRESS=${ABUSE_MAILADDRESS} - ABUSE_MAILBOX=${ABUSE_MAILBOX} - ABUSE_SPONSOR=${ABUSE_SPONSOR} - - BLOCKER_IP=${BLOCKER_IP} + - BLOCKER_HOST=${BLOCKER_HOST} - BLOCKER_PORT=${BLOCKER_PORT} - BLOCKER_AUTH_HEADER=${BLOCKER_AUTH_HEADER} - EMAIL_SERVER=${EMAIL_SERVER}