Skip to content

Commit 7f7a881

Browse files
kyle-leonhardkyle-leonhard
committed
Restore lock file
1 parent edb404f commit 7f7a881

File tree

3 files changed

+982
-681
lines changed

3 files changed

+982
-681
lines changed

‎dist/cache-save/index.js

Lines changed: 2 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function restoreCacheV2(paths, primaryKey, restoreKeys, options, enableCrossOsAr
220220
};
221221
const response = yield twirpClient.GetCacheEntryDownloadURL(request);
222222
if (!response.ok) {
223-
core.debug(`Cache not found for version ${request.version} of keys: ${keys.join(', ')}`);
223+
core.debug(`Cache not found for keys: ${keys.join(', ')}`);
224224
return undefined;
225225
}
226226
core.info(`Cache hit for: ${request.key}`);
@@ -2204,7 +2204,6 @@ const cacheUtils_1 = __nccwpck_require__(680);
22042204
const auth_1 = __nccwpck_require__(4552);
22052205
const http_client_1 = __nccwpck_require__(4844);
22062206
const cache_twirp_client_1 = __nccwpck_require__(1486);
2207-
const util_1 = __nccwpck_require__(7564);
22082207
/**
22092208
* This class is a wrapper around the CacheServiceClientJSON class generated by Twirp.
22102209
*
@@ -2264,7 +2263,6 @@ class CacheServiceClient {
22642263
(0, core_1.debug)(`[Response] - ${response.message.statusCode}`);
22652264
(0, core_1.debug)(`Headers: ${JSON.stringify(response.message.headers, null, 2)}`);
22662265
const body = JSON.parse(rawBody);
2267-
(0, util_1.maskSecretUrls)(body);
22682266
(0, core_1.debug)(`Body: ${JSON.stringify(body, null, 2)}`);
22692267
if (this.isSuccessStatusCode(statusCode)) {
22702268
return { response, body };
@@ -2446,87 +2444,6 @@ exports.getUserAgentString = getUserAgentString;
24462444

24472445
/***/ }),
24482446

2449-
/***/ 7564:
2450-
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
2451-
2452-
"use strict";
2453-
2454-
Object.defineProperty(exports, "__esModule", ({ value: true }));
2455-
exports.maskSecretUrls = exports.maskSigUrl = void 0;
2456-
const core_1 = __nccwpck_require__(7484);
2457-
/**
2458-
* Masks the `sig` parameter in a URL and sets it as a secret.
2459-
*
2460-
* @param url - The URL containing the signature parameter to mask
2461-
* @remarks
2462-
* This function attempts to parse the provided URL and identify the 'sig' query parameter.
2463-
* If found, it registers both the raw and URL-encoded signature values as secrets using
2464-
* the Actions `setSecret` API, which prevents them from being displayed in logs.
2465-
*
2466-
* The function handles errors gracefully if URL parsing fails, logging them as debug messages.
2467-
*
2468-
* @example
2469-
* ```typescript
2470-
* // Mask a signature in an Azure SAS token URL
2471-
* maskSigUrl('https://example.blob.core.windows.net/container/file.txt?sig=abc123&se=2023-01-01');
2472-
* ```
2473-
*/
2474-
function maskSigUrl(url) {
2475-
if (!url)
2476-
return;
2477-
try {
2478-
const parsedUrl = new URL(url);
2479-
const signature = parsedUrl.searchParams.get('sig');
2480-
if (signature) {
2481-
(0, core_1.setSecret)(signature);
2482-
(0, core_1.setSecret)(encodeURIComponent(signature));
2483-
}
2484-
}
2485-
catch (error) {
2486-
(0, core_1.debug)(`Failed to parse URL: ${url} ${error instanceof Error ? error.message : String(error)}`);
2487-
}
2488-
}
2489-
exports.maskSigUrl = maskSigUrl;
2490-
/**
2491-
* Masks sensitive information in URLs containing signature parameters.
2492-
* Currently supports masking 'sig' parameters in the 'signed_upload_url'
2493-
* and 'signed_download_url' properties of the provided object.
2494-
*
2495-
* @param body - The object should contain a signature
2496-
* @remarks
2497-
* This function extracts URLs from the object properties and calls maskSigUrl
2498-
* on each one to redact sensitive signature information. The function doesn't
2499-
* modify the original object; it only marks the signatures as secrets for
2500-
* logging purposes.
2501-
*
2502-
* @example
2503-
* ```typescript
2504-
* const responseBody = {
2505-
* signed_upload_url: 'https://blob.core.windows.net/?sig=abc123',
2506-
* signed_download_url: 'https://blob.core/windows.net/?sig=def456'
2507-
* };
2508-
* maskSecretUrls(responseBody);
2509-
* ```
2510-
*/
2511-
function maskSecretUrls(body) {
2512-
if (typeof body !== 'object' || body === null) {
2513-
(0, core_1.debug)('body is not an object or is null');
2514-
return;
2515-
}
2516-
if ('signed_upload_url' in body &&
2517-
typeof body.signed_upload_url === 'string') {
2518-
maskSigUrl(body.signed_upload_url);
2519-
}
2520-
if ('signed_download_url' in body &&
2521-
typeof body.signed_download_url === 'string') {
2522-
maskSigUrl(body.signed_download_url);
2523-
}
2524-
}
2525-
exports.maskSecretUrls = maskSecretUrls;
2526-
//# sourceMappingURL=util.js.map
2527-
2528-
/***/ }),
2529-
25302447
/***/ 5321:
25312448
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
25322449

