mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-11-17 16:20:25 +00:00
feat: worker group toggle to keep the worker's proxy out of jobs (#11958)
* feat: worker group setting to strip env vars from the nsjail sandbox Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: apply the nsjail env denylist to profile envar directives too Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor: drop the nsjail env denylist spawn hook Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * feat: replace the nsjail env denylist with a worker group toggle for the job proxy Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: honor the job proxy toggle in duckdb and drop the env var fallback Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix: pre-install duckdb extensions with the proxy when jobs run without it Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * chore: update ee-repo-ref to 5cfc0dc6760ea7f631fc98ea1edd39adfc55bf11 This commit updates the EE repository reference after PR #914 was merged in windmill-ee-private. Previous ee-repo-ref: 8394f2d1b67765ba854205836185342e62df841e New ee-repo-ref: 5cfc0dc6760ea7f631fc98ea1edd39adfc55bf11 Automated by sync-ee-ref workflow. --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
windmill-internal-app[bot]
parent
0dd131b380
commit
8a0318a28f
@@ -252,7 +252,7 @@ pub async fn resolve<'a>(
|
||||
|
||||
// Configure proxies
|
||||
{
|
||||
let jps = parse_proxy()?;
|
||||
let jps = parse_proxy(PROXY_ENVS.clone())?;
|
||||
if let Some(val) = jps.https_host {
|
||||
cmd.arg(&format!("-Dhttps.proxyHost={}", val));
|
||||
}
|
||||
@@ -417,7 +417,7 @@ async fn install<'a>(
|
||||
.envs(PROXY_ENVS.clone());
|
||||
// Configure proxies
|
||||
{
|
||||
let jps = parse_proxy()?;
|
||||
let jps = parse_proxy(PROXY_ENVS.clone())?;
|
||||
if let Some(val) = jps.https_host {
|
||||
cmd.arg(&format!("-Dhttps.proxyHost={}", val));
|
||||
}
|
||||
@@ -803,7 +803,7 @@ async fn run<'a>(
|
||||
}
|
||||
// Configure proxies
|
||||
{
|
||||
let jps = parse_proxy()?;
|
||||
let jps = parse_proxy(crate::job_proxy_envs())?;
|
||||
if let Some(val) = jps.https_host {
|
||||
cmd.arg(&format!("-Dhttps.proxyHost={}", val));
|
||||
}
|
||||
@@ -882,7 +882,7 @@ async fn run<'a>(
|
||||
}
|
||||
// Configure proxies
|
||||
{
|
||||
let jps = parse_proxy()?;
|
||||
let jps = parse_proxy(crate::job_proxy_envs())?;
|
||||
if let Some(val) = jps.https_host {
|
||||
cmd.arg(&format!("-Dhttps.proxyHost={}", val));
|
||||
}
|
||||
@@ -943,9 +943,9 @@ struct JavaProxySettings {
|
||||
https_port: Option<String>,
|
||||
no_proxy: Option<String>,
|
||||
}
|
||||
fn parse_proxy() -> anyhow::Result<JavaProxySettings> {
|
||||
fn parse_proxy(proxy_envs: Vec<(&'static str, String)>) -> anyhow::Result<JavaProxySettings> {
|
||||
let mut jps = JavaProxySettings::default();
|
||||
for (ident, mut val) in PROXY_ENVS.clone() {
|
||||
for (ident, mut val) in proxy_envs {
|
||||
match ident {
|
||||
"HTTPS_PROXY" => {
|
||||
if !val.contains("://") {
|
||||
|
||||
Reference in New Issue
Block a user