From 35d609cde502636a32ff226bec8f986289e6c94a Mon Sep 17 00:00:00 2001 From: Petr Cervenka Date: Wed, 17 Jun 2020 11:04:03 +0800 Subject: [PATCH 01/17] Update npm-audit-step.sh --- npm-audit-step.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index d1e412c..05f691c 100644 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -16,17 +16,17 @@ MODERATE_VUL="$(./jq-linux64 .metadata.vulnerabilities.moderate < ./audit_result HIGH_VUL="$(./jq-linux64 .metadata.vulnerabilities.high < ./audit_result.json)" CRITICAL_VUL="$(./jq-linux64 .metadata.vulnerabilities.critical < ./audit_result.json)" -if [ "$INFO_VUL" -ne "0" ] -then - print_vulnerabilities - exit 1 -fi - -if [ "$LOW_VUL" -ne "0" ] -then - print_vulnerabilities - exit 1 -fi +# if [ "$INFO_VUL" -ne "0" ] +# then +# print_vulnerabilities +# exit 1 +# fi + +# if [ "$LOW_VUL" -ne "0" ] +# then +# print_vulnerabilities +# exit 1 +# fi if [ "$MODERATE_VUL" -ne "0" ] then From 21e7d7b3e3281f4db9d9c442c3f2d6686b68bcee Mon Sep 17 00:00:00 2001 From: Petr Cervenka Date: Thu, 18 Jun 2020 09:23:45 +0800 Subject: [PATCH 02/17] Update npm-audit-step.sh --- npm-audit-step.sh | 48 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 05f691c..3828fbb 100644 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -1,20 +1,48 @@ #!/bin/bash + +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + COMMAND="jq-linux64" +elif [[ "$OSTYPE" == "darwin"* ]]; then + COMMAND="jq-osx-amd64" +fi + +GITHUB="https://github.com/stedolan/jq/releases/download/jq-1.6/" + print_vulnerabilities () { - ./jq-linux64 .metadata.vulnerabilities < ./audit_result.json - cat ./audit_result.json + + echo "Report" + npm audit } -wget https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -chmod +x jq-linux64 -npm i --package-lock-only +# print_vulnerabilities () { +# echo "Summary " +# ./${COMMAND} .metadata.vulnerabilities < ./audit_result.json +# echo "Report" +# ./${COMMAND} < ./audit_result.json +# } + +if [ ! -f "$COMMAND" ]; then + wget -q $GITHUB$COMMAND +fi + + +chmod +x $COMMAND +#npm i --package-lock-only npm audit --json > audit_result.json -INFO_VUL="$(./jq-linux64 .metadata.vulnerabilities.info < ./audit_result.json)" -LOW_VUL="$(./jq-linux64 .metadata.vulnerabilities.low < ./audit_result.json)" -MODERATE_VUL="$(./jq-linux64 .metadata.vulnerabilities.moderate < ./audit_result.json)" -HIGH_VUL="$(./jq-linux64 .metadata.vulnerabilities.high < ./audit_result.json)" -CRITICAL_VUL="$(./jq-linux64 .metadata.vulnerabilities.critical < ./audit_result.json)" +#INFO_VUL="$(./${COMMAND} .metadata.vulnerabilities.info < ./audit_result.json)" +#LOW_VUL="$(./${COMMAND} .metadata.vulnerabilities.low < ./audit_result.json)" +MODERATE_VUL="$(./${COMMAND} .metadata.vulnerabilities.moderate < ./audit_result.json)" +HIGH_VUL="$(./${COMMAND} .metadata.vulnerabilities.high < ./audit_result.json)" +CRITICAL_VUL="$(./${COMMAND} .metadata.vulnerabilities.critical < ./audit_result.json)" + +SUMMARY_VUL="$(./${COMMAND} .metadata.vulnerabilities < ./audit_result.json)" + + +echo "Summary " +./${COMMAND} .metadata.vulnerabilities < ./audit_result.json + # if [ "$INFO_VUL" -ne "0" ] # then From 10526028766c94d3a22999ce9aa8a0816968a37c Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 22 Jan 2021 11:24:47 +0800 Subject: [PATCH 03/17] Push report to chief --- npm-audit-step.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 3828fbb..c8d2ad1 100644 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -1,5 +1,7 @@ #!/bin/bash +CI_COMMIT_BRANCH=$1 +PROJECT_DOMAIN=$2 if [[ "$OSTYPE" == "linux-gnu"* ]]; then COMMAND="jq-linux64" @@ -56,6 +58,11 @@ echo "Summary " # exit 1 # fi +if [[ $CI_COMMIT_BRANCH == 'master' ]] +then + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' +fi + if [ "$MODERATE_VUL" -ne "0" ] then print_vulnerabilities From 4754df1e0e9959e21207f8620e3734c2149ab654 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 22 Jan 2021 11:53:44 +0800 Subject: [PATCH 04/17] Submit from every branch for testing --- npm-audit-step.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index c8d2ad1..da86051 100644 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -58,10 +58,11 @@ echo "Summary " # exit 1 # fi -if [[ $CI_COMMIT_BRANCH == 'master' ]] -then - curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' -fi +curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' +# if [[ $CI_COMMIT_BRANCH == 'master' ]] +# then +# curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' +# fi if [ "$MODERATE_VUL" -ne "0" ] then From 09185d614764226371dae7e71cb33dc953d6df0d Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 22 Jan 2021 12:20:46 +0800 Subject: [PATCH 05/17] Escape quotes for variable --- npm-audit-step.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 npm-audit-step.sh diff --git a/npm-audit-step.sh b/npm-audit-step.sh old mode 100644 new mode 100755 index da86051..29934a3 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -58,7 +58,7 @@ echo "Summary " # exit 1 # fi -curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' +curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\"}" # if [[ $CI_COMMIT_BRANCH == 'master' ]] # then # curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' From a973b2f983f55c09eef09a9ad19213d158621249 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 22 Jan 2021 13:50:51 +0800 Subject: [PATCH 06/17] Submit report only from master --- npm-audit-step.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 29934a3..4a9ca54 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -58,11 +58,10 @@ echo "Summary " # exit 1 # fi -curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\"}" -# if [[ $CI_COMMIT_BRANCH == 'master' ]] -# then -# curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F 'metadata={"type":"npm","version":"6","project":"$PROJECT_DOMAIN"}' -# fi +if [[ $CI_COMMIT_BRANCH == 'master' ]] +then + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\"}" +fi if [ "$MODERATE_VUL" -ne "0" ] then From 8fb3c394f9161d4ff19ea51b2e4246e6da264321 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Tue, 16 Feb 2021 09:03:18 +0800 Subject: [PATCH 07/17] Print npm version --- npm-audit-step.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 4a9ca54..00b5d13 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -30,6 +30,8 @@ fi chmod +x $COMMAND + +npm -v #npm i --package-lock-only npm audit --json > audit_result.json From 6b023312ccb276563bbcdfca5dd6133e107f6bff Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Wed, 24 Feb 2021 10:41:39 +0800 Subject: [PATCH 08/17] Add ref and sha to report --- npm-audit-step.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 00b5d13..02c668d 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -31,7 +31,6 @@ fi chmod +x $COMMAND -npm -v #npm i --package-lock-only npm audit --json > audit_result.json @@ -62,7 +61,7 @@ echo "Summary " if [[ $CI_COMMIT_BRANCH == 'master' ]] then - curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\"}" + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" fi if [ "$MODERATE_VUL" -ne "0" ] From ce295c853823a4f915d8c542a62e0f7a05769a1f Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Wed, 24 Feb 2021 13:59:21 +0800 Subject: [PATCH 09/17] Also submit report from tags --- npm-audit-step.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 02c668d..02a81d2 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -1,7 +1,8 @@ #!/bin/bash -CI_COMMIT_BRANCH=$1 +CI_COMMIT_REF_NAME=$1 PROJECT_DOMAIN=$2 +CI_COMMIT_SHORT_SHA=$3 if [[ "$OSTYPE" == "linux-gnu"* ]]; then COMMAND="jq-linux64" @@ -59,7 +60,7 @@ echo "Summary " # exit 1 # fi -if [[ $CI_COMMIT_BRANCH == 'master' ]] +if [[ $CI_COMMIT_REF_NAME == 'master' || $CI_COMMIT_REF_NAME =~ ^[0-9]\.[0-9]\.[0-9]$ ]] then curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" fi From afa163197a71f1a3113a5a16a0a2fa4beb8b26b8 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 12 Mar 2021 12:36:01 +0800 Subject: [PATCH 10/17] Print npm version --- npm-audit-step.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 02a81d2..bfb0223 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -33,6 +33,7 @@ fi chmod +x $COMMAND #npm i --package-lock-only +echo npm -v npm audit --json > audit_result.json #INFO_VUL="$(./${COMMAND} .metadata.vulnerabilities.info < ./audit_result.json)" From d423396517821dabf85f894d819f0aa75d385785 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 12 Mar 2021 12:41:27 +0800 Subject: [PATCH 11/17] Print npm version --- npm-audit-step.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index bfb0223..a5fb35b 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -33,7 +33,7 @@ fi chmod +x $COMMAND #npm i --package-lock-only -echo npm -v +npm -v npm audit --json > audit_result.json #INFO_VUL="$(./${COMMAND} .metadata.vulnerabilities.info < ./audit_result.json)" From 3cf03973e06add2c7e274bbc152936ecdd274237 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 12 Mar 2021 12:50:14 +0800 Subject: [PATCH 12/17] Submit real version to chief --- npm-audit-step.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index a5fb35b..2d7491b 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -33,7 +33,7 @@ fi chmod +x $COMMAND #npm i --package-lock-only -npm -v +VERSION="$(npm -v | cut -c1)" npm audit --json > audit_result.json #INFO_VUL="$(./${COMMAND} .metadata.vulnerabilities.info < ./audit_result.json)" @@ -63,7 +63,7 @@ echo "Summary " if [[ $CI_COMMIT_REF_NAME == 'master' || $CI_COMMIT_REF_NAME =~ ^[0-9]\.[0-9]\.[0-9]$ ]] then - curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"6\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" fi if [ "$MODERATE_VUL" -ne "0" ] From 6465e337b615bce8b57011a09470dc1846a52ed1 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Tue, 11 May 2021 14:37:22 +0800 Subject: [PATCH 13/17] Add develop to npm reports to chief --- npm-audit-step.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index 2d7491b..c68f117 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -61,7 +61,7 @@ echo "Summary " # exit 1 # fi -if [[ $CI_COMMIT_REF_NAME == 'master' || $CI_COMMIT_REF_NAME =~ ^[0-9]\.[0-9]\.[0-9]$ ]] +if [[ $CI_COMMIT_REF_NAME =~ ^[0-9]*\.[0-9]*\.[0-9]*$|^master$|^develop$ ]] then curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" fi From 8c39b9f60fd4640d0e184643e313832ce406fe77 Mon Sep 17 00:00:00 2001 From: Petr Cervenka Date: Fri, 28 May 2021 12:23:22 +0800 Subject: [PATCH 14/17] Add edv and prod --- npm-audit-dev.sh | 85 ++++++++++++++++++++++++++ npm-audit-step.sh => npm-audit-prod.sh | 14 ++--- 2 files changed, 92 insertions(+), 7 deletions(-) create mode 100755 npm-audit-dev.sh rename npm-audit-step.sh => npm-audit-prod.sh (92%) diff --git a/npm-audit-dev.sh b/npm-audit-dev.sh new file mode 100755 index 0000000..a28ef6d --- /dev/null +++ b/npm-audit-dev.sh @@ -0,0 +1,85 @@ +#!/bin/bash + +CI_COMMIT_REF_NAME=$1 +PROJECT_DOMAIN=$2 +CI_COMMIT_SHORT_SHA=$3 + +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + COMMAND="jq-linux64" +elif [[ "$OSTYPE" == "darwin"* ]]; then + COMMAND="jq-osx-amd64" +fi + +GITHUB="https://github.com/stedolan/jq/releases/download/jq-1.6/" + +print_vulnerabilities () { + + echo "Report" + npm audit +} + +# print_vulnerabilities () { +# echo "Summary " +# ./${COMMAND} .metadata.vulnerabilities < ./audit_result.json +# echo "Report" +# ./${COMMAND} < ./audit_result.json +# } + +if [ ! -f "$COMMAND" ]; then + wget -q $GITHUB$COMMAND +fi + + +chmod +x $COMMAND + +#npm i --package-lock-only +VERSION="$(npm -v | cut -c1)" +npm audit --json > audit_result.json + +#INFO_VUL="$(./${COMMAND} .metadata.vulnerabilities.info < ./audit_result.json)" +#LOW_VUL="$(./${COMMAND} .metadata.vulnerabilities.low < ./audit_result.json)" +MODERATE_VUL="$(./${COMMAND} .metadata.vulnerabilities.moderate < ./audit_result.json)" +HIGH_VUL="$(./${COMMAND} .metadata.vulnerabilities.high < ./audit_result.json)" +CRITICAL_VUL="$(./${COMMAND} .metadata.vulnerabilities.critical < ./audit_result.json)" + +SUMMARY_VUL="$(./${COMMAND} .metadata.vulnerabilities < ./audit_result.json)" + + +echo "Summary " +./${COMMAND} .metadata.vulnerabilities < ./audit_result.json + + +# if [ "$INFO_VUL" -ne "0" ] +# then +# print_vulnerabilities +# exit 1 +# fi + +# if [ "$LOW_VUL" -ne "0" ] +# then +# print_vulnerabilities +# exit 1 +# fi + +if [[ $CI_COMMIT_REF_NAME =~ ^[0-9]*\.[0-9]*\.[0-9]*$|^master$|^develop$ ]] +then + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm-dev\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" +fi + +if [ "$MODERATE_VUL" -ne "0" ] +then + print_vulnerabilities + exit 1 +fi + +if [ "$HIGH_VUL" -ne "0" ] +then + print_vulnerabilities + exit 1 +fi + +if [ "$CRITICAL_VUL" -ne "0" ] +then + print_vulnerabilities + exit 1 +fi diff --git a/npm-audit-step.sh b/npm-audit-prod.sh similarity index 92% rename from npm-audit-step.sh rename to npm-audit-prod.sh index c68f117..3a7223b 100755 --- a/npm-audit-step.sh +++ b/npm-audit-prod.sh @@ -15,7 +15,7 @@ GITHUB="https://github.com/stedolan/jq/releases/download/jq-1.6/" print_vulnerabilities () { echo "Report" - npm audit + npm audit --production } # print_vulnerabilities () { @@ -34,7 +34,7 @@ chmod +x $COMMAND #npm i --package-lock-only VERSION="$(npm -v | cut -c1)" -npm audit --json > audit_result.json +npm audit --production --json > audit_result.json #INFO_VUL="$(./${COMMAND} .metadata.vulnerabilities.info < ./audit_result.json)" #LOW_VUL="$(./${COMMAND} .metadata.vulnerabilities.low < ./audit_result.json)" @@ -66,11 +66,11 @@ then curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" fi -if [ "$MODERATE_VUL" -ne "0" ] -then - print_vulnerabilities - exit 1 -fi +# if [ "$MODERATE_VUL" -ne "0" ] +# then +# print_vulnerabilities +# exit 1 +# fi if [ "$HIGH_VUL" -ne "0" ] then From 4d4c3fb23001eb13172205680d788d9c4afa6def Mon Sep 17 00:00:00 2001 From: Petr Cervenka Date: Fri, 9 Jul 2021 15:59:44 +0800 Subject: [PATCH 15/17] Update npm-audit-dev.sh --- npm-audit-dev.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/npm-audit-dev.sh b/npm-audit-dev.sh index a28ef6d..19a5157 100755 --- a/npm-audit-dev.sh +++ b/npm-audit-dev.sh @@ -66,11 +66,11 @@ then curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm-dev\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" fi -if [ "$MODERATE_VUL" -ne "0" ] -then - print_vulnerabilities - exit 1 -fi +# if [ "$MODERATE_VUL" -ne "0" ] +# then +# print_vulnerabilities +# exit 1 +# fi if [ "$HIGH_VUL" -ne "0" ] then From 1aba24dd15f9782343ae89638130ac3a35d8b60d Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Thu, 15 Jul 2021 19:28:29 +0800 Subject: [PATCH 16/17] Add job url --- npm-audit-step.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm-audit-step.sh b/npm-audit-step.sh index c68f117..65afb34 100755 --- a/npm-audit-step.sh +++ b/npm-audit-step.sh @@ -63,7 +63,7 @@ echo "Summary " if [[ $CI_COMMIT_REF_NAME =~ ^[0-9]*\.[0-9]*\.[0-9]*$|^master$|^develop$ ]] then - curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$C0I_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\", \"job_url\":\"$CI_JOB_URL\"}" fi if [ "$MODERATE_VUL" -ne "0" ] From 851e2d787b64b784006477c706a8956e7fcf0515 Mon Sep 17 00:00:00 2001 From: jacopo sarti Date: Fri, 16 Jul 2021 10:11:57 +0800 Subject: [PATCH 17/17] Add job url --- npm-audit-dev.sh | 2 +- npm-audit-prod.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/npm-audit-dev.sh b/npm-audit-dev.sh index 19a5157..e9a5d29 100755 --- a/npm-audit-dev.sh +++ b/npm-audit-dev.sh @@ -63,7 +63,7 @@ echo "Summary " if [[ $CI_COMMIT_REF_NAME =~ ^[0-9]*\.[0-9]*\.[0-9]*$|^master$|^develop$ ]] then - curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm-dev\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\"}" + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm-dev\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\", \"job_url\":\"$CI_JOB_URL\"}" fi # if [ "$MODERATE_VUL" -ne "0" ] diff --git a/npm-audit-prod.sh b/npm-audit-prod.sh index e41bf30..d1920d5 100755 --- a/npm-audit-prod.sh +++ b/npm-audit-prod.sh @@ -63,7 +63,7 @@ echo "Summary " if [[ $CI_COMMIT_REF_NAME =~ ^[0-9]*\.[0-9]*\.[0-9]*$|^master$|^develop$ ]] then - curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$C0I_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\", \"job_url\":\"$CI_JOB_URL\"}" + curl -L -X POST https://chief.nano.rocks/api/report -F "report=@audit_result.json" -F "metadata={\"type\":\"npm\",\"version\":\"$VERSION\",\"project\":\"$PROJECT_DOMAIN\",\"ref\":\"$CI_COMMIT_REF_NAME\", \"sha\":\"$CI_COMMIT_SHORT_SHA\", \"job_url\":\"$CI_JOB_URL\"}" fi # if [ "$MODERATE_VUL" -ne "0" ]