Merge pull request #124 from plesk/Add-test-for-update-certificate

Add test for Update Certificate

Author: xgin

src/Api/Operator/Certificate.php

@@ -21,19 +21,49 @@ public function generate(array $properties): Struct\Info
         return new Struct\Info($response);
     }
 
-    public function install(array $properties, string $request, string $privateKey): bool
+    /**
+     * @param array $properties
+     * @param string|Struct\Info $certificate
+     * @param string|null $privateKey
+     */
+    public function install(array $properties, $certificate, ?string $privateKey = null): bool
+    {
+        return $this->callApi('install', $properties, $certificate, $privateKey);
+    }
+
+    /**
+     * @param array $properties
+     * @param Struct\Info $certificate
+     */
+    public function update(array $properties, Struct\Info $certificate): bool
+    {
+        return $this->callApi('update', $properties, $certificate);
+    }
+
+    /**
+     * @param string $method
+     * @param array $properties
+     * @param string|Struct\Info $certificate
+     * @param string|null $privateKey
+     */
+    private function callApi(string $method, array $properties, $certificate, ?string $privateKey = null): bool
     {
         $packet = $this->client->getPacket();
 
-        $installTag = $packet->addChild($this->wrapperTag)->addChild('install');
+        $installTag = $packet->addChild($this->wrapperTag)->addChild($method);
         foreach ($properties as $name => $value) {
             $installTag->{$name} = $value;
         }
 
         $contentTag = $installTag->addChild('content');
-        $contentTag->addChild('csr', $request);
-        $contentTag->addChild('pvt', $privateKey);
-
+        if (is_string($certificate)) {
+            $contentTag->addChild('csr', $certificate);
+            $contentTag->addChild('pvt', $privateKey);
+        } elseif ($certificate instanceof \PleskX\Api\Struct\Certificate\Info) {
+            foreach ($certificate->getMapping() as $name => $value) {
+                $contentTag->{$name} = $value;
+            }
+        }
         $result = $this->client->request($packet);
 
         return 'ok' == (string) $result->status;

src/Api/Struct/Certificate/Info.php

@@ -7,14 +7,32 @@
 
 class Info extends AbstractStruct
 {
-    public string $request;
-    public string $privateKey;
+    public ?string $request = null;
+    public ?string $privateKey = null;
+    public ?string $publicKey = null;
+    public ?string $publicKeyCA = null;
 
-    public function __construct(\SimpleXMLElement $apiResponse)
+    public function __construct($input)
     {
-        $this->initScalarProperties($apiResponse, [
-            ['csr' => 'request'],
-            ['pvt' => 'privateKey'],
+        if ($input instanceof \SimpleXMLElement) {
+            $this->initScalarProperties($input, [
+                ['csr' => 'request'],
+                ['pvt' => 'privateKey'],
+            ]);
+        } else {
+            foreach ($input as $name => $value) {
+                $this->$name = $value;
+            }
+        }
+    }
+
+    public function getMapping(): array
+    {
+        return array_filter([
+            'csr' => $this->request,
+            'pvt' => $this->privateKey,
+            'cert' => $this->publicKey,
+            'ca' => $this->publicKeyCA,
         ]);
     }
 }

tests/CertificateTest.php

@@ -3,6 +3,8 @@
 
 namespace PleskXTest;
 
+use PleskX\Api\Struct\Certificate as Struct;
+
 class CertificateTest extends AbstractTestCase
 {
     private array $certificateProperties = [
@@ -14,6 +16,13 @@ class CertificateTest extends AbstractTestCase
         'email' => 'info@plesk.com',
         'name' => 'plesk.com',
     ];
+    private array $distinguishedNames = [
+        "countryName" => "CH",
+        "stateOrProvinceName" => "Schaffhausen",
+        "localityName" => "Schaffhausen",
+        "organizationName" => "Plesk",
+        "emailAddress" => "info@plesk.com"
+    ];
 
     public function testGenerate()
     {
@@ -37,16 +46,52 @@ public function testInstall()
         static::$client->certificate()->delete('test', ['admin' => true]);
     }
 
+    public function testUpdate()
+    {
+        $payLoad = [
+            'name' => 'test',
+            'admin' => true,
+        ];
+        $certificate = static::$client->certificate()->generate($this->certificateProperties);
+        static::$client->certificate()->install($payLoad, $certificate);
+
+        $certificate = $this->generateCertificateOpenSsl($this->distinguishedNames);
+        $result = static::$client->certificate()->update($payLoad, $certificate);
+        $this->assertTrue($result);
+
+        static::$client->certificate()->delete('test', ['admin' => true]);
+    }
+
     public function testDelete()
     {
         $certificate = static::$client->certificate()->generate($this->certificateProperties);
 
         static::$client->certificate()->install([
             'name' => 'test',
             'admin' => true,
-        ], $certificate->request, $certificate->privateKey);
+        ], $certificate);
 
         $result = static::$client->certificate()->delete('test', ['admin' => true]);
         $this->assertTrue($result);
     }
+
+    private function generateCertificateOpenSsl(array $dn): Struct\Info
+    {
+        $privkey = openssl_pkey_new([
+            "private_key_bits" => 2048,
+            "private_key_type" => OPENSSL_KEYTYPE_RSA,
+        ]);
+        $csr = openssl_csr_new($dn, $privkey, ['digest_alg' => 'sha256']);
+        $x509 = openssl_csr_sign($csr, null, $privkey, $days = 365, ['digest_alg' => 'sha256']);
+
+        openssl_csr_export($csr, $csrout);
+        openssl_x509_export($x509, $certout);
+        openssl_pkey_export($privkey, $pkeyout);
+
+        return new Struct\Info([
+            'publicKey' => $certout,
+            'request' => $csrout,
+            'privateKey' => $pkeyout
+        ]);
+    }
 }