Safe-guard against broken client environments

The code previously threw StringIndexOutOfBoundsException if the client
env contained just a variable name with no '=' or value.

Fixed #3196.

Change-Id: I5afcaa398ab2e8bacc709445f50ba363659cadbb

Closes #3197.

Change-Id: I5afcaa398ab2e8bacc709445f50ba363659cadbb
PiperOrigin-RevId: 159222809

1 files changed, 81 insertions, 0 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java b/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java
new file mode 100644
index 0000000000..ecc06fd1e7
--- /dev/null
+++ b/src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java
@@ -0,0 +1,81 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.runtime;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Tests for {@link BlazeRuntime} static methods. */
+@RunWith(JUnit4.class)
+public class BlazeRuntimeTest {
+  @Test
+  public void requestLogStringParsing() {
+    assertThat(BlazeRuntime.getRequestLogString(ImmutableList.of("--client_env=A=B")))
+        .isEqualTo("[--client_env=A=B]");
+    assertThat(BlazeRuntime.getRequestLogString(ImmutableList.of("--client_env=BROKEN")))
+        .isEqualTo("[--client_env=BROKEN]");
+    assertThat(BlazeRuntime.getRequestLogString(ImmutableList.of("--client_env=auth=notprinted")))
+        .isEqualTo("[--client_env=auth=__private_value_removed__]");
+    assertThat(
+            BlazeRuntime.getRequestLogString(ImmutableList.of("--client_env=MY_COOKIE=notprinted")))
+        .isEqualTo("[--client_env=MY_COOKIE=__private_value_removed__]");
+    assertThat(
+            BlazeRuntime.getRequestLogString(
+                ImmutableList.of("--client_env=dont_paSS_ME=notprinted")))
+        .isEqualTo("[--client_env=dont_paSS_ME=__private_value_removed__]");
+    assertThat(BlazeRuntime.getRequestLogString(ImmutableList.of("--client_env=ok=COOKIE")))
+        .isEqualTo("[--client_env=ok=COOKIE]");
+    assertThat(BlazeRuntime.getRequestLogString(
+        ImmutableList.of("--client_env=foo=bar", "--client_env=pass=notprinted")))
+            .isEqualTo("[--client_env=foo=bar, --client_env=pass=__private_value_removed__]");
+
+    List<String> complexCommandLine = ImmutableList.of(
+        "blaze",
+        "build",
+        "--client_env=FOO=BAR",
+        "--client_env=FOOPASS=mypassword",
+        "--package_path=./MY_PASSWORD/foo",
+        "--client_env=SOMEAuThCode=something");
+    assertThat(BlazeRuntime.getRequestLogString(complexCommandLine)).isEqualTo(
+        "[blaze, build, --client_env=FOO=BAR, --client_env=FOOPASS=__private_value_removed__, "
+            + "--package_path=./MY_PASSWORD/foo, "
+            + "--client_env=SOMEAuThCode=__private_value_removed__]");
+  }
+
+  @Test
+  public void optionSplitting() throws Exception {
+    BlazeRuntime.CommandLineOptions options =
+        BlazeRuntime.splitStartupOptions(
+            ImmutableList.<BlazeModule>of(),
+            "--install_base=/foo --host_jvm_args=-Xmx1B", "build", "//foo:bar", "--nobuild");
+    assertThat(options.getStartupArgs())
+        .isEqualTo(Arrays.asList("--install_base=/foo --host_jvm_args=-Xmx1B"));
+    assertThat(options.getOtherArgs()).isEqualTo(Arrays.asList("build", "//foo:bar", "--nobuild"));
+  }
+
+  // A regression test to make sure that the 'no' prefix is handled correctly.
+  @Test
+  public void optionSplittingNoPrefix() throws Exception {
+    BlazeRuntime.CommandLineOptions options = BlazeRuntime.splitStartupOptions(
+        ImmutableList.<BlazeModule>of(), "--nobatch", "build");
+    assertThat(options.getStartupArgs()).isEqualTo(Arrays.asList("--nobatch"));
+    assertThat(options.getOtherArgs()).isEqualTo(Arrays.asList("build"));
+  }
+}