Support spaces in no_proxy var
Closes #11383
Closes #11555.
PiperOrigin-RevId: 316432925
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelper.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelper.java
index 2462835..dbe10ae 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelper.java
@@ -56,7 +56,7 @@
noProxyUrl = env.get("NO_PROXY");
}
if (!Strings.isNullOrEmpty(noProxyUrl)) {
- String[] noProxyUrlArray = noProxyUrl.split(",");
+ String[] noProxyUrlArray = noProxyUrl.split("\\s*,\\s*");
String requestedHost = requestedUrl.getHost();
for (int i = 0; i < noProxyUrlArray.length; i++) {
if (noProxyUrlArray[i].startsWith(".")) {
diff --git a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelperTest.java b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelperTest.java
index 48be396..2c5ce30 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/repository/downloader/ProxyHelperTest.java
@@ -113,6 +113,25 @@
}
@Test
+ public void testCreateIfNeededMultipleNoProxySpaces() throws Exception {
+ ProxyHelper helper =
+ new ProxyHelper(
+ ImmutableMap.of(
+ "no_proxy",
+ "something.com , example.com, localhost",
+ "HTTPS_PROXY",
+ "https://my.example.com"));
+ Proxy proxy = helper.createProxyIfNeeded(new URL("https://www.something.com"));
+ assertThat(proxy).isEqualTo(Proxy.NO_PROXY);
+
+ Proxy proxy2 = helper.createProxyIfNeeded(new URL("https://www.example.com"));
+ assertThat(proxy2).isEqualTo(Proxy.NO_PROXY);
+
+ Proxy proxy3 = helper.createProxyIfNeeded(new URL("https://localhost"));
+ assertThat(proxy3).isEqualTo(Proxy.NO_PROXY);
+ }
+
+ @Test
public void testCreateIfNeededNoProxyNoMatchSubstring() throws Exception {
ProxyHelper helper =
new ProxyHelper(
