Fixed space char on input filename

SSLcom · Nov 23, 2023 · 9ce4296 · 9ce4296
1 parent 51daed1
commit 9ce4296
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -49,6 +49,40 @@ jobs:
           name: sign.ps1
           path: ./artifacts/codesign.ps1
 
+  sign-input-space:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+    runs-on: ${{ matrix.os }}
+    needs: ['build']
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Create Input file for test signing
+        shell: bash
+        run: |
+          mkdir -p ${GITHUB_WORKSPACE}/example
+          cp "./sample/sample file.exe" "${GITHUB_WORKSPACE}/example/sample file.exe"
+
+      - uses: ./
+        with:
+          command: sign
+          username: ${{ secrets.ES_USERNAME }}
+          password: ${{ secrets.ES_PASSWORD }}
+          credential_id: ${{ secrets.CREDENTIAL_ID }}
+          totp_secret: ${{ secrets.ES_TOTP_SECRET }}
+          file_path: ${GITHUB_WORKSPACE}/example/sample file.exe
+          output_path: ${GITHUB_WORKSPACE}/artifacts
+          malware_block: false
+          environment_name: TEST
+          jvm_max_memory: 2048M
+
+      - name: Upload Signed Files
+        uses: actions/upload-artifact@v3
+        with:
+          name: sign-space.exe
+          path: ./artifacts/sample file.exe
+
   sign-override:
     strategy:
       matrix:

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/sample/sample file.exe b/sample/sample file.exe
diff --git a/src/setup-codesigner/codesigner.ts b/src/setup-codesigner/codesigner.ts
@@ -69,7 +69,7 @@ export class CodeSigner {
 
         let execCmd = path.join(archivePath, cmd);
         const execData = readFileSync(execCmd, { encoding: 'utf-8', flag: 'r' });
-        const result = execData.replace(/java -cp/g, `java -Xmx${jvmMaxMemory} -cp`);
+        const result = execData.replace(/java -jar/g, `java -Xmx${jvmMaxMemory} -jar`).replace(/\$@/g, `"\$@"`);
         core.info(`Exec Cmd Content: ${result}`);
         writeFileSync(execCmd, result, { encoding: 'utf-8', flag: 'w' });
         chmodSync(execCmd, '0755');

diff --git a/src/util.ts b/src/util.ts
@@ -133,10 +133,10 @@ export function setCommand(inputKey: string, command: string, action: string): s
         command = `${command} -program_name=${input}`;
     } else if (inputKey == INPUT_FILE_PATH) {
         input = path.normalize(input);
-        command = `${command} -input_file_path=${input}`;
+        command = `${command} -input_file_path="${input}"`;
     } else if (inputKey == INPUT_DIR_PATH) {
         input = path.normalize(input);
-        command = `${command} -input_dir_path=${input}`;
+        command = `${command} -input_dir_path="${input}"`;
     } else if (inputKey == INPUT_OUTPUT_PATH) {
         input = path.normalize(input);
         if (fs.existsSync(input)) {