Merge pull request #1839 from nickanderson/ME-586/master

Lluis Campos · web-flow · commit bef0f8f30d9b · 2025-10-31T13:30:44.000+01:00
Handle invalid NO_PROXY setting containing comma
diff --git a/src/client_shared/conf/conf.cpp b/src/client_shared/conf/conf.cpp
@@ -288,6 +288,12 @@ expected::ExpectedSize MenderConfig::ProcessCmdlineArgs(
 		return expected::unexpected(proxy.error());
 	}
 
+	if (http_client_config_.no_proxy.find(',') != string::npos) {
+		return expected::unexpected(MakeError(
+			ConfigErrorCode::InvalidOptionsError,
+			"Unsupported syntax for NO_PROXY environment variable. Use space-separated values instead of coma-separated."));
+	}
+
 	return opts_iter.GetPos();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,12 @@ expected::ExpectedSize MenderConfig::ProcessCmdlineArgs(`
`288`	`288`	`return expected::unexpected(proxy.error());`
`289`	`289`	`}`
`290`	`290`
	`291`	`+ if (http_client_config_.no_proxy.find(',') != string::npos) {`
	`292`	`+ return expected::unexpected(MakeError(`
	`293`	`+ ConfigErrorCode::InvalidOptionsError,`
	`294`	`+ "Unsupported syntax for NO_PROXY environment variable. Use space-separated values instead of coma-separated."));`
	`295`	`+ }`
	`296`	`+`
`291`	`297`	`return opts_iter.GetPos();`
`292`	`298`	`}`
`293`	`299`