From b6358163da5fa7fccd22b4a0df2eacb396c1377d Mon Sep 17 00:00:00 2001 From: Kirill Ivlev Date: Tue, 14 Jun 2022 18:10:12 +0400 Subject: [PATCH 1/3] Fix vulnerabilities (#3072) --- .../UseNodeV1/Tests/L0FirstDownloadSuccess.ts | 2 +- Tasks/UseNodeV1/package-lock.json | 24 +++++++++---------- Tasks/UseNodeV1/package.json | 2 +- Tasks/UseNodeV1/task.loc.json | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Tasks/UseNodeV1/Tests/L0FirstDownloadSuccess.ts b/Tasks/UseNodeV1/Tests/L0FirstDownloadSuccess.ts index bd501976672b..e79e8f397400 100644 --- a/Tasks/UseNodeV1/Tests/L0FirstDownloadSuccess.ts +++ b/Tasks/UseNodeV1/Tests/L0FirstDownloadSuccess.ts @@ -47,7 +47,7 @@ tlClone.setVariable = function(key, val) { }; if (process.env["__proxy__"]) { tlClone.getHttpProxyConfiguration = function(requestUrl?: string): taskLib.ProxyConfiguration | null { - return { proxyUrl: 'http://url.com', proxyUsername: 'username', proxyPassword: 'password', proxyBypassHosts: null}; + return { proxyUrl: 'http://url.com', proxyUsername: 'username', proxyPassword: 'password', proxyBypassHosts: null, proxyFormattedUrl: 'http://username:password@url.com'}; } } tmr.registerMock('azure-pipelines-task-lib/mock-task', tlClone); diff --git a/Tasks/UseNodeV1/package-lock.json b/Tasks/UseNodeV1/package-lock.json index 5ca2ff20ac56..88d4ba08fe0f 100644 --- a/Tasks/UseNodeV1/package-lock.json +++ b/Tasks/UseNodeV1/package-lock.json @@ -84,7 +84,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" } } }, @@ -99,27 +99,25 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "azure-pipelines-task-lib": { - "version": "3.0.6-preview.0", - "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-3.0.6-preview.0.tgz", - "integrity": "sha512-Fx+7p5GzvYqVXOQI+LhPk56Pio9yBeEyypKZoPI9cQyti8WTVkmJ7YZwn9HRXurftcLumi2Xq+TC3PwnDq5U5Q==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/azure-pipelines-task-lib/-/azure-pipelines-task-lib-3.3.1.tgz", + "integrity": "sha512-56ZAr4MHIoa24VNVuwPL4iUQ5MKaigPoYXkBG8E8fiVmh8yZdatUo25meNoQwg77vDY22F63Q44UzXoMWmy7ag==", "requires": { - "minimatch": "3.0.4", + "minimatch": "3.0.5", "mockery": "^1.7.0", "q": "^1.5.1", "semver": "^5.1.0", - "shelljs": "^0.8.4", + "shelljs": "^0.8.5", "sync-request": "6.1.0", "uuid": "^3.0.1" }, "dependencies": { - "shelljs": { - "version": "0.8.5", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz", - "integrity": "sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==", + "minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", "requires": { - "glob": "^7.0.0", - "interpret": "^1.0.0", - "rechoir": "^0.6.2" + "brace-expansion": "^1.1.7" } } } diff --git a/Tasks/UseNodeV1/package.json b/Tasks/UseNodeV1/package.json index f77af460ad7f..d183a62410e2 100644 --- a/Tasks/UseNodeV1/package.json +++ b/Tasks/UseNodeV1/package.json @@ -26,7 +26,7 @@ "@types/mocha": "^5.2.7", "@types/node": "^10.17.0", "@types/q": "^1.5.1", - "azure-pipelines-task-lib": "^3.0.6-preview.0", + "azure-pipelines-task-lib": "^3.3.1", "azure-pipelines-tasks-packaging-common": "2.1.0", "azure-pipelines-tasks-utility-common": "^3.198.1", "azure-pipelines-tool-lib": "^1.0.2", diff --git a/Tasks/UseNodeV1/task.loc.json b/Tasks/UseNodeV1/task.loc.json index a7fa15a66310..3fcbe4685511 100644 --- a/Tasks/UseNodeV1/task.loc.json +++ b/Tasks/UseNodeV1/task.loc.json @@ -61,4 +61,4 @@ "messages": { "ToolFailed": "ms-resource:loc.messages.ToolFailed" } -} +} \ No newline at end of file From d0b038ecef30592456bd1e5c5c7b3868ebc4611e Mon Sep 17 00:00:00 2001 From: Kirill Ivlev Date: Wed, 15 Jun 2022 10:15:45 +0400 Subject: [PATCH 2/3] bump task version --- Tasks/UseNodeV1/task.json | 2 +- Tasks/UseNodeV1/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/UseNodeV1/task.json b/Tasks/UseNodeV1/task.json index 01d533c67c5b..3f7b67da0113 100644 --- a/Tasks/UseNodeV1/task.json +++ b/Tasks/UseNodeV1/task.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 206, + "Minor": 207, "Patch": 0 }, "satisfies": [ diff --git a/Tasks/UseNodeV1/task.loc.json b/Tasks/UseNodeV1/task.loc.json index 3fcbe4685511..db3ab8ff6bd8 100644 --- a/Tasks/UseNodeV1/task.loc.json +++ b/Tasks/UseNodeV1/task.loc.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 206, + "Minor": 207, "Patch": 0 }, "satisfies": [ From 67f015dd2eb077e7362cb71d2242fa523ffb6559 Mon Sep 17 00:00:00 2001 From: Kirill Ivlev Date: Tue, 12 Jul 2022 13:15:53 +0400 Subject: [PATCH 3/3] bump task version --- Tasks/UseNodeV1/task.json | 2 +- Tasks/UseNodeV1/task.loc.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tasks/UseNodeV1/task.json b/Tasks/UseNodeV1/task.json index 3f7b67da0113..f9411c1edd10 100644 --- a/Tasks/UseNodeV1/task.json +++ b/Tasks/UseNodeV1/task.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 207, + "Minor": 208, "Patch": 0 }, "satisfies": [ diff --git a/Tasks/UseNodeV1/task.loc.json b/Tasks/UseNodeV1/task.loc.json index db3ab8ff6bd8..0a6d0e5fd609 100644 --- a/Tasks/UseNodeV1/task.loc.json +++ b/Tasks/UseNodeV1/task.loc.json @@ -16,7 +16,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 207, + "Minor": 208, "Patch": 0 }, "satisfies": [