@@ -90621,7 +90538,7 @@ module.exports = parseParams
9062190538
/***/ ((module) => {
9062290539

9062390540
"use strict";
90624-
module.exports = /*#__PURE__*/JSON.parse('{"name":"@actions/cache","version":"4.0.3","preview":true,"description":"Actions cache lib","keywords":["github","actions","cache"],"homepage":"https://github.com/actions/toolkit/tree/main/packages/cache","license":"MIT","main":"lib/cache.js","types":"lib/cache.d.ts","directories":{"lib":"lib","test":"__tests__"},"files":["lib","!.DS_Store"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/actions/toolkit.git","directory":"packages/cache"},"scripts":{"audit-moderate":"npm install && npm audit --json --audit-level=moderate > audit.json","test":"echo \\"Error: run tests from root\\" && exit 1","tsc":"tsc"},"bugs":{"url":"https://github.com/actions/toolkit/issues"},"dependencies":{"@actions/core":"^1.11.1","@actions/exec":"^1.0.1","@actions/glob":"^0.1.0","@actions/http-client":"^2.1.1","@actions/io":"^1.0.1","@azure/abort-controller":"^1.1.0","@azure/ms-rest-js":"^2.6.0","@azure/storage-blob":"^12.13.0","@protobuf-ts/plugin":"^2.9.4","semver":"^6.3.1"},"devDependencies":{"@types/node":"^22.13.9","@types/semver":"^6.0.0","typescript":"^5.2.2"}}');
90541+
module.exports = /*#__PURE__*/JSON.parse('{"name":"@actions/cache","version":"4.0.2","preview":true,"description":"Actions cache lib","keywords":["github","actions","cache"],"homepage":"https://github.com/actions/toolkit/tree/main/packages/cache","license":"MIT","main":"lib/cache.js","types":"lib/cache.d.ts","directories":{"lib":"lib","test":"__tests__"},"files":["lib","!.DS_Store"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/actions/toolkit.git","directory":"packages/cache"},"scripts":{"audit-moderate":"npm install && npm audit --json --audit-level=moderate > audit.json","test":"echo \\"Error: run tests from root\\" && exit 1","tsc":"tsc"},"bugs":{"url":"https://github.com/actions/toolkit/issues"},"dependencies":{"@actions/core":"^1.11.1","@actions/exec":"^1.0.1","@actions/glob":"^0.1.0","@actions/http-client":"^2.1.1","@actions/io":"^1.0.1","@azure/abort-controller":"^1.1.0","@azure/ms-rest-js":"^2.6.0","@azure/storage-blob":"^12.13.0","@protobuf-ts/plugin":"^2.9.4","semver":"^6.3.1"},"devDependencies":{"@types/semver":"^6.0.0","typescript":"^5.2.2"}}');
9062590542

9062690543
/***/ }),
9062790544

