Shutdown hijacked stdin

bsideup · bsideup · commit a356f66c0454 · 2021-03-26T11:13:47.000+01:00
Fixes #1448
diff --git a/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java b/docker-java-transport-httpclient5/src/main/java/com/github/dockerjava/httpclient5/HijackingHttpRequestExecutor.java
@@ -1,5 +1,6 @@
 package com.github.dockerjava.httpclient5;
 
+import org.apache.hc.client5.http.io.ManagedHttpClientConnection;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ConnectionReuseStrategy;
@@ -80,6 +81,9 @@ private ClassicHttpResponse executeHijacked(
                     fakeRequest.setHeader(HttpHeaders.CONTENT_LENGTH, Long.MAX_VALUE);
                     fakeRequest.setEntity(new HijackedEntity(hijackedInput));
                     conn.sendRequestEntity(fakeRequest);
+                    if (conn instanceof ManagedHttpClientConnection) {
+                        ((ManagedHttpClientConnection) conn).getSocket().shutdownOutput();
+                    }
                 } catch (Exception e) {
                     throw new RuntimeException(e);
                 }
diff --git a/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java b/docker-java-transport-okhttp/src/main/java/com/github/dockerjava/okhttp/HijackingInterceptor.java
@@ -49,6 +49,7 @@ public Response intercept(Chain chain) throws IOException {
                     sink.writeByte(aByte);
                     sink.emit();
                 }
+                exchange.connection().socket().shutdownOutput();
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
diff --git a/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java b/docker-java-transport/src/main/java/com/github/dockerjava/transport/DomainSocket.java
@@ -105,6 +105,32 @@ public OutputStream getOutputStream() {
         return this.outputStream;
     }
 
+    @Override
+    public void shutdownInput() throws IOException {
+        try (Handle handle = this.fileDescriptor.acquire()) {
+            if (!handle.isClosed()) {
+                try {
+                    shutdown(handle.intValue(), SHUT_RD);
+                } catch (LastErrorException ex) {
+                    throw new IOException(ex);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void shutdownOutput() throws IOException {
+        try (Handle handle = this.fileDescriptor.acquire()) {
+            if (!handle.isClosed()) {
+                try {
+                    shutdown(handle.intValue(), SHUT_WR);
+                } catch (LastErrorException ex) {
+                    throw new IOException(ex);
+                }
+            }
+        }
+    }
+
     @Override
     public void close() throws IOException {
         super.close();
@@ -123,6 +149,8 @@ public void close() throws IOException {
 
     private native int write(int fd, ByteBuffer buffer, int count) throws LastErrorException;
 
+    private native int shutdown(int fd, int how) throws LastErrorException;
+
     private native int close(int fd) throws LastErrorException;
 
     /**
diff --git a/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java b/docker-java/src/test/java/com/github/dockerjava/cmd/AttachContainerCmdIT.java
@@ -17,6 +17,7 @@
 import java.io.InputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -281,6 +282,56 @@ public void onComplete() {
         }
     }
 
+    /**
+     * The process in Docker container should receive EOF when reading its
+     * stdin after the corresponding stream is closed on docker-java side in
+     * case when the container has been created with StdinOnce flag set to
+     * true.
+     */
+    @Test
+    public void closeStdinWithStdinOnce() throws Exception {
+        Assume.assumeTrue("supports stdin attach", getFactoryType().supportsStdinAttach());
+
+        DockerClient dockerClient = dockerRule.getClient();
+
+        CreateContainerResponse container = dockerClient.createContainerCmd(DEFAULT_IMAGE)
+            .withStdinOpen(true)
+            .withStdInOnce(true)
+            .withCmd("sh", "-c", "read -r line; echo Done")
+            .exec();
+
+        CountDownLatch done = new CountDownLatch(1);
+        PipedOutputStream stdin = new PipedOutputStream();
+
+        try (
+            ResultCallback.Adapter<Frame> resultCallback = dockerClient.attachContainerCmd(container.getId())
+                .withStdIn(new PipedInputStream(stdin))
+                .withStdOut(true)
+                .withFollowStream(true)
+                .exec(new ResultCallback.Adapter<Frame>() {
+                    @Override
+                    public void onNext(Frame frame) {
+                        if (frame.toString().contains("Done")) {
+                            done.countDown();
+                        }
+                    }
+                })
+        ) {
+            resultCallback.awaitStarted(5, SECONDS);
+            dockerClient.startContainerCmd(container.getId()).exec();
+
+            stdin.write("Hello".getBytes(StandardCharsets.UTF_8));
+            stdin.close();
+
+            assertTrue("Should detect closed stdin", done.await(5, SECONDS));
+
+            assertTrue(
+                "The script should finish quickly after stdin is closed on docker-java side",
+                resultCallback.awaitCompletion(5, SECONDS)
+            );
+        }
+    }
+
     public static class AttachContainerTestCallback extends ResultCallback.Adapter<Frame> {
         private final StringBuffer log = new StringBuffer();
 

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ public Response intercept(Chain chain) throws IOException {`
`49`	`49`	`sink.writeByte(aByte);`
`50`	`50`	`sink.emit();`
`51`	`51`	`}`
	`52`	`+ exchange.connection().socket().shutdownOutput();`
`52`	`53`	`} catch (Exception e) {`
`53`	`54`	`throw new RuntimeException(e);`
`54`	`55`	`}`