Merge main into releases/v3 by github-actions[bot] · Pull Request #2739 · github/codeql-action · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
18 changes: 4 additions & 14 deletions lib/start-proxy-action.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/start-proxy-action.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codeql",
"version": "3.28.6",
"version": "3.28.7",
"private": true,
"description": "CodeQL action",
"scripts": {
Expand Down
21 changes: 6 additions & 15 deletions src/start-proxy-action.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const UPDATEJOB_PROXY = "update-job-proxy";
const UPDATEJOB_PROXY_VERSION = "v2.0.20241023203727";
const UPDATEJOB_PROXY_URL_PREFIX =
"https://github.com/github/codeql-action/releases/download/codeql-bundle-v2.18.1/";
const PROXY_USER = "proxy_user";
const KEY_SIZE = 2048;
const KEY_EXPIRY_YEARS = 2;

Expand Down Expand Up @@ -100,19 +99,23 @@ async function runWrapper() {
actionsUtil.getOptionalInput("registries_credentials"),
actionsUtil.getOptionalInput("language"),
);

if (credentials.length === 0) {
logger.info("No credentials found, skipping proxy setup.");
return;
}

logger.info(
`Credentials loaded for the following registries:\n ${credentials
.map((c) => credentialToStr(c))
.join("\n")}`,
);

const ca = generateCertificateAuthority();
const proxyAuth = getProxyAuth();

const proxyConfig: ProxyConfig = {
all_credentials: credentials,
ca,
proxy_auth: proxyAuth,
};

// Start the Proxy
Expand Down Expand Up @@ -181,18 +184,6 @@ async function startProxy(
}
}

// getProxyAuth returns the authentication information for the proxy itself.
function getProxyAuth(): BasicAuthCredentials | undefined {
const proxy_password = actionsUtil.getOptionalInput("proxy_password");
if (proxy_password) {
return {
username: PROXY_USER,
password: proxy_password,
};
}
return;
}

async function getProxyBinaryPath(): Promise<string> {
const proxyFileName =
process.platform === "win32" ? `${UPDATEJOB_PROXY}.exe` : UPDATEJOB_PROXY;
Expand Down
3 changes: 0 additions & 3 deletions start-proxy/action.yml