iss-4535

Changed to be much shorter as pointed out, manual still passes tests.
New test added
Changelog moved.

fabric8io#4535

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### 6.3-SNAPSHOT
 
 #### Bugs
+* Fix #4535: The shell command string will now have single quotes sanitized
 
 #### Improvements
 
@@ -15,7 +16,6 @@
 ### 6.2.0 (2022-10-20)
 
 #### Bugs
-* Fix #4535: The shell command string will now have single quotes sanitized
 * Fix #3733: The authentication command from the .kube/config won't be discarded if no arguments are specified
 * Fix #4312: fix timestamp can't be deserialized for IstioCondition
 * Fix #4369: Informers will retry with a backoff on list/watch failure as they did in 5.12 and prior.

kubernetes-client/src/main/java/io/fabric8/kubernetes/client/dsl/internal/core/v1/PodOperationsImpl.java

@@ -591,7 +591,7 @@ public BytesLimitTerminateTimeTailPrettyLoggable usingTimestamps() {
   }
 
   public static String shellQuote(String value) {
-    return "'" + value.replace("'", "\'\"\'\"\'") + "'";
+    return "'" + value.replace("'", "'\\''") + "'";
   }
 
   @Override

kubernetes-client/src/test/java/io/fabric8/kubernetes/client/dsl/internal/uploadable/PodUploadTest.java

@@ -186,7 +186,7 @@ void createExecCommandForUpload_withSingleQuoteInPath()
     String result = PodUpload.createExecCommandForUpload("/tmp/fo'o/cp.log");
 
     // Then
-    assertThat(result, equalTo("mkdir -p '/tmp/fo\'\"\'\"\'o' && base64 -d - > '/tmp/fo\'\"\'\"\'o/cp.log'"));
+    assertThat(result, equalTo("mkdir -p '/tmp/fo\'\\'\'o' && base64 -d - > '/tmp/fo\'\\'\'o/cp.log'"));
   }
 
   @Test
@@ -196,7 +196,7 @@ void createExecCommandForUpload_withMultipleSingleQuotesInPath()
     String result = PodUpload.createExecCommandForUpload("/tmp/f'o'o/c'p.log");
 
     // Then
-    assertThat(result, equalTo("mkdir -p '/tmp/f\'\"\'\"\'o\'\"\'\"\'o' && base64 -d - > '/tmp/f\'\"\'\"\'o\'\"\'\"\'o/c\'\"\'\"\'p.log'"));
+    assertThat(result, equalTo("mkdir -p '/tmp/f\'\\'\'o\'\\'\'o' && base64 -d - > '/tmp/f\'\\'\'o\'\\'\'o/c\'\\'\'p.log'"));
   }
 
   void uploadFileAndVerify(PodUploadTester<Boolean> fileUploadMethodToTest) throws IOException, InterruptedException {

kubernetes-itests/src/test/java/io/fabric8/kubernetes/PodIT.java

@@ -274,6 +274,7 @@ void uploadFile() throws IOException {
 
     assertUploaded("pod-standard", tmpFile, "/tmp/toBeUploaded");
     assertUploaded("pod-standard", tmpFile, "/tmp/001_special_!@#\\$^&(.mp4");
+    assertUploaded("pod-standard", tmpFile, "/tmp/002'special");
   }
 
   private void assertUploaded(String podName, final Path tmpFile, String filename) throws IOException {