‎dist/setup/index.js

Lines changed: 2 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ function restoreCacheV2(paths, primaryKey, restoreKeys, options, enableCrossOsAr
220220
};
221221
const response = yield twirpClient.GetCacheEntryDownloadURL(request);
222222
if (!response.ok) {
223-
core.debug(`Cache not found for version ${request.version} of keys: ${keys.join(', ')}`);
223+
core.debug(`Cache not found for keys: ${keys.join(', ')}`);
224224
return undefined;
225225
}
226226
core.info(`Cache hit for: ${request.key}`);
@@ -2204,7 +2204,6 @@ const cacheUtils_1 = __nccwpck_require__(680);
22042204
const auth_1 = __nccwpck_require__(4552);
22052205
const http_client_1 = __nccwpck_require__(4844);
22062206
const cache_twirp_client_1 = __nccwpck_require__(1486);
2207-
const util_1 = __nccwpck_require__(7564);
22082207
/**
22092208
* This class is a wrapper around the CacheServiceClientJSON class generated by Twirp.
22102209
*
@@ -2264,7 +2263,6 @@ class CacheServiceClient {
22642263
(0, core_1.debug)(`[Response] - ${response.message.statusCode}`);
22652264
(0, core_1.debug)(`Headers: ${JSON.stringify(response.message.headers, null, 2)}`);
22662265
const body = JSON.parse(rawBody);
2267-
(0, util_1.maskSecretUrls)(body);
22682266
(0, core_1.debug)(`Body: ${JSON.stringify(body, null, 2)}`);
22692267
if (this.isSuccessStatusCode(statusCode)) {
22702268
return { response, body };
@@ -2446,87 +2444,6 @@ exports.getUserAgentString = getUserAgentString;
24462444

24472445
/***/ }),
24482446

2449-
/***/ 7564:
2450-
/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
2451-
2452-
"use strict";
2453-
2454-
Object.defineProperty(exports, "__esModule", ({ value: true }));
2455-
exports.maskSecretUrls = exports.maskSigUrl = void 0;
2456-
const core_1 = __nccwpck_require__(7484);
2457-
/**
2458-
* Masks the `sig` parameter in a URL and sets it as a secret.
2459-
*
2460-
* @param url - The URL containing the signature parameter to mask
2461-
* @remarks
2462-
* This function attempts to parse the provided URL and identify the 'sig' query parameter.
2463-
* If found, it registers both the raw and URL-encoded signature values as secrets using
2464-
* the Actions `setSecret` API, which prevents them from being displayed in logs.
2465-
*
2466-
* The function handles errors gracefully if URL parsing fails, logging them as debug messages.
2467-
*
2468-
* @example
2469-
* ```typescript
2470-
* // Mask a signature in an Azure SAS token URL
2471-
* maskSigUrl('https://example.blob.core.windows.net/container/file.txt?sig=abc123&se=2023-01-01');
2472-
* ```
2473-
*/
2474-
function maskSigUrl(url) {
2475-
if (!url)
2476-
return;
2477-
try {
2478-
const parsedUrl = new URL(url);
2479-
const signature = parsedUrl.searchParams.get('sig');
2480-
if (signature) {
2481-
(0, core_1.setSecret)(signature);
2482-
(0, core_1.setSecret)(encodeURIComponent(signature));
2483-
}
2484-
}
2485-
catch (error) {
2486-
(0, core_1.debug)(`Failed to parse URL: ${url} ${error instanceof Error ? error.message : String(error)}`);
2487-
}
2488-
}
2489-
exports.maskSigUrl = maskSigUrl;
2490-
/**
2491-
* Masks sensitive information in URLs containing signature parameters.
2492-
* Currently supports masking 'sig' parameters in the 'signed_upload_url'
2493-
* and 'signed_download_url' properties of the provided object.
2494-
*
2495-
* @param body - The object should contain a signature
2496-
* @remarks
2497-
* This function extracts URLs from the object properties and calls maskSigUrl
2498-
* on each one to redact sensitive signature information. The function doesn't
2499-
* modify the original object; it only marks the signatures as secrets for
2500-
* logging purposes.
2501-
*
2502-
* @example
2503-
* ```typescript
2504-
* const responseBody = {
2505-
* signed_upload_url: 'https://blob.core.windows.net/?sig=abc123',
2506-
* signed_download_url: 'https://blob.core/windows.net/?sig=def456'
2507-
* };
2508-
* maskSecretUrls(responseBody);
2509-
* ```
2510-
*/
2511-
function maskSecretUrls(body) {
2512-
if (typeof body !== 'object' || body === null) {
2513-
(0, core_1.debug)('body is not an object or is null');
2514-
return;
2515-
}
2516-
if ('signed_upload_url' in body &&
2517-
typeof body.signed_upload_url === 'string') {
2518-
maskSigUrl(body.signed_upload_url);
2519-
}
2520-
if ('signed_download_url' in body &&
2521-
typeof body.signed_download_url === 'string') {
2522-
maskSigUrl(body.signed_download_url);
2523-
}
2524-
}
2525-
exports.maskSecretUrls = maskSecretUrls;
2526-
//# sourceMappingURL=util.js.map
2527-
2528-
/***/ }),
2529-
25302447
/***/ 5321:
25312448
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
25322449

