From a86bcb0a8a62407f431138a29606aa2223f4b827 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:41:16 -0500 Subject: [PATCH 01/25] Add .circleci/config.yml --- .circleci/config.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000000..bb68f37ad27 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,38 @@ +version: 2.1 +orbs: + snyk: snyk/snyk@0.0.8 + +jobs: # a collection of steps + build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run + working_directory: ~/goof + docker: + - image: circleci/node@3.0.0 + steps: + - run: + name: echo "install and build npm project" + command: 'npm install' + - run: + name: echo "build project" + command: 'npm run build' + #- run: + # name: echo "build Docker image" + # command: 'docker build -t my-new-container-goof-image .' + + - snyk/scan: + fail-on-issues: false + monitor-on-build: true + token-variable: SNYKTOKEN + organization: panda-not-omar + project: circleCi-dotnet-goof + severity-threshold: high + +#workflows: + #node-tests: + #jobs: + # - node/test + #- snyk/scan: + # fail-on-issues: false + # monitor-on-build: true + # token-variable: SNYKTOKEN + # organization: panda-not-omar + # project: circleCi-dotnet-goof \ No newline at end of file From 78a80e3be2a035d99021011ed9e5653af73ef313 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:42:59 -0500 Subject: [PATCH 02/25] Updated config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb68f37ad27..797edeaf68f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,7 @@ jobs: # a collection of steps build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run working_directory: ~/goof docker: - - image: circleci/node@3.0.0 + - image: circleci/node:4.8.2 steps: - run: name: echo "install and build npm project" @@ -25,7 +25,7 @@ jobs: # a collection of steps organization: panda-not-omar project: circleCi-dotnet-goof severity-threshold: high - + workflows: null #workflows: #node-tests: #jobs: From 947b2e626577f4efffb634ebcfbc01d9d20e5845 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:45:53 -0500 Subject: [PATCH 03/25] Updated config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 797edeaf68f..2309864fdbe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: # a collection of steps steps: - run: name: echo "install and build npm project" - command: 'npm install' + command: 'sudo npm install' - run: name: echo "build project" command: 'npm run build' @@ -23,7 +23,7 @@ jobs: # a collection of steps monitor-on-build: true token-variable: SNYKTOKEN organization: panda-not-omar - project: circleCi-dotnet-goof + project: circleCi-goof severity-threshold: high workflows: null #workflows: From 1e7b1740d27b53de18b907257c76e0078a6e3a01 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:49:02 -0500 Subject: [PATCH 04/25] Updated config.yml --- .circleci/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2309864fdbe..5dddf8198fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,10 +7,11 @@ jobs: # a collection of steps working_directory: ~/goof docker: - image: circleci/node:4.8.2 - steps: + steps: + - checkout - run: name: echo "install and build npm project" - command: 'sudo npm install' + command: 'sudo npm install -g npm@latest' - run: name: echo "build project" command: 'npm run build' From 01383b46f6a7bd35a35345d30bd551bf246d4aab Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 11:52:00 -0500 Subject: [PATCH 05/25] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5dddf8198fa..40dba8a64ac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: # a collection of steps - checkout - run: name: echo "install and build npm project" - command: 'sudo npm install -g npm@latest' + command: 'sudo npm install -q' - run: name: echo "build project" command: 'npm run build' From 2c54c9fe2764743d39b9f8dffc63ca092dfcff0b Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:13:10 -0500 Subject: [PATCH 06/25] Updated config.yml --- .circleci/config.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 40dba8a64ac..0825bc46073 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,6 +2,11 @@ version: 2.1 orbs: snyk: snyk/snyk@0.0.8 +workflows: + test-env-vars: + jobs: + - build: + context: Snyk # has an env var called Snyk-Token jobs: # a collection of steps build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run working_directory: ~/goof @@ -18,7 +23,7 @@ jobs: # a collection of steps #- run: # name: echo "build Docker image" # command: 'docker build -t my-new-container-goof-image .' - + - snyk/scan: fail-on-issues: false monitor-on-build: true @@ -26,7 +31,7 @@ jobs: # a collection of steps organization: panda-not-omar project: circleCi-goof severity-threshold: high - workflows: null + #workflows: #node-tests: #jobs: From efef4c3ebb7573b0c42afe7563643727af65d8fb Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:32:36 -0500 Subject: [PATCH 07/25] Updated Config.yml with container scan --- .circleci/config.yml | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0825bc46073..d97af85ae35 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,10 +2,10 @@ version: 2.1 orbs: snyk: snyk/snyk@0.0.8 -workflows: - test-env-vars: +workflows: #creating a workflow to define the context - collection of different jobs + test-env-vars: #setting up a job to define the context which this project will use jobs: - - build: + - build: #building the relevant context context: Snyk # has an env var called Snyk-Token jobs: # a collection of steps build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run @@ -23,7 +23,6 @@ jobs: # a collection of steps #- run: # name: echo "build Docker image" # command: 'docker build -t my-new-container-goof-image .' - - snyk/scan: fail-on-issues: false monitor-on-build: true @@ -31,7 +30,30 @@ jobs: # a collection of steps organization: panda-not-omar project: circleCi-goof severity-threshold: high - + + jobs: # a collection of steps + build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run + working_directory: ~/goof + docker: + - image: circleci/buildpack-deps:stretch + environment: + IMAGE_NAME: akanchhaS/goof + steps: + - checkout + - setup_remote_docker + - run: + name: echo "Build Docker image" + command: 'docker build -t my-new-container-circleCI-goof-image .' + - snyk/scan: + fail-on-issues: false + monitor-on-build: true + token-variable: SNYKTOKEN + organization: panda-not-omar + project: circleCi-goof-container + severity-threshold: low + target-file: Dockerfile + docker-image-name: my-new-container-circleCI-goof-image + #workflows: #node-tests: #jobs: From 43d561e2caa60165b49c1cfef00e59eac5bca9ef Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:36:16 -0500 Subject: [PATCH 08/25] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d97af85ae35..150f8403166 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ jobs: # a collection of steps jobs: # a collection of steps build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run - working_directory: ~/goof + #working_directory: ~/goof docker: - image: circleci/buildpack-deps:stretch environment: From 0fd541e629f42567822dd21f5cc16dc3a5663c7c Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:43:56 -0500 Subject: [PATCH 09/25] Updated config.yml --- .circleci/config.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 150f8403166..0b73b687d78 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,10 +5,14 @@ orbs: workflows: #creating a workflow to define the context - collection of different jobs test-env-vars: #setting up a job to define the context which this project will use jobs: - - build: #building the relevant context + - build-test-monitor-app: #building the relevant context context: Snyk # has an env var called Snyk-Token + - build-test-monitor-docker: + context: Snyk + + jobs: # a collection of steps - build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run + build-test-monitor-app: # runs not using Workflows must have a `build` job as entry point #directory where steps will run working_directory: ~/goof docker: - image: circleci/node:4.8.2 @@ -31,8 +35,8 @@ jobs: # a collection of steps project: circleCi-goof severity-threshold: high - jobs: # a collection of steps - build: # runs not using Workflows must have a `build` job as entry point #directory where steps will run + + build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run #working_directory: ~/goof docker: - image: circleci/buildpack-deps:stretch From 66fcbff47f745ef79cc6527ffb5d7a14b9e4089e Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Thu, 25 Feb 2021 12:51:59 -0500 Subject: [PATCH 10/25] Updated config.yml --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b73b687d78..378a7a17495 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ jobs: # a collection of steps - setup_remote_docker - run: name: echo "Build Docker image" - command: 'docker build -t my-new-container-circleCI-goof-image .' + command: 'docker build -t my-new-container-circleci-goof-image .' - snyk/scan: fail-on-issues: false monitor-on-build: true @@ -56,7 +56,7 @@ jobs: # a collection of steps project: circleCi-goof-container severity-threshold: low target-file: Dockerfile - docker-image-name: my-new-container-circleCI-goof-image + docker-image-name: my-new-container-circleci-goof-image #workflows: #node-tests: From 7f66a29c84060e5a6e3d92b3a2742960716b1a49 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:13:34 +0530 Subject: [PATCH 11/25] Add .circleci/config.yml --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 378a7a17495..46317f5233c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - snyk: snyk/snyk@0.0.8 + snyk: snyk/snyk@1.1.1 workflows: #creating a workflow to define the context - collection of different jobs test-env-vars: #setting up a job to define the context which this project will use @@ -31,7 +31,7 @@ jobs: # a collection of steps fail-on-issues: false monitor-on-build: true token-variable: SNYKTOKEN - organization: panda-not-omar + organization: ninja-snyker project: circleCi-goof severity-threshold: high @@ -52,7 +52,7 @@ jobs: # a collection of steps fail-on-issues: false monitor-on-build: true token-variable: SNYKTOKEN - organization: panda-not-omar + organization: ninja-snyker project: circleCi-goof-container severity-threshold: low target-file: Dockerfile From f1ee77cc14c6fb74c2ce0dafe8ab50ac5f4d3721 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:15:37 +0530 Subject: [PATCH 12/25] Add .circleci/config.yml From 604222629c5153914c70b8b6010a427643f4b4ba Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:18:13 +0530 Subject: [PATCH 13/25] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 46317f5233c..2a81c7e75b3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: # a collection of steps - checkout - run: name: echo "install and build npm project" - command: 'sudo npm install -q' + command: 'sudo npm install -g' - run: name: echo "build project" command: 'npm run build' From 121a0fc65e73992f44567562ee28256aa013b47a Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:21:44 +0530 Subject: [PATCH 14/25] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a81c7e75b3..2e3c9fcf105 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: # a collection of steps - checkout - run: name: echo "install and build npm project" - command: 'sudo npm install -g' + command: 'npm install -g' - run: name: echo "build project" command: 'npm run build' From 2da23a71d45c830119f924dec99cb44f02f4de27 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:30:34 +0530 Subject: [PATCH 15/25] Updated config.yml --- .circleci/config.yml | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2e3c9fcf105..56ad7590e14 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,19 +15,11 @@ jobs: # a collection of steps build-test-monitor-app: # runs not using Workflows must have a `build` job as entry point #directory where steps will run working_directory: ~/goof docker: - - image: circleci/node:4.8.2 + - image: 'cimg/node:lts' steps: - - checkout - - run: - name: echo "install and build npm project" - command: 'npm install -g' - - run: - name: echo "build project" - command: 'npm run build' - #- run: - # name: echo "build Docker image" - # command: 'docker build -t my-new-container-goof-image .' - - snyk/scan: + - checkout + - run: npm ci + - snyk/scan: fail-on-issues: false monitor-on-build: true token-variable: SNYKTOKEN @@ -39,7 +31,7 @@ jobs: # a collection of steps build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run #working_directory: ~/goof docker: - - image: circleci/buildpack-deps:stretch + - image: cimg/buildpack-deps:stretch environment: IMAGE_NAME: akanchhaS/goof steps: @@ -57,6 +49,22 @@ jobs: # a collection of steps severity-threshold: low target-file: Dockerfile docker-image-name: my-new-container-circleci-goof-image +docker: + - image: 'snyk/snyk-cli:npm' +parameters: + args: + default: '' + description: > + See the Snyk CLI help page for information on additional arguments: + https://support.snyk.io/hc/en-us/articles/360003812578-CLI-reference + type: string +resource_class: medium +steps: + - checkout + - scan: + additional-arguments: ' ' + command: iac test + monitor-on-build: false #workflows: #node-tests: From 103d8aff5638097d18db0f473afb2d2d352c97b4 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:32:50 +0530 Subject: [PATCH 16/25] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56ad7590e14..a1358ef299b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: # a collection of steps build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run #working_directory: ~/goof docker: - - image: cimg/buildpack-deps:stretch + - image: circleci/buildpack-deps:stretch environment: IMAGE_NAME: akanchhaS/goof steps: From c2d60aecf59dd140f76b188fd42886163e67c82a Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 03:56:18 +0530 Subject: [PATCH 17/25] Made it alpine image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 811932ff6b8..04d10105b9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # FROM node:6-stretch -FROM node:14.1.0 +FROM node:current-alpine3.14 RUN mkdir /usr/src/goof RUN mkdir /tmp/extracted_files From 40915b85f3a459aa8134db79e54783170ecc79ec Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 04:08:25 +0530 Subject: [PATCH 18/25] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 04d10105b9e..496480177a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ # FROM node:6-stretch FROM node:current-alpine3.14 +RUN mkdir /usr/src RUN mkdir /usr/src/goof RUN mkdir /tmp/extracted_files COPY . /usr/src/goof From 55383d738d9e32f33e9884dea4e2e63b16d613c0 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 04:10:51 +0530 Subject: [PATCH 19/25] Updated config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1358ef299b..9130edd2e40 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,7 @@ jobs: # a collection of steps severity-threshold: low target-file: Dockerfile docker-image-name: my-new-container-circleci-goof-image + install-alpine-dependencies: true docker: - image: 'snyk/snyk-cli:npm' parameters: From 4a4df847a9a4a994fb8a8046d7ec3bfebbfd5c63 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 19:51:53 +0530 Subject: [PATCH 20/25] Updated config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9130edd2e40..ecc936fb58d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: # a collection of steps build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run #working_directory: ~/goof docker: - - image: circleci/buildpack-deps:stretch + - image: node:current-alpine3.14 environment: IMAGE_NAME: akanchhaS/goof steps: From e9c942179ed997a303fc86ba37ff947ccda47c66 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Tue, 14 Sep 2021 19:54:34 +0530 Subject: [PATCH 21/25] Updated config.yml --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ecc936fb58d..198af38ae92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: # a collection of steps build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run #working_directory: ~/goof docker: - - image: node:current-alpine3.14 + - image: docker:19.03.13 environment: IMAGE_NAME: akanchhaS/goof steps: @@ -41,6 +41,7 @@ jobs: # a collection of steps name: echo "Build Docker image" command: 'docker build -t my-new-container-circleci-goof-image .' - snyk/scan: + os: alpine fail-on-issues: false monitor-on-build: true token-variable: SNYKTOKEN From 235a45193b0fce074fcb156eee23fdb629d0c5cb Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:01:57 +0530 Subject: [PATCH 22/25] Updated config.yml --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 198af38ae92..a1358ef299b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: # a collection of steps build-test-monitor-docker: # runs not using Workflows must have a `build` job as entry point #directory where steps will run #working_directory: ~/goof docker: - - image: docker:19.03.13 + - image: circleci/buildpack-deps:stretch environment: IMAGE_NAME: akanchhaS/goof steps: @@ -41,7 +41,6 @@ jobs: # a collection of steps name: echo "Build Docker image" command: 'docker build -t my-new-container-circleci-goof-image .' - snyk/scan: - os: alpine fail-on-issues: false monitor-on-build: true token-variable: SNYKTOKEN @@ -50,7 +49,6 @@ jobs: # a collection of steps severity-threshold: low target-file: Dockerfile docker-image-name: my-new-container-circleci-goof-image - install-alpine-dependencies: true docker: - image: 'snyk/snyk-cli:npm' parameters: From bd75be2bfbfa513887993724888137abe2d1c9ed Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:06:37 +0530 Subject: [PATCH 23/25] Add .circleci/config.yml --- .circleci/config.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1358ef299b..ffcf77b10e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,6 +49,8 @@ jobs: # a collection of steps severity-threshold: low target-file: Dockerfile docker-image-name: my-new-container-circleci-goof-image + +build-test-monitor-iac: docker: - image: 'snyk/snyk-cli:npm' parameters: From da00ff724e70db7e58ee761c3513687b5dfd3f75 Mon Sep 17 00:00:00 2001 From: akanchhaS <32653970+akanchhaS@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:07:39 +0530 Subject: [PATCH 24/25] Add .circleci/config.yml --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ffcf77b10e7..c63c469088c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,7 +49,6 @@ jobs: # a collection of steps severity-threshold: low target-file: Dockerfile docker-image-name: my-new-container-circleci-goof-image - build-test-monitor-iac: docker: - image: 'snyk/snyk-cli:npm' From 28bfdcc6c1e98b01362c69a272cfbbaadb5d385b Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 3 Feb 2022 21:21:24 +0000 Subject: [PATCH 25/25] fix: upgrade express from 4.12.4 to 4.17.2 Snyk has created this PR to upgrade express from 4.12.4 to 4.17.2. See this package in npm: https://www.npmjs.com/package/express See this project in Snyk: https://app.snyk.io/org/akanchhas/project/82e5f842-9bb9-4c0b-92c5-b4261de1e963?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 509 +++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 327 insertions(+), 184 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9a27820a7a2..744d858307b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -370,6 +370,11 @@ "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=", "dev": true }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, "array-map": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", @@ -1402,9 +1407,19 @@ "dev": true }, "content-disposition": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz", - "integrity": "sha1-QoT+auBjCHRjnkToCkGMKTQTXp4=" + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "requires": { + "safe-buffer": "5.2.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } + } }, "content-type": { "version": "1.0.4", @@ -1418,9 +1433,9 @@ "dev": true }, "cookie": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz", - "integrity": "sha1-cv7D0k5Io0Mgc9kMEmQgBQYQBLE=" + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==" }, "cookie-signature": { "version": "1.0.6", @@ -1450,11 +1465,6 @@ "request": "^2.88.0" } }, - "crc": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz", - "integrity": "sha1-XZyPt3okXNXsopHl0tAFM0urAII=" - }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", @@ -1676,9 +1686,9 @@ } }, "destroy": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz", - "integrity": "sha1-tDO0ck5x/YVR2YhRdIUcX8N34sk=" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, "detective": { "version": "4.7.1", @@ -1899,6 +1909,11 @@ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -2001,12 +2016,9 @@ "dev": true }, "etag": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.6.0.tgz", - "integrity": "sha1-i8ssavElTEgd/IuZfJBu9ORCwgc=", - "requires": { - "crc": "3.2.1" - } + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" }, "events": { "version": "1.1.1", @@ -2060,106 +2072,182 @@ } }, "express": { - "version": "4.12.4", - "resolved": "https://registry.npmjs.org/express/-/express-4.12.4.tgz", - "integrity": "sha1-j+wlECVbxrLlgQfEgjnA+jB8GqI=", - "requires": { - "accepts": "~1.2.7", - "content-disposition": "0.5.0", - "content-type": "~1.0.1", - "cookie": "0.1.2", + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.2.tgz", + "integrity": "sha512-oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg==", + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.1", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.4.1", "cookie-signature": "1.0.6", - "debug": "~2.2.0", - "depd": "~1.0.1", - "escape-html": "1.0.1", - "etag": "~1.6.0", - "finalhandler": "0.3.6", - "fresh": "0.2.4", - "merge-descriptors": "1.0.0", - "methods": "~1.1.1", - "on-finished": "~2.2.1", - "parseurl": "~1.3.0", - "path-to-regexp": "0.1.3", - "proxy-addr": "~1.0.8", - "qs": "2.4.2", - "range-parser": "~1.0.2", - "send": "0.12.3", - "serve-static": "~1.9.3", - "type-is": "~1.6.2", - "utils-merge": "1.0.0", - "vary": "~1.0.0" + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.9.6", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.17.2", + "serve-static": "1.14.2", + "setprototypeof": "1.2.0", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" }, "dependencies": { "accepts": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz", - "integrity": "sha1-5fHzkoxtlf2WVYw27D2dDeSm7Oo=", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "requires": { - "mime-types": "~2.1.6", - "negotiator": "0.5.3" + "mime-types": "~2.1.34", + "negotiator": "0.6.3" } }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "body-parser": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz", + "integrity": "sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==", + "requires": { + "bytes": "3.1.1", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.9.6", + "raw-body": "2.4.2", + "type-is": "~1.6.18" + } + }, + "bytes": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz", + "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==" }, "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "ms": "0.7.1" + "ms": "2.0.0" } }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, "ee-first": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz", - "integrity": "sha1-ag18YiHkkP7v2S7D9EHJzozQl/Q=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "mime-db": { - "version": "1.39.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.39.0.tgz", - "integrity": "sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==" + "version": "1.51.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", + "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" }, "mime-types": { - "version": "2.1.23", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.23.tgz", - "integrity": "sha512-ROk/m+gMVSrRxTkMlaQOvFmFmYDc7sZgrjjM76abqmd2Cc5fCV7jAMA5XUccEtJ3cYiYdgixUVI+fApc2LkXlw==", + "version": "2.1.34", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", + "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "requires": { - "mime-db": "~1.39.0" + "mime-db": "1.51.0" } }, "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "negotiator": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz", - "integrity": "sha1-Jp1cR2gQ7JLtvntsLygxY4T5p+g=" + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==" }, "on-finished": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz", - "integrity": "sha1-XIXBzDYpn3gCllP2Z/J7a5nrwCk=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "requires": { - "ee-first": "1.1.0" + "ee-first": "1.1.1" } }, "qs": { + "version": "6.9.6", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz", + "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==" + }, + "raw-body": { "version": "2.4.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz", - "integrity": "sha1-9854jld33wtQENp/fE5zujJHD1o=" + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz", + "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==", + "requires": { + "bytes": "3.1.1", + "http-errors": "1.8.1", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "requires": { "media-typer": "0.3.0", - "mime-types": "~2.1.18" + "mime-types": "~2.1.24" } } } @@ -2296,39 +2384,48 @@ } }, "finalhandler": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz", - "integrity": "sha1-2vnEFhsbBuABRmsUEd/baXO+E4s=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", "requires": { - "debug": "~2.2.0", - "escape-html": "1.0.1", - "on-finished": "~2.2.1" + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" }, "dependencies": { "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "ms": "0.7.1" + "ms": "2.0.0" } }, "ee-first": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz", - "integrity": "sha1-ag18YiHkkP7v2S7D9EHJzozQl/Q=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" }, "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "on-finished": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz", - "integrity": "sha1-XIXBzDYpn3gCllP2Z/J7a5nrwCk=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "requires": { - "ee-first": "1.1.0" + "ee-first": "1.1.1" } } } @@ -2402,14 +2499,14 @@ } }, "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==" }, "fresh": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz", - "integrity": "sha1-NYJJkgbJcjcUGQ7ddLRgT+tKYUw=" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, "fs-constants": { "version": "1.0.0", @@ -2932,7 +3029,6 @@ "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, "requires": { "safer-buffer": ">= 2.1.2 < 3" } @@ -3118,9 +3214,9 @@ "dev": true }, "ipaddr.js": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz", - "integrity": "sha1-X6eM8wG4JceKvDBC2BJyMEnqI8c=" + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, "is-binary-path": { "version": "2.1.0", @@ -3638,9 +3734,9 @@ "optional": true }, "merge-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz", - "integrity": "sha1-IWnPdTjhsMyH+4jhUC2EdLv3mGQ=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, "method-override": { "version": "3.0.0", @@ -3665,11 +3761,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" } } }, @@ -3689,9 +3780,9 @@ } }, "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { "version": "1.12.0", @@ -7314,9 +7405,9 @@ "dev": true }, "path-to-regexp": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz", - "integrity": "sha1-IbmrgidCed4lsVbqCP0SylG4rss=" + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, "pbkdf2": { "version": "3.0.17", @@ -7397,12 +7488,12 @@ "dev": true }, "proxy-addr": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz", - "integrity": "sha1-DUCoL4Afw1VWfS7LZe/j8HfxIcU=", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "requires": { - "forwarded": "~0.1.0", - "ipaddr.js": "1.0.5" + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" } }, "proxy-agent": { @@ -7540,9 +7631,9 @@ } }, "range-parser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz", - "integrity": "sha1-aHKCNTXGkuLCoBA4Jq/YLC4P8XU=" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { "version": "1.3.0", @@ -7868,59 +7959,113 @@ } }, "send": { - "version": "0.12.3", - "resolved": "https://registry.npmjs.org/send/-/send-0.12.3.tgz", - "integrity": "sha1-zRLcWP3iHk+RkCs5sv2gWnptm9w=", - "requires": { - "debug": "~2.2.0", - "depd": "~1.0.1", - "destroy": "1.0.3", - "escape-html": "1.0.1", - "etag": "~1.6.0", - "fresh": "0.2.4", - "mime": "1.3.4", - "ms": "0.7.1", - "on-finished": "~2.2.1", - "range-parser": "~1.0.2" + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.2.tgz", + "integrity": "sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==", + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "1.8.1", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "ms": "0.7.1" + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, "ee-first": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz", - "integrity": "sha1-ag18YiHkkP7v2S7D9EHJzozQl/Q=" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "http-errors": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=" + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, "on-finished": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz", - "integrity": "sha1-XIXBzDYpn3gCllP2Z/J7a5nrwCk=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", "requires": { - "ee-first": "1.1.0" + "ee-first": "1.1.1" } + }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" } } }, "serve-static": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz", - "integrity": "sha1-X42gcyOtOF/z3FQfGnkXsuQ261c=", + "version": "1.14.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz", + "integrity": "sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==", "requires": { - "escape-html": "1.0.1", - "parseurl": "~1.3.0", - "send": "0.12.3", - "utils-merge": "1.0.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.2" + }, + "dependencies": { + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + } } }, "set-blocking": { @@ -8777,8 +8922,7 @@ "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", - "dev": true + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, "stream-browserify": { "version": "2.0.2", @@ -9779,8 +9923,7 @@ "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, "unzip-response": { "version": "2.0.1", @@ -9856,9 +9999,9 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, "uuid": { "version": "3.3.2", @@ -9871,9 +10014,9 @@ "integrity": "sha512-mD45p0rvHVBlY2Zuy3F3ESIe1h5X58GPfAtslBjY7EtTqGquZTj+VX/J4RnHWN8FKq0C9WRVt1oWAcytWRuYLQ==" }, "vary": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz", - "integrity": "sha1-meSYFWaihhGN+yuBc1ffeZM3bRA=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, "verror": { "version": "1.10.0", diff --git a/package.json b/package.json index 23795fb4736..154e2d29f09 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "ejs": "1.0.0", "ejs-locals": "1.0.2", "errorhandler": "1.2.0", - "express": "4.12.4", + "express": "4.17.2", "express-fileupload": "0.0.5", "express-session": "^1.17.2", "file-type": "^8.1.0",