use safe mb_strlen instead of strlen (for mbstring func overload errors)

Author: Minishlink

src/Encryption.php

@@ -26,7 +26,7 @@ final class Encryption
      */
     public static function padPayload($payload, $automatic)
     {
-        $payloadLen = strlen($payload);
+        $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);
     }
@@ -138,12 +138,12 @@ private static function hkdf($salt, $ikm, $info, $length)
      */
     private static function createContext($clientPublicKey, $serverPublicKey)
     {
-        if (strlen($clientPublicKey) !== 65) {
+        if (Utils::safe_strlen($clientPublicKey) !== 65) {
             throw new \ErrorException('Invalid client public key length');
         }
 
         // This one should never happen, because it's our code that generates the key
-        if (strlen($serverPublicKey) !== 65) {
+        if (Utils::safe_strlen($serverPublicKey) !== 65) {
             throw new \ErrorException('Invalid server public key length');
         }
 
@@ -163,7 +163,7 @@ private static function createContext($clientPublicKey, $serverPublicKey)
      * @throws \ErrorException
      */
     private static function createInfo($type, $context) {
-        if (strlen($context) !== 135) {
+        if (Utils::safe_strlen($context) !== 135) {
             throw new \ErrorException('Context argument has invalid size');
         }
 

src/Utils.php

@@ -0,0 +1,19 @@
+<?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.
+ */
+
+namespace Minishlink\WebPush;
+
+class Utils
+{
+    public static function safe_strlen($string) {
+        return mb_strlen($string, "8bit");
+    }
+}

src/WebPush.php

@@ -75,7 +75,7 @@ public function __construct(array $apiKeys = array(), $defaultOptions = array(),
     public function sendNotification($endpoint, $payload = null, $userPublicKey = null, $userAuthToken = null, $flush = false, $options = array())
     {
         if(isset($payload)) {
-            if (strlen($payload) > Encryption::MAX_PAYLOAD_LENGTH) {
+            if (Utils::safe_strlen($payload) > Encryption::MAX_PAYLOAD_LENGTH) {
                 throw new \ErrorException('Size of payload must not be greater than '.Encryption::MAX_PAYLOAD_LENGTH.' octets.');
             }
 
@@ -178,7 +178,7 @@ private function prepareAndSend(array $notifications)
                 $encrypted = Encryption::encrypt($payload, $userPublicKey, $userAuthToken, $this->nativePayloadEncryptionSupport);
 
                 $headers = array(
-                    'Content-Length' => strlen($encrypted['cipherText']),
+                    'Content-Length' => Utils::safe_strlen($encrypted['cipherText']),
                     'Content-Type' => 'application/octet-stream',
                     'Content-Encoding' => 'aesgcm',
                     'Encryption' => 'keyid="p256dh";salt="'.$encrypted['salt'].'"',
@@ -204,7 +204,7 @@ private function prepareAndSend(array $notifications)
                 $headers['Topic'] = $options['topic'];
             }
 
-            if (substr($endpoint, 0, strlen(self::GCM_URL)) === self::GCM_URL) {
+            if (substr($endpoint, 0, Utils::safe_strlen(self::GCM_URL)) === self::GCM_URL) {
                 if (array_key_exists('GCM', $this->apiKeys)) {
                     $headers['Authorization'] = 'key='.$this->apiKeys['GCM'];
                 } else {

tests/EncryptionTest.php

@@ -10,6 +10,7 @@
  */
 
 use Minishlink\WebPush\Encryption;
+use Minishlink\WebPush\Utils;
 
 class EncryptionTest extends PHPUnit_Framework_TestCase
 {
@@ -23,13 +24,13 @@ public function testPadPayload($payload)
         $res = Encryption::padPayload($payload, true);
 
         $this->assertContains('test', $res);
-        $this->assertEquals(4080, strlen($res));
+        $this->assertEquals(4080, Utils::safe_strlen($res));
     }
 
     public function payloadProvider()
     {
         return array(
-            array('test'),
+            array('testé'),
             array(str_repeat('test', 1019)),
             array(str_repeat('test', 1019).'te'),
         );