commit 1557ac84246bea70b5ec50f00b9b904b1e64b53c
author janakr <janakr@google.com> Tue May 26 10:55:19 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Tue May 26 10:56:47 2020 -0700
tree 1a6d4bd7b517eafe311c42cdbb61a8153005ffd3
parent 5fa85c8e9e32d9328be356e76e51d739e14fd0da

Don't crash on an absolute --client_cwd value that is not in the workspace.

PiperOrigin-RevId: 313225953

src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
index 3e037e1..19cbb07 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -248,22 +248,36 @@
     Path workspace = getWorkspace();
     Path workingDirectory;
     if (inWorkspace()) {
-      if (commandOptions.clientCwd.containsUplevelReferences()) {
+      PathFragment clientCwd = commandOptions.clientCwd;
+      if (clientCwd.containsUplevelReferences()) {
         throw new AbruptExitException(
             DetailedExitCode.of(
                 ExitCode.COMMAND_LINE_ERROR,
                 FailureDetail.newBuilder()
-                    .setMessage("Client cwd contains uplevel references")
+                    .setMessage("Client cwd '" + clientCwd + "' contains uplevel references")
                     .setClientEnvironment(
                         FailureDetails.ClientEnvironment.newBuilder()
                             .setCode(FailureDetails.ClientEnvironment.Code.CLIENT_CWD_MALFORMED)
                             .build())
                     .build()));
       }
-      workingDirectory = workspace.getRelative(commandOptions.clientCwd);
+      if (clientCwd.isAbsolute() && !clientCwd.startsWith(workspace.asFragment())) {
+        throw new AbruptExitException(
+            DetailedExitCode.of(
+                ExitCode.COMMAND_LINE_ERROR,
+                FailureDetail.newBuilder()
+                    .setMessage(
+                        String.format(
+                            "Client cwd '%s' is not inside workspace '%s'", clientCwd, workspace))
+                    .setClientEnvironment(
+                        FailureDetails.ClientEnvironment.newBuilder()
+                            .setCode(FailureDetails.ClientEnvironment.Code.CLIENT_CWD_MALFORMED)
+                            .build())
+                    .build()));
+      }
+      workingDirectory = workspace.getRelative(clientCwd);
     } else {
-      workspace = FileSystemUtils.getWorkingDirectory(getRuntime().getFileSystem());
-      workingDirectory = workspace;
+      workingDirectory = FileSystemUtils.getWorkingDirectory(getRuntime().getFileSystem());
     }
     return workingDirectory;
   }