Add the /file endpoint to the new server

With a test, and everything. This change requires us
to track a `TemporaryFileSystem` per `ActiveSession`
bringing us ever closer to have an equivalence with
`Session`.

Author: shs96c

java/server/src/org/openqa/selenium/remote/server/ActiveSession.java

@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.remote.server;
 
+import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.remote.Dialect;
 import org.openqa.selenium.remote.SessionId;
 
@@ -35,5 +36,7 @@ public interface ActiveSession extends CommandHandler {
    */
   Map<String, Object> getCapabilities();
 
+  TemporaryFilesystem getFileSystem();
+
   void stop();
 }

java/server/src/org/openqa/selenium/remote/server/ActiveSessions.java

@@ -21,6 +21,7 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalListener;
 
+import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.server.log.LoggingManager;
 import org.openqa.selenium.remote.server.log.PerSessionLogHandler;
@@ -44,7 +45,13 @@ public class ActiveSessions {
   public ActiveSessions(long inactiveSessionTimeout, TimeUnit unit) {
     RemovalListener<SessionId, ActiveSession> listener = notification -> {
       ActiveSession session = notification.getValue();
-      listeners.forEach(l -> l.onStop(session));
+      listeners.forEach(l -> {
+        try {
+          l.onStop(session);
+        } catch (Exception e) {
+          LOG.log(Level.WARNING, "Caught exception closing session: " + session.getId(), e);
+        }
+      });
       session.stop();
     };
 
@@ -68,6 +75,15 @@ public void onStop(ActiveSession session) {
         logHandler.removeSessionLogs(session.getId());
       }
     });
+
+    addListener(new ActiveSessionListener() {
+      @Override
+      public void onStop(ActiveSession session) {
+        TemporaryFilesystem filesystem = session.getFileSystem();
+        filesystem.deleteTemporaryFiles();
+        filesystem.deleteBaseDir();
+      }
+    });
   }
 
   public void put(ActiveSession session) {

java/server/src/org/openqa/selenium/remote/server/AllHandlers.java

@@ -28,12 +28,13 @@
 
 import org.openqa.selenium.remote.SessionId;
 import org.openqa.selenium.remote.http.HttpMethod;
+import org.openqa.selenium.remote.server.commandhandler.GetAllSessions;
 import org.openqa.selenium.remote.server.commandhandler.GetLogTypes;
 import org.openqa.selenium.remote.server.commandhandler.GetLogsOfType;
 import org.openqa.selenium.remote.server.commandhandler.NoHandler;
 import org.openqa.selenium.remote.server.commandhandler.NoSessionHandler;
 import org.openqa.selenium.remote.server.commandhandler.Status;
-import org.openqa.selenium.remote.server.commandhandler.GetAllSessions;
+import org.openqa.selenium.remote.server.commandhandler.UploadFile;
 
 import java.lang.reflect.Constructor;
 import java.util.List;
@@ -67,7 +68,9 @@ public AllHandlers(ActiveSessions allSessions) {
         ),
         HttpMethod.POST, ImmutableList.of(
             handler("/session", BeginSession.class),
-            handler("/session/{sessionId}/log", GetLogsOfType.class)
+            handler("/session/{sessionId}/file", UploadFile.class),
+            handler("/session/{sessionId}/log", GetLogsOfType.class),
+            handler("/session/{sessionId}/se/file", UploadFile.class)
         ));
   }
 
@@ -123,6 +126,7 @@ private <H extends CommandHandler> Function<String, CommandHandler> handler(
         ActiveSession session = allSessions.get(id);
         if (session != null) {
           args.add(session);
+          args.add(session.getFileSystem());
         }
       }
       match.getParameters().entrySet().stream()

java/server/src/org/openqa/selenium/remote/server/InMemorySession.java

