PhpStorm was lost with Git changes

Author: Minishlink

src/Encryption.php

@@ -21,20 +21,22 @@ final class Encryption
 
     /**
      * @param string $payload
-     * @param bool $automatic
+     * @param bool   $automatic
+     *
      * @return string padded payload (plaintext)
      */
     public static function padPayload($payload, $automatic)
     {
         $payloadLen = Utils::safe_strlen($payload);
         $padLen = $automatic ? self::MAX_PAYLOAD_LENGTH - $payloadLen : 0;
+
         return pack('n*', $padLen).str_pad($payload, $padLen + $payloadLen, chr(0), STR_PAD_LEFT);
     }
 
     /**
-     * @param string $payload With padding
-     * @param string $userPublicKey Base 64 encoded (MIME or URL-safe)
-     * @param string $userAuthToken Base 64 encoded (MIME or URL-safe)
+     * @param string $payload          With padding
+     * @param string $userPublicKey    Base 64 encoded (MIME or URL-safe)
+     * @param string $userAuthToken    Base 64 encoded (MIME or URL-safe)
      * @param bool   $nativeEncryption Use OpenSSL (>PHP7.1)
      *
      * @return array
@@ -84,7 +86,7 @@ public static function encrypt($payload, $userPublicKey, $userAuthToken, $native
         // encrypt
         // "The additional data passed to each invocation of AEAD_AES_128_GCM is a zero-length octet sequence."
         if (!$nativeEncryption) {
-            list($encryptedText, $tag) = \AESGCM\AESGCM::encrypt($contentEncryptionKey, $nonce, $payload, "");
+            list($encryptedText, $tag) = \AESGCM\AESGCM::encrypt($contentEncryptionKey, $nonce, $payload, '');
         } else {
             $encryptedText = openssl_encrypt($payload, 'aes-128-gcm', $contentEncryptionKey, OPENSSL_RAW_DATA, $nonce, $tag); // base 64 encoded
         }
@@ -98,7 +100,7 @@ public static function encrypt($payload, $userPublicKey, $userAuthToken, $native
     }
 
     /**
-     * HMAC-based Extract-and-Expand Key Derivation Function (HKDF)
+     * HMAC-based Extract-and-Expand Key Derivation Function (HKDF).
      *
      * This is used to derive a secure encryption key from a mostly-secure shared
      * secret.
@@ -114,6 +116,7 @@ public static function encrypt($payload, $userPublicKey, $userAuthToken, $native
      * @param $ikm string Input keying material
      * @param $info string Application-specific context
      * @param $length int The length (in bytes) of the required output key
+     *
      * @return string
      */
     private static function hkdf($salt, $ikm, $info, $length)
