- Fix for kubernetes-client#1826: Updated WebSocketStreamHandler.write() to calculate 'remaining' bytes using bufferSize from the current loop iteration instead of the cummulative bytesWritten.

PredatorVI · PredatorVI · commit eb6a351fade2 · 2021-08-20T10:07:41.000-06:00
- Related to kubernetes-client#1822: Removed the base64 encode/decode steps/streams per comment kubernetes-client#1822 (comment) - Unit test fix - Added path normalization to convert potential windows path delimiters to linux deliniters.
diff --git a/util/src/main/java/io/kubernetes/client/Copy.java b/util/src/main/java/io/kubernetes/client/Copy.java
@@ -34,7 +34,6 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.codec.binary.Base64InputStream;
-import org.apache.commons.codec.binary.Base64OutputStream;
 import org.apache.commons.compress.archivers.ArchiveEntry;
 import org.apache.commons.compress.archivers.ArchiveInputStream;
 import org.apache.commons.compress.archivers.ArchiveOutputStream;
@@ -365,8 +364,7 @@ public Future<Integer> copyFileToPodAsync(
     // Send encoded archive output stream
     File srcFile = new File(srcPath.toUri());
     try (ArchiveOutputStream archiveOutputStream =
-            new TarArchiveOutputStream(
-                new Base64OutputStream(proc.getOutputStream(), true, 0, null));
+            new TarArchiveOutputStream(proc.getOutputStream());
         FileInputStream input = new FileInputStream(srcFile)) {
       ArchiveEntry tarEntry = new TarArchiveEntry(srcFile, destPath.getFileName().toString());
 
@@ -398,7 +396,7 @@ public Future<Integer> copyFileToPodAsync(
     final Process proc = execCopyToPod(namespace, pod, container, destPath);
 
     try (ArchiveOutputStream archiveOutputStream =
-        new TarArchiveOutputStream(new Base64OutputStream(proc.getOutputStream(), true, 0, null))) {
+        new TarArchiveOutputStream(proc.getOutputStream())) {
 
       ArchiveEntry tarEntry = new TarArchiveEntry(new File(destPath.getFileName().toString()));
       ((TarArchiveEntry) tarEntry).setSize(src.length);
@@ -414,10 +412,11 @@ public Future<Integer> copyFileToPodAsync(
   private Process execCopyToPod(String namespace, String pod, String container, Path destPath)
       throws ApiException, IOException {
     String parentPath = destPath.getParent() != null ? destPath.getParent().toString() : ".";
+    parentPath = parentPath.replace("\\", "/");
     return this.exec(
         namespace,
         pod,
-        new String[] {"sh", "-c", "base64 -d | tar -xmf - -C " + parentPath},
+        new String[] {"sh", "-c", "tar -xmf - -C " + parentPath},
         container,
         true,
         false);
diff --git a/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java b/util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java
@@ -270,7 +270,7 @@ public void write(byte[] b, int offset, int length) throws IOException {
           throw new IOException("WebSocket has closed.");
         }
         bytesWritten += bufferSize;
-        remaining -= bytesWritten;
+        remaining -= bufferSize;
       }
     }
   }
diff --git a/util/src/test/java/io/kubernetes/client/CopyTest.java b/util/src/test/java/io/kubernetes/client/CopyTest.java
@@ -130,7 +130,7 @@ public void run() {
             .withQueryParam("tty", equalTo("false"))
             .withQueryParam("command", equalTo("sh"))
             .withQueryParam("command", equalTo("-c"))
-            .withQueryParam("command", equalTo("base64 -d | tar -xmf - -C /")));
+            .withQueryParam("command", equalTo("tar -xmf - -C /")));
   }
 
   @Test
@@ -176,7 +176,7 @@ public void run() {
             .withQueryParam("tty", equalTo("false"))
             .withQueryParam("command", equalTo("sh"))
             .withQueryParam("command", equalTo("-c"))
-            .withQueryParam("command", equalTo("base64 -d | tar -xmf - -C /")));
+            .withQueryParam("command", equalTo("tar -xmf - -C /")));
   }
 
   public void testCopyDirectoryFromPod() throws IOException, ApiException, InterruptedException {

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public void write(byte[] b, int offset, int length) throws IOException {`
`270`	`270`	`throw new IOException("WebSocket has closed.");`
`271`	`271`	`}`
`272`	`272`	`bytesWritten += bufferSize;`
`273`		`- remaining -= bytesWritten;`
	`273`	`+ remaining -= bufferSize;`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`	`}`