@@ -100297,7 +100214,7 @@ module.exports = parseParams
100297100214
/***/ ((module) => {
100298100215

100299100216
"use strict";
100300-
module.exports = /*#__PURE__*/JSON.parse('{"name":"@actions/cache","version":"4.0.3","preview":true,"description":"Actions cache lib","keywords":["github","actions","cache"],"homepage":"https://github.com/actions/toolkit/tree/main/packages/cache","license":"MIT","main":"lib/cache.js","types":"lib/cache.d.ts","directories":{"lib":"lib","test":"__tests__"},"files":["lib","!.DS_Store"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/actions/toolkit.git","directory":"packages/cache"},"scripts":{"audit-moderate":"npm install && npm audit --json --audit-level=moderate > audit.json","test":"echo \\"Error: run tests from root\\" && exit 1","tsc":"tsc"},"bugs":{"url":"https://github.com/actions/toolkit/issues"},"dependencies":{"@actions/core":"^1.11.1","@actions/exec":"^1.0.1","@actions/glob":"^0.1.0","@actions/http-client":"^2.1.1","@actions/io":"^1.0.1","@azure/abort-controller":"^1.1.0","@azure/ms-rest-js":"^2.6.0","@azure/storage-blob":"^12.13.0","@protobuf-ts/plugin":"^2.9.4","semver":"^6.3.1"},"devDependencies":{"@types/node":"^22.13.9","@types/semver":"^6.0.0","typescript":"^5.2.2"}}');
100217+
module.exports = /*#__PURE__*/JSON.parse('{"name":"@actions/cache","version":"4.0.2","preview":true,"description":"Actions cache lib","keywords":["github","actions","cache"],"homepage":"https://github.com/actions/toolkit/tree/main/packages/cache","license":"MIT","main":"lib/cache.js","types":"lib/cache.d.ts","directories":{"lib":"lib","test":"__tests__"},"files":["lib","!.DS_Store"],"publishConfig":{"access":"public"},"repository":{"type":"git","url":"git+https://github.com/actions/toolkit.git","directory":"packages/cache"},"scripts":{"audit-moderate":"npm install && npm audit --json --audit-level=moderate > audit.json","test":"echo \\"Error: run tests from root\\" && exit 1","tsc":"tsc"},"bugs":{"url":"https://github.com/actions/toolkit/issues"},"dependencies":{"@actions/core":"^1.11.1","@actions/exec":"^1.0.1","@actions/glob":"^0.1.0","@actions/http-client":"^2.1.1","@actions/io":"^1.0.1","@azure/abort-controller":"^1.1.0","@azure/ms-rest-js":"^2.6.0","@azure/storage-blob":"^12.13.0","@protobuf-ts/plugin":"^2.9.4","semver":"^6.3.1"},"devDependencies":{"@types/semver":"^6.0.0","typescript":"^5.2.2"}}');
100301100218

100302100219
/***/ }),
100303100220

0 commit comments

Comments
 (0)