wait #5757 @1.5

diff --git a/.docker/images/php/Dockerfile b/.docker/images/php/Dockerfile
index 1de25a14455ec2f7bf514149d8a432ab59c41362..6fe9437d8cebf39df4152bc157205e1a179549e5 100644 (file)
--- a/.docker/images/php/Dockerfile
+++ b/.docker/images/php/Dockerfile
@@ -70,6 +70,7 @@ RUN apt -y --no-install-recommends install libreoffice
 RUN apt -y --no-install-recommends install sshfs lftp
 RUN apt -y --no-install-recommends install sshfs python3 python3-pip
 RUN apt -y --no-install-recommends install openssh-server rsyslog
+RUN apt update
 RUN apt -y --no-install-recommends install mariadb-client
 RUN apt -y --no-install-recommends install pdfposter rename
 

diff --git a/composer.json b/composer.json
index 83616219f88f7a27e97ce67ae4940b828f8f16bd..3a0cc081384fb34b596ec96c21ccb380506f04cd 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,7 @@
     "hollodotme/fast-cgi-client": "^3.1",\r
     "cubist/azuretts": "dev-master",\r
     "ext-zip": "*",\r
-    "cubist/matomo": "dev-master"\r
+    "cubist/matomo": "dev-master",\r
+    "ext-ssh2": "*"\r
   }\r
 }\r

diff --git a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
index 6ea58d1dee7119e197b4a10fc3becd0f6c303659..99ee1f205468b5a002553e6739f1504eb6a437d9 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
+++ b/inc/ws/Util/packager/class.ws.packager.win.exe.html.php
@@ -41,7 +41,7 @@ class wsPackagerWinEXEHTML extends wsPackager
         $this->copyFluidbookFiles();\r
         $this->makeJSON();\r
 \r
-        $this->buildPath = wsBook::getPackagerDir($this->book_id,true) . '/nwbuild/' . $this->version . '/' . $this->book_id;\r
+        $this->buildPath = wsBook::getPackagerDir($this->book_id, true) . '/nwbuild/' . $this->version . '/' . $this->book_id;\r
 \r
         `umask 0000;rm -rf $this->buildPath;mkdir -p 0777 $this->buildPath;chmod -R 777 $this->vdir;mkdir -p 0777 /application/tmp;chmod -R 777 /application/tmp`;\r
 \r
@@ -89,15 +89,22 @@ class wsPackagerWinEXEHTML extends wsPackager
 \r
     function _sign($exe)\r
     {\r
+        $ssh = new CubeIT_Networking_SSH2('paris.cubedesigners.com', 'vince', 'Y@mUC9mY2DOYWXkN', '22422');\r
         $rand = 'sign-' . rand(1000000, 9999999) . '.exe';\r
-        copy($exe, '/mnt/sshfs/codesign/' . $rand);\r
+        $remote = 'C:/Sign/' . $rand;\r
+        $ssh->send($exe, $remote);\r
+        unlink($exe);\r
         $cli = new CubeIT_CommandLine('C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe');\r
-        $cli->setManualArg("sign /f C:/Users/vince/Documents/Cubedesigners.cer /csp \"eToken Base Cryptographic Provider\" /k \"[SafeNet Token JC 0{{TYWjZacq%hAH98}}]=54C3F1B91759268A\" /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /a C:/Sign/$rand");\r
-        $cli->execute(new CubeIT_Networking_SSH2('paris.cubedesigners.com', 'vince', 'Y@mUC9mY2DOYWXkN', '22422'));\r
+        $cli->setManualArg("sign /f C:/Users/vince/Documents/Cubedesigners.cer /csp \"eToken Base Cryptographic Provider\" /k \"[SafeNet Token JC 0{{TYWjZacq%hAH98}}]=54C3F1B91759268A\" /tr http://timestamp.sectigo.com /td sha256 /fd sha256 /a $remote");\r
+        $cli->execute($ssh);\r
         $cli->debug();\r
+        if (!stristr($cli->output, 'Successfully signed')) {\r
+            $ssh->unlink($remote);\r
+            throw new \Exception('Error while signing exe ' . $rand . ' : ' . $cli->command . ' /// ' . $cli->output);\r
+        }\r
+        $ssh->recv($remote, $exe);\r
+        $ssh->unlink($remote);\r
         sleep(2);\r
-        copy('/mnt/sshfs/codesign/' . $rand, $exe);\r
-        unlink('/mnt/sshfs/codesign/' . $rand);\r
     }\r
 \r
     function replaceFFMpeg()\r