@@ -21,6 +21,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Preconditions;
+import com.google.common.base.StandardSystemProperty;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
@@ -38,6 +39,7 @@
 import org.openqa.selenium.remote.http.HttpResponse;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -60,6 +62,7 @@ class InMemorySession implements ActiveSession {
   private final Map<String, Object> capabilities;
   private final SessionId id;
   private final Dialect downstream;
+  private final TemporaryFilesystem filesystem;
   private final JsonHttpCommandHandler handler;
 
   private InMemorySession(WebDriver driver, Capabilities capabilities, Dialect downstream)
@@ -80,6 +83,9 @@ private InMemorySession(WebDriver driver, Capabilities capabilities, Dialect dow
     this.id = new SessionId(UUID.randomUUID().toString());
     this.downstream = Preconditions.checkNotNull(downstream);
 
+    File tempRoot = new File(StandardSystemProperty.JAVA_IO_TMPDIR.value(), id.toString());
+    this.filesystem = TemporaryFilesystem.getTmpFsBasedOn(tempRoot);
+
     this.handler = new JsonHttpCommandHandler(
         new PretendDriverSessions(),
         LOG);
@@ -110,6 +116,11 @@ public Map<String, Object> getCapabilities() {
     return capabilities;
   }
 
+  @Override
+  public TemporaryFilesystem getFileSystem() {
+    return filesystem;
+  }
+
   @Override
   public void stop() {
     driver.quit();

java/server/src/org/openqa/selenium/remote/server/ServicedSession.java

@@ -20,12 +20,13 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
+import com.google.common.base.StandardSystemProperty;
+
 import org.openqa.selenium.SessionNotCreatedException;
+import org.openqa.selenium.io.TemporaryFilesystem;
 import org.openqa.selenium.net.PortProber;
-import org.openqa.selenium.remote.Command;
 import org.openqa.selenium.remote.CommandCodec;
 import org.openqa.selenium.remote.Dialect;
-import org.openqa.selenium.remote.DriverCommand;
 import org.openqa.selenium.remote.ProtocolHandshake;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.ResponseCodec;
@@ -41,6 +42,7 @@
 import org.openqa.selenium.remote.internal.ApacheHttpClient;
 import org.openqa.selenium.remote.service.DriverService;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Method;
@@ -55,10 +57,11 @@ class ServicedSession implements ActiveSession {
 
   private final DriverService service;
   private final SessionId id;
-  private Dialect downstream;
-  private Dialect upstream;
+  private final Dialect downstream;
+  private final Dialect upstream;
   private final SessionCodec codec;
   private final Map<String, Object> capabilities;
+  private final TemporaryFilesystem filesystem;
 
   public ServicedSession(
       DriverService service,
@@ -73,6 +76,9 @@ public ServicedSession(
     this.codec = codec;
     this.id = id;
     this.capabilities = capabilities;
+
+    File tempRoot = new File(StandardSystemProperty.JAVA_IO_TMPDIR.value(), id.toString());
+    this.filesystem = TemporaryFilesystem.getTmpFsBasedOn(tempRoot);
   }
 
 
@@ -101,6 +107,11 @@ public Map<String, Object> getCapabilities() {
     return capabilities;
   }
 
+  @Override
+  public TemporaryFilesystem getFileSystem() {
+    return filesystem;
+  }
+
   @Override
   public void stop() {
     // Try and kill the running session. Both W3C and OSS use the same quit endpoint

java/server/src/org/openqa/selenium/remote/server/commandhandler/UploadFile.java

@@ -0,0 +1,70 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC licenses this file
+// to you 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 org.openqa.selenium.remote.server.commandhandler;
+
+import com.google.gson.Gson;
+
+import org.openqa.selenium.WebDriverException;
+import org.openqa.selenium.io.Zip;
+import org.openqa.selenium.remote.ErrorCodes;
+import org.openqa.selenium.remote.Response;
+import org.openqa.selenium.remote.http.HttpRequest;
+import org.openqa.selenium.remote.http.HttpResponse;
+import org.openqa.selenium.remote.server.ActiveSession;
+import org.openqa.selenium.remote.server.CommandHandler;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+
+public class UploadFile implements CommandHandler {
+
+  private final Gson gson;
+  private final ActiveSession session;
+
+  public UploadFile(Gson gson, ActiveSession session) {
+    this.gson = Objects.requireNonNull(gson);
+    this.session = Objects.requireNonNull(session);
+  }
+
+  @Override
+  public void execute(HttpRequest req, HttpResponse resp) throws IOException {
+    Map<?, ?> args = gson.fromJson(req.getContentString(), Map.class);
+    String file = (String) args.get("file");
+
+    File tempDir = session.getFileSystem().createTempDir("upload", "file");
+
+    Zip.unzip(file, tempDir);
+    // Select the first file
+    File[] allFiles = tempDir.listFiles();
+
+    Response response = new Response(session.getId());
+    if (allFiles == null || allFiles.length != 1) {
+      response.setStatus(ErrorCodes.UNHANDLED_ERROR);
+      response.setValue(new WebDriverException(
+          "Expected there to be only 1 file. There were: " +
+          (allFiles == null ? 0 : allFiles.length)));
+    } else {
+      response.setStatus(ErrorCodes.SUCCESS);
+      response.setValue(allFiles[0].getAbsolutePath());
+    }
+
+    session.getDownstreamDialect().getResponseCodec().encode(() -> resp, response);
+  }
+}

java/server/test/org/openqa/selenium/remote/server/BUCK

@@ -15,6 +15,7 @@ java_test(name = 'small-tests',
 java_library(name = 'tests',
   srcs = glob([
     '*.java',
+    'commandhandler/*.java',
     'handler/**/*.java',
     'rest/*.java',
     'xdrpc/*.java',

java/server/test/org/openqa/selenium/remote/server/RemoteServerTests.java

@@ -45,6 +45,7 @@
     SyntheticNewSessionPayloadTest.class,
     TeeReaderTest.class,
     UploadFileTest.class,
+    org.openqa.selenium.remote.server.commandhandler.UploadFileTest.class,
     ConfigureTimeoutTest.class,
     UrlTemplateTest.class,
     UtilsTest.class