Skip to content

add proxy support for axios requests #1623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firecow merged 3 commits into from
Aug 6, 2025
Merged

add proxy support for axios requests #1623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
913221a
fix: add proxy support for axios requests in ParserIncludes and Utils
nmcc1212 Aug 4, 2025
1ddc2a5
refactor axios proxy configuration into its own method
nmcc1212 Aug 5, 2025
6be9653
remove brackets
nmcc1212 Aug 5, 2025
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
8 changes: 6 additions & 2 deletions src/parser-includes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {GitData} from "./git-data.js";
import assert, {AssertionError} from "assert";
import chalk from "chalk";
import {Parser} from "./parser.js";
import axios from "axios";
import axios, {AxiosRequestConfig} from "axios";
import path from "path";
import semver from "semver";
import {RE2JS} from "re2js";
Expand Down Expand Up @@ -287,7 +287,11 @@ export class ParserIncludes {
try {
const target = `${cwd}/${stateDir}/includes/${fsUrl}`;
if (await fs.pathExists(target) && !fetchIncludes) return;
const res = await axios.get(url, {headers: {"User-Agent": "gitlab-ci-local"}});
const axiosConfig: AxiosRequestConfig = {
headers: {"User-Agent": "gitlab-ci-local"},
...Utils.getAxiosProxyConfig(),
};
const res = await axios.get(url, axiosConfig);
Comment thread
nmcc1212 marked this conversation as resolved.
await fs.outputFile(target, res.data);
} catch (e) {
throw new AssertionError({message: `Remote include could not be fetched ${url}\n${e}`});
Expand Down
23 changes: 21 additions & 2 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {CICDVariable} from "./variables-from-files.js";
import {GitData, GitSchema} from "./git-data.js";
import globby from "globby";
import micromatch from "micromatch";
import axios from "axios";
import axios, {AxiosRequestConfig} from "axios";
import path from "path";
import {Argv} from "./argv.js";

Expand Down Expand Up @@ -418,7 +418,11 @@ export class Utils {
case "http":
case "https": {
try {
const {status} = await axios.get(`${protocol}://${domain}:${port}/${projectPath}/-/raw/${ref}/${file}`);
const axiosConfig: AxiosRequestConfig = Utils.getAxiosProxyConfig();
const {status} = await axios.get(
`${protocol}://${domain}:${port}/${projectPath}/-/raw/${ref}/${file}`,
axiosConfig,
);
return (status === 200);
} catch {
return false;
Expand All @@ -442,4 +446,19 @@ export class Utils {
}
return lsFilesRes.stdout.split("\n");
}

static getAxiosProxyConfig (): AxiosRequestConfig {
const proxyEnv = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
if (proxyEnv) {
const proxyUrl = new URL(proxyEnv);
return {
proxy: {
host: proxyUrl.hostname,
port: proxyUrl.port ? parseInt(proxyUrl.port, 10) : 8080,
protocol: proxyUrl.protocol.replace(":", ""),
},
};
}
return {};
}
}