@@ -129,11 +132,13 @@ private static function hkdf($salt, $ikm, $info, $length)
      * Creates a context for deriving encyption parameters.
      * See section 4.2 of
      * {@link https://tools.ietf.org/html/draft-ietf-httpbis-encryption-encoding-00}
-     * From {@link https://github.com/GoogleChrome/push-encryption-node/blob/master/src/encrypt.js}
+     * From {@link https://github.com/GoogleChrome/push-encryption-node/blob/master/src/encrypt.js}.
      *
      * @param $clientPublicKey string The client's public key
      * @param $serverPublicKey string Our public key
+     *
      * @return string
+     *
      * @throws \ErrorException
      */
     private static function createContext($clientPublicKey, $serverPublicKey)
@@ -155,14 +160,17 @@ private static function createContext($clientPublicKey, $serverPublicKey)
     /**
      * Returns an info record. See sections 3.2 and 3.3 of
      * {@link https://tools.ietf.org/html/draft-ietf-httpbis-encryption-encoding-00}
-     * From {@link https://github.com/GoogleChrome/push-encryption-node/blob/master/src/encrypt.js}
+     * From {@link https://github.com/GoogleChrome/push-encryption-node/blob/master/src/encrypt.js}.
      *
      * @param $type string The type of the info record
      * @param $context string The context for the record
+     *
      * @return string
+     *
      * @throws \ErrorException
      */
-    private static function createInfo($type, $context) {
+    private static function createInfo($type, $context)
+    {
         if (Utils::safe_strlen($context) !== 135) {
             throw new \ErrorException('Context argument has invalid size');
         }

src/Notification.php

@@ -25,7 +25,7 @@ class Notification
     /** @var string */
     private $userAuthToken;
 
-    /** @var array Options : TTL, urgency, topic **/
+    /** @var array Options : TTL, urgency, topic * */
     private $options;
 
     public function __construct($endpoint, $payload, $userPublicKey, $userAuthToken, $options)
@@ -71,16 +71,16 @@ public function getUserAuthToken()
 
     /**
      * @param array $defaultOptions
+     *
      * @return array
      */
     public function getOptions(array $defaultOptions = array())
     {
         $options = $this->options;
-        $options['TTL'] = array_key_exists('TTL', $options) ?  $options['TTL'] : $defaultOptions['TTL'];
+        $options['TTL'] = array_key_exists('TTL', $options) ? $options['TTL'] : $defaultOptions['TTL'];
         $options['urgency'] = array_key_exists('urgency', $options) ? $options['urgency'] : $defaultOptions['urgency'];
         $options['topic'] = array_key_exists('topic', $options) ? $options['topic'] : $defaultOptions['topic'];
 
         return $options;
     }
-
 }

src/Utils.php

@@ -13,7 +13,8 @@
 
 class Utils
 {
-    public static function safe_strlen($string) {
-        return mb_strlen($string, "8bit");
+    public static function safe_strlen($string)
+    {
+        return mb_strlen($string, '8bit');
     }
 }

src/VAPID.php

@@ -14,8 +14,6 @@
 use Base64Url\Base64Url;
 use Jose\Factory\JWKFactory;
 use Jose\Factory\JWSFactory;
-use Jose\Object\JWK;
-use Mdanter\Ecc\Curves\NistCurve;
 use Mdanter\Ecc\EccFactory;
 use Mdanter\Ecc\Serializer\PrivateKey\DerPrivateKeySerializer;
 use Mdanter\Ecc\Serializer\PrivateKey\PemPrivateKeySerializer;

tests/VAPIDTest.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the WebPush library.
+ *
+ * (c) Louis Lagrange <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Minishlink\WebPush\VAPID;
+
+class VAPIDTest extends PHPUnit_Framework_TestCase
+{
+    public function vapidProvider()
+    {
+        return array(
+            array(
+                'http://push.com',
+                array(
+                    'subject' => 'http://test.com',
+                    'publicKey' => 'BA6jvk34k6YjElHQ6S0oZwmrsqHdCNajxcod6KJnI77Dagikfb--O_kYXcR2eflRz6l3PcI2r8fPCH3BElLQHDk',
+                    'privateKey' => '-3CdhFOqjzixgAbUSa0Zv9zi-dwDVmWO7672aBxSFPQ',
+                ),
+                '1475452165',
+                'WebPush eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJhdWQiOiJodHRwOi8vcHVzaC5jb20iLCJleHAiOjE0NzU0NTIxNjUsInN1YiI6Imh0dHA6Ly90ZXN0LmNvbSJ9.4F3ZKjeru4P9XM20rHPNvGBcr9zxhz8_ViyNfe11_xcuy7A9y7KfEPt6yuNikyW7eT9zYYD5mQZubDGa-5H2cA',
+                'p256ecdsa=BA6jvk34k6YjElHQ6S0oZwmrsqHdCNajxcod6KJnI77Dagikfb--O_kYXcR2eflRz6l3PcI2r8fPCH3BElLQHDk',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider vapidProvider
+     *
+     * @param $audience
+     * @param $vapid
+     * @param $expiration
+     * @param $expectedAuthorization
+     * @param $expectedCryptoKey
+     */
+    public function testGetVapidHeaders($audience, $vapid, $expiration, $expectedAuthorization, $expectedCryptoKey)
+    {
+        $vapid = VAPID::validate($vapid);
+        $headers = VAPID::getVapidHeaders($audience, $vapid['subject'], $vapid['publicKey'], $vapid['privateKey'], $expiration);
+
+        $this->assertArrayHasKey('Authorization', $headers);
+        $this->assertEquals($expectedAuthorization, $headers['Authorization']);
+        $this->assertArrayHasKey('Crypto-Key', $headers);
+        $this->assertEquals($expectedCryptoKey, $headers['Crypto-Key']);
+    }
+}