song.jun/actions-artifact
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正内部文件服务的协议

Browse Source
This commit is contained in:
SongJun
2026-07-22 08:35:38 -04:00
parent 3133eabc4b
commit 7c8bad58f2
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
download/dist/index.js vendored
View File

@@ -2694,9 +2694,21 @@ function getResultsServiceUrl() {
if (!resultsUrl) {
throw new Error('Unable to get the ACTIONS_RESULTS_URL env variable');
}
return new URL(resultsUrl).origin;
const serviceUrl = new URL(resultsUrl);
if (serviceUrl.protocol === 'https:' && isDockerBridgeIPv4(serviceUrl.hostname)) {
serviceUrl.protocol = 'http:';
}
return serviceUrl.origin;
}
exports.getResultsServiceUrl = getResultsServiceUrl;
function isDockerBridgeIPv4(hostname) {
const octets = hostname.split('.').map(Number);
return (octets.length === 4 &&
octets.every(octet => Number.isInteger(octet) && octet >= 0 && octet <= 255) &&
octets[0] === 172 &&
octets[1] >= 16 &&
octets[1] <= 31);
}
function isGhes() {
return false;
}
@@ -124958,4 +124970,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
/******/ module.exports = __webpack_exports__;
/******/
/******/ })()
;
;

16
upload/dist/index.js vendored
View File

@@ -3019,9 +3019,21 @@ function getResultsServiceUrl() {
if (!resultsUrl) {
throw new Error('Unable to get the ACTIONS_RESULTS_URL env variable');
}
return new URL(resultsUrl).origin;
const serviceUrl = new URL(resultsUrl);
if (serviceUrl.protocol === 'https:' && isDockerBridgeIPv4(serviceUrl.hostname)) {
serviceUrl.protocol = 'http:';
}
return serviceUrl.origin;
}
exports.getResultsServiceUrl = getResultsServiceUrl;
function isDockerBridgeIPv4(hostname) {
const octets = hostname.split('.').map(Number);
return (octets.length === 4 &&
octets.every(octet => Number.isInteger(octet) && octet >= 0 && octet <= 255) &&
octets[0] === 172 &&
octets[1] >= 16 &&
octets[1] <= 31);
}
function isGhes() {
return false;
}
@@ -129412,4 +129424,4 @@ module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"]
/******/ module.exports = __webpack_exports__;
/******/
/******/ })()
;
;