Allow to pass middle params like -engine gost through toolPath

ekapusta · Sep 25, 2020 · b559eef · b559eef
1 parent eec4fc2
commit b559eef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/Security/Signer/OpensslCli.php b/src/Security/Signer/OpensslCli.php
@@ -8,6 +8,7 @@
 class OpensslCli extends Signer
 {
     private $toolPath;
+    private $middleParams;
 
     public function __construct(
         $certificatePath,
@@ -16,13 +17,18 @@ public function __construct(
         $toolPath = 'openssl'
     ) {
         parent::__construct($certificatePath, $privateKeyPath, $privateKeyPassword);
+        if (is_array($toolPath) && count($toolPath) == 2) {
+            $this->middleParams = end($toolPath);
+            $toolPath = reset($toolPath);
+        }
         $this->toolPath = $toolPath;
     }
 
     public function sign($message)
     {
         return $this->runParameters([
             'smime -sign -binary -outform DER -noattr',
+            $this->middleParams,
             '-signer '.escapeshellarg($this->certificatePath),
             '-inkey '.escapeshellarg($this->privateKeyPath),
             '-passin '.escapeshellarg('pass:'.$this->privateKeyPassword),

diff --git a/tests/Provider/EsiaProviderTest.php b/tests/Provider/EsiaProviderTest.php
@@ -42,7 +42,7 @@ protected function setUp()
             Factory::KEYS.$certificate,
             Factory::KEYS.$privateKey,
             null,
-            getenv('ESIA_CLIENT_OPENSSL_TOOL_PATH') ?: 'openssl'
+            getenv('ESIA_CLIENT_OPENSSL_TOOL_PATH') ?: ['openssl', '-engine gost']
         );
         $this->provider = new EsiaProvider([
             'clientId' => 'EKAP01',

diff --git a/tests/Security/Signer/OpensslCliTest.php b/tests/Security/Signer/OpensslCliTest.php
@@ -17,7 +17,7 @@ protected function create(
             $certificatePath ?: $this->pathToCertificate(),
             $privateKeyPath ?: Factory::KEYS.'ekapusta.gost.test.key',
             $privateKeyPassword,
-            getenv('ESIA_CLIENT_OPENSSL_TOOL_PATH') ?: 'openssl'
+            getenv('ESIA_CLIENT_OPENSSL_TOOL_PATH') ?: ['openssl', '-engine gost']
         );
     }