Add password field

[userbundle] / Utils / Slugger.php

diff --git a/Utils/Slugger.php b/Utils/Slugger.php
index f3d8e258b017cb78153a2feea6f53b7a9de8ba32..f0438b60e4fa2a2687e42c660495e4adacb62c7c 100644 (file)
--- a/Utils/Slugger.php
+++ b/Utils/Slugger.php
@@ -2,83 +2,189 @@
 
 namespace Rapsys\UserBundle\Utils;
 
 
 namespace Rapsys\UserBundle\Utils;
 

+use Symfony\Component\DependencyInjection\ContainerInterface;
+

 class Slugger {
        //The secret parameter
        private $secret;
 
 class Slugger {
        //The secret parameter
        private $secret;
 

+       //The alpha array
+       private $alpha;
+
+       //The rev array
+       private $rev;
+
+       //The alpha array key number
+       private $count;
+

        //The offset reduced from secret
        private $offset;
 
        //Retrieve secret and set offset from reduction
        //The offset reduced from secret
        private $offset;
 
        //Retrieve secret and set offset from reduction

-       public function __construct(\Symfony\Component\DependencyInjection\ContainerInterface $container) {
+       public function __construct(ContainerInterface $container) {

                //Set secret
                //Set secret

-               $this->secret = $container->getParameter('secret');
+               $this->secret = $_SERVER['APP_SECRET'] ?? $container->getParameter('kernel.secret');
+
+               //Pseudo-random alphabet
+               //XXX: use array flip and keys to workaround php "smart" that cast range('0', '9') as int instead of string
+               //XXX: The key count mismatch, count(alpha)>count(rev), resulted in a data corruption due to duplicate numeric values
+               //TODO: set this as a parameter generated once in a command ?
+               $this->alpha = array_keys(array_flip(array_merge(
+                       range('^', '[', -1),
+                       range('V', 'Z'),
+                       range('9', '7', -1),
+                       range('L', 'O'),
+                       range('f', 'a', -1),
+                       range('_', '`'),
+                       range('3', '0', -1),
+                       range('E', 'H'),
+                       range('v', 'r', -1),
+                       range('+', '/'),
+                       range('K', 'I', -1),
+                       range('g', 'j'),
+                       range('=', ':', -1),
+                       range('>', '@'),
+                       range('m', 'k', -1),
+                       range('4', '6'),
+                       range('*', '%', -1),
+                       range('n', 'q'),
+                       range('U', 'P', -1),
+                       range(' ', '$'),
+                       range('D', 'A', -1),
+                       range('w', 'z'),
+                       range('~', '!', -1)
+               )));

 
                //Init rev array
 
                //Init rev array

-               $rev = array_flip(array_merge(range('0', '9'), range('a', 'z'), range('A', 'Z'), range('!', '~')));
+               $this->count = count($rev = $this->rev = array_flip($this->alpha));
+
+               //Init split
+               $split = str_split($this->secret);

 
                //Set offset
 
                //Set offset

-               $this->offset = array_reduce(str_split($this->secret), function ($res, $a) use ($rev) { return $res += $rev[$a]; }, count($this->secret)) % count($rev);
+               $this->offset = array_reduce($split, function ($res, $a) use ($rev) { return $res += $rev[$a]; }, count($split)) % $this->count;

        }
 
        }
 

-       //Short the string
-       public function short($string) {
-               //Return string
-               $ret = '';
+       /**
+        * Flatten recursively an array
+        *
+        * @param array $data The data tree
+        * @param string|null $current The current prefix
+        * @param string $sep The key separator
+        * @param string $prefix The key prefix
+        * @param string $suffix The key suffix
+        * @return array The flattened data
+        */
+       public function flatten($data, $current = null, $sep = '.', $prefix = '', $suffix = '') {
+               //Init result
+               $ret = [];
+
+               //Look for data array
+               if (is_array($data)) {
+                       //Iteare on each pair
+                       foreach($data as $k => $v) {
+                               //Merge flattened value in return array
+                               $ret += $this->flatten($v, empty($current) ? $k : $current.$sep.$k, $sep, $prefix, $suffix);
+                       }
+               //Look flat data
+               } else {
+                       //Store data in flattened key
+                       $ret[$prefix.$current.$suffix] = $data;
+               }

 
 

-               //Alphabet
-               $alpha = array_merge(range('0', '9'), range('a', 'z'), range('A', 'Z'), range('!', '~'));
+               //Return result
+               return $ret;
+       }

 
 

-               //Reverse alphabet
-               $rev = array_flip($alpha);
+       /**
+        * Crypt and base64uri encode string
+        *
+        * @param string $data The data string
+        * @return string The hashed data
+        */
+       public function hash(string $data): string {
+               //Return hashed data
+               //XXX: we use hash_hmac with md5 hash
+               //XXX: crypt was dropped because it provided identical signature for string starting with same pattern
+               return str_replace(['+','/'], ['-','_'], base64_encode(hash_hmac('md5', $data, $this->secret, true)));
+       }

 
 

-               //Number characters
-               $count = count($alpha);
+       /**
+        * Serialize then short
+        *
+        * @param array $data The data array
+        * @return string The serialized and shorted data
+        */
+       public function serialize(array $data): string {
+               //Return shorted serialized data
+               return $this->short(serialize($data));
+       }
+
+       /**
+        * Short
+        *
+        * @param string $data The data string
+        * @return string The shorted data
+        */
+       public function short(string $data): string {
+               //Return string
+               $ret = '';

 
                //Iterate on each character
 
                //Iterate on each character

-               foreach(str_split($string) as $c) {
-                       if (isset($rev[$c]) && isset($alpha[($rev[$c]+$this->offset)%$count])) {
-                               $ret .= $alpha[($rev[$c]+$this->offset)%$count];
+               foreach(str_split($data) as $k => $c) {
+                       if (isset($this->rev[$c]) && isset($this->alpha[($this->rev[$c]+$this->offset)%$this->count])) {
+                               //XXX: Remap char to an other one
+                               $ret .= chr(($this->rev[$c] - $this->offset + $this->count) % $this->count);

                        }
                }
 
                //Send result
                        }
                }
 
                //Send result

-               return str_replace(array('+','/'), array('-','_'), base64_encode($ret));
+               return str_replace(['+','/'], ['-','_'], base64_encode($ret));

        }
 
        }
 

-       //Unshort the string
-       public function unshort($string) {
-               //Return string
-               $ret = '';
-
-               //Alphabet
-               $alpha = array_merge(range('0', '9'), range('a', 'z'), range('A', 'Z'), range('!', '~'));
+       /**
+        * Convert string to safe slug
+        *
+        * @param string $data The data string
+        * @return string The slugged data
+        */
+       function slug(string $data): string {
+               //Use Transliterator if available
+               if (class_exists('Transliterator')) {
+                       $trans = \Transliterator::create('Any-Latin; Latin-ASCII; Lower()');
+                       return preg_replace(['/[^a-zA-Z0-9]+/', '/(^-+|-+$)/'], ['-', ''], $trans->transliterate($data));
+               }
+               return preg_replace('/[\/_|+ -]+/', '-', strtolower(trim(preg_replace('/[^a-zA-Z0-9\/_|+ -]/', '', str_replace(['\'', '"'], ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $data))), '-')));
+       }

 
 

-               //Reverse alphabet
-               $rev = array_flip($alpha);
+       /**
+        * Unshort then unserialize
+        *
+        * @param string $data The data string
+        * @return array The unshorted and unserialized data
+        */
+       public function unserialize(string $data): array {
+               //Return unshorted unserialized string
+               return unserialize($this->unshort($data));
+       }

 
 

-               //Number characters
-               $count = count($alpha);
+       /**
+        * Unshort
+        *
+        * @param string $data The data string
+        * @return string The unshorted data
+        */
+       public function unshort(string $data): string {
+               //Return string
+               $ret = '';

 
                //Iterate on each character
 
                //Iterate on each character

-               foreach(str_split(base64_decode(str_replace(array('-','_'), array('+','/'), $string))) as $c) {
-                       if (isset($rev[$c]) && isset($alpha[($rev[$c]-$this->offset+$count)%$count])) {
-                               $ret .= $alpha[($rev[$c]-$this->offset+$count)%$count];
-                       }
+               foreach(str_split(base64_decode(str_replace(['-','_'], ['+','/'], $data))) as $c) {
+                       //XXX: Reverse map char to an other one
+                       $ret .= $this->alpha[(ord($c) + $this->offset) % $this->count];

                }
 
                //Send result
                return $ret;
        }
                }
 
                //Send result
                return $ret;
        }

-
-       //Crypt and base64uri encode string
-       public function hash($string) {
-               return str_replace(array('+','/'), array('-','_'), base64_encode(crypt($string, $this->secret)));
-       }
-
-       //Convert string to safe slug
-       function slug($string) {
-               return preg_replace('/[\/_|+ -]+/', '-', strtolower(trim(preg_replace('/[^a-zA-Z0-9\/_|+ -]/', '', str_replace(array('\'', '"'), ' ', iconv('UTF-8', 'ASCII//TRANSLIT', $string))), '-')));
-       }
-

 }
 }