Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to also recognize NO_PROXY

Browse Source
This commit is contained in:
Simon Quigley 2025-01-26 16:46:21 -06:00
parent 76605a4aed
commit 2bdae98c7e
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cpp/ci_logic.cpp
View File

@ -424,11 +424,29 @@ void CiLogic::clone_or_fetch(const std::filesystem::path &repo_dir,
ensure_git_inited(); ensure_git_inited();
// Use proxy settings via env var if they exist // Use proxy settings via env var if they exist
const char* proxy = repo_url.rfind("https", 0) == 0 ? std::getenv("HTTPS_PROXY") : std::getenv("HTTP_PROXY"); bool proxy = false;
git_proxy_options proxy_opts = GIT_PROXY_OPTIONS_INIT; git_proxy_options proxy_opts = GIT_PROXY_OPTIONS_INIT;
if (proxy) { {
const char* tmp_proxy = repo_url.rfind("https", 0) == 0 ? std::getenv("HTTPS_PROXY") : std::getenv("HTTP_PROXY");
if (tmp_proxy) {
const char* no_proxy_env = std::getenv("NO_PROXY");
if (no_proxy_env) {
std::istringstream iss(std::string{no_proxy_env});
std::string entry;
bool found_no_proxy = false;
while (std::getline(iss, entry, ',')) {
if (!entry.empty() && repo_url.contains(entry)) {
found_no_proxy = true;
break;
}
}
proxy = !found_no_proxy;
} else {
proxy = true;
proxy_opts.type = GIT_PROXY_SPECIFIED; proxy_opts.type = GIT_PROXY_SPECIFIED;
proxy_opts.url = proxy; proxy_opts.url = tmp_proxy;
}
}
} }
git_repository* repo = nullptr; git_repository* repo = nullptr;