diff --git a/Jenkinsfile b/Jenkinsfile index 9547a5e..2e74a06 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,10 +12,17 @@ node { sh 'yarn install' } - stage('Vulnr test') { + stage('Composer Vulnr test') { snykSecurity( snykInstallation: 'snyk-local', - targetFile: 'composer.json', + targetFile: 'composer.lock', + ) + } + + stage('npm vulnr test') { + snykSecurity( + snykInstallation: 'snyk-local', + targetFile: 'package.json', ) } diff --git a/composer.lock b/composer.lock index fc48bde..3af0c47 100644 --- a/composer.lock +++ b/composer.lock @@ -2036,16 +2036,16 @@ }, { "name": "presta/sitemap-bundle", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/prestaconcept/PrestaSitemapBundle.git", - "reference": "341ad68ef7d1b0dad183fa68ecb8275d89fa1e9b" + "reference": "ad23fe594ff0fedb4e7be638873a19c39eb6ed7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/prestaconcept/PrestaSitemapBundle/zipball/341ad68ef7d1b0dad183fa68ecb8275d89fa1e9b", - "reference": "341ad68ef7d1b0dad183fa68ecb8275d89fa1e9b", + "url": "https://api.github.com/repos/prestaconcept/PrestaSitemapBundle/zipball/ad23fe594ff0fedb4e7be638873a19c39eb6ed7b", + "reference": "ad23fe594ff0fedb4e7be638873a19c39eb6ed7b", "shasum": "" }, "require": { @@ -2098,9 +2098,9 @@ ], "support": { "issues": "https://github.com/prestaconcept/PrestaSitemapBundle/issues", - "source": "https://github.com/prestaconcept/PrestaSitemapBundle/tree/v3.2.1" + "source": "https://github.com/prestaconcept/PrestaSitemapBundle/tree/v3.3.0" }, - "time": "2021-12-16T08:09:53+00:00" + "time": "2022-01-24T07:37:28+00:00" }, { "name": "psr/cache", diff --git a/package-lock.json b/package-lock.json index 64d97b3..c66b8a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,9 +6,9 @@ "": { "license": "UNLICENSED", "dependencies": { + "@snyk/protect": "^1.834.0", "cookie-notice": "^1.3.6", - "friendly-challenge": "^0.8.5", - "snyk": "^1.806.0" + "friendly-challenge": "^0.8.5" }, "devDependencies": { "@fortawesome/fontawesome-free": "^5.15.3", @@ -1843,6 +1843,17 @@ "node": ">=4" } }, + "node_modules/@snyk/protect": { + "version": "1.834.0", + "resolved": "https://registry.npmjs.org/@snyk/protect/-/protect-1.834.0.tgz", + "integrity": "sha512-I/zzykVqRI4ZeIGwhwnQ/li01W0fJC6uMGdM6oGWOIOex3L6BBz2LTZeHr4PMoZDNha2TM10hgcYf9JvGvjNKQ==", + "bin": { + "snyk-protect": "bin/snyk-protect" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@stimulus/core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@stimulus/core/-/core-2.0.0.tgz", @@ -7219,17 +7230,6 @@ "node": ">=8" } }, - "node_modules/snyk": { - "version": "1.806.0", - "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.806.0.tgz", - "integrity": "sha512-X0Aso0+zA9YXrrIgW1G3GXRqsvW4j7gXS9QyxFUwPp9qp5dAX1sjNUuLrK/z0CpuIpT7MVOBrYHF/RkMJ2C+FA==", - "bin": { - "snyk": "bin/snyk" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", @@ -9747,6 +9747,11 @@ } } }, + "@snyk/protect": { + "version": "1.834.0", + "resolved": "https://registry.npmjs.org/@snyk/protect/-/protect-1.834.0.tgz", + "integrity": "sha512-I/zzykVqRI4ZeIGwhwnQ/li01W0fJC6uMGdM6oGWOIOex3L6BBz2LTZeHr4PMoZDNha2TM10hgcYf9JvGvjNKQ==" + }, "@stimulus/core": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@stimulus/core/-/core-2.0.0.tgz", @@ -13844,11 +13849,6 @@ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true }, - "snyk": { - "version": "1.806.0", - "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.806.0.tgz", - "integrity": "sha512-X0Aso0+zA9YXrrIgW1G3GXRqsvW4j7gXS9QyxFUwPp9qp5dAX1sjNUuLrK/z0CpuIpT7MVOBrYHF/RkMJ2C+FA==" - }, "sockjs": { "version": "0.3.24", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", diff --git a/package.json b/package.json index 553b003..19e8702 100644 --- a/package.json +++ b/package.json @@ -19,11 +19,12 @@ "dev-server": "encore dev-server", "dev": "encore dev", "watch": "encore dev --watch", - "build": "encore production --progress" + "build": "encore production --progress", + "test": "snyk test" }, "dependencies": { "cookie-notice": "^1.3.6", "friendly-challenge": "^0.8.5", - "snyk": "^1.806.0" + "@snyk/protect": "^1.834.0" } } diff --git a/yarn.lock b/yarn.lock index d60d7ff..212823a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -936,6 +936,11 @@ error-stack-parser "^2.0.0" string-width "^4.2.3" +"@snyk/protect@^1.834.0": + version "1.834.0" + resolved "https://registry.npmjs.org/@snyk/protect/-/protect-1.834.0.tgz" + integrity sha512-I/zzykVqRI4ZeIGwhwnQ/li01W0fJC6uMGdM6oGWOIOex3L6BBz2LTZeHr4PMoZDNha2TM10hgcYf9JvGvjNKQ== + "@stimulus/core@^2.0.0": version "2.0.0" resolved "https://registry.npmjs.org/@stimulus/core/-/core-2.0.0.tgz" @@ -4197,11 +4202,6 @@ slash@^3.0.0: resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== -snyk@^1.806.0: - version "1.806.0" - resolved "https://registry.npmjs.org/snyk/-/snyk-1.806.0.tgz" - integrity sha512-X0Aso0+zA9YXrrIgW1G3GXRqsvW4j7gXS9QyxFUwPp9qp5dAX1sjNUuLrK/z0CpuIpT7MVOBrYHF/RkMJ2C+FA== - sockjs@^0.3.21: version "0.3.24" resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"