Skip to content

Make wasm GIT_CORS_PROXY env var much more configurable #155

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
ianthomas23 merged 1 commit into from
May 14, 2026
Merged

Make wasm GIT_CORS_PROXY env var much more configurable #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 16 additions & 21 deletions src/wasm/stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,32 +125,27 @@ EM_JS(const char*, js_maybe_convert_url, (const char* url_str), {
let ret = url_js; // Default to returning original unconverted URL as new string.
if (GIT_CORS_PROXY)
{
// clang-format off
const GIT_CORS_PROXY_TYPE = env["GIT_CORS_PROXY_TYPE"] ?? "prefix";
// clang-format on
if (GIT_CORS_PROXY_TYPE == "prefix")
if (!GIT_CORS_PROXY.includes("{"))
{
ret = GIT_CORS_PROXY;
if (ret.at(-1) != '/')
{
ret += '/';
}
ret += url_js;
ret = GIT_CORS_PROXY + url_js;
}
else if (GIT_CORS_PROXY_TYPE == "insert")
else
{
ret = url.protocol + "/" + GIT_CORS_PROXY;
if (ret.at(-1) != '/')
ret = GIT_CORS_PROXY;
ret = ret.replace("{url}", url_js);
ret = ret.replace("{url:encode}", encodeURIComponent(url_js));
ret = ret.replace("{protocol}", url.protocol);
ret = ret.replace("{protocol:encode}", encodeURIComponent(url.protocol));
ret = ret.replace("{host}", url.host);
ret = ret.replace("{host:encode}", encodeURIComponent(url.host));
ret = ret.replace("{path}", url.pathname + url.search);
ret = ret.replace("{path:encode}", encodeURIComponent(url.pathname + url.search));
const api_key = env["GIT_CORS_PROXY_API_KEY"];
if (api_key)
{
ret += '/';
ret = ret.replace("{api_key}", api_key);
}
ret += url.host + url.pathname + url.search;
}
else
{
// clang-format off
console.warn(`Invalid GIT_CORS_PROXY_TYPE of '${GIT_CORS_PROXY_TYPE}'`);
// clang-format on
// Ignore any other use of curly braces.
}
}
return stringToNewUTF8(ret);
Expand Down
1 change: 0 additions & 1 deletion wasm/cockle-deploy/cockle-config-in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"vi": "vim"
},
"environment": {
"GIT_CORS_PROXY": "https://corsproxy.io/?url=",
"GIT_AUTHOR_NAME": "Jane Doe",
"GIT_AUTHOR_EMAIL": "jane.doe@blabla.com",
"GIT_COMMITTER_NAME": "Jane Doe",
Expand Down
1 change: 0 additions & 1 deletion wasm/lite-deploy/cockle-config-in.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"vi": "vim"
},
"environment": {
"GIT_CORS_PROXY": "https://corsproxy.io/?url=",
"GIT_AUTHOR_NAME": "Jane Doe",
"GIT_AUTHOR_EMAIL": "jane.doe@blabla.com",
"GIT_COMMITTER_NAME": "Jane Doe",
Expand Down