pluf2 Commit Details

Date:

2010-05-22 10:08:16 (14 years 6 months ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

f2c18d7c0ea05d41116cd1f2e5eac0ca7bd4cf6e

Parents:

51958344844575796cdd5e3beb57ac0ea3500114

Message:

Fixed a bug preventing the validation of compressed signed strings.

Changes:

File differences

-171
172 172
173 173
174 
174
175 175
176 176
177 177
+     * @param $request Pluf_HTTP_Request␊
     * @param $props array Properties␊
     */␊
    public static function register($request, $props) ␊
    public static function register(&$request, $props) ␊
    {␊
        $pabuid = (isset($request->pabuid)) ? ␊
            $request->pabuid : ␊
      * @param $request Pluf_HTTP_Request␊
      * @param $props array Properties␊
      */␊
-    public static function register($request, $props) ␊
+    public static function register(&$request, $props) ␊
     {␊
         $pabuid = (isset($request->pabuid)) ? ␊
             $request->pabuid : ␊

-145
146 146
147 147
148
149
150
151
148 152
149 153
150 154
151 155
152 
153 
156
157
154 158
155 159
156 160
+        if ($key === null) {␊
            $key = Pluf::f('secret_key');␊
        }␊
        $compressed = ($signed_value[0] == '.') ? '.' : '';␊
        if ($compressed) {␊
            $signed_value = substr($signed_value, 1);␊
        }␊
        if (false === strpos($signed_value, '.')) {␊
            throw new Exception('Missing signature (no . found in value).');␊
        }␊
        list($value, $sig) = explode('.', $signed_value, 2);␊
        if (self::base64_hmac($value, $key) == $sig) {␊
            return $value;␊
        if (self::base64_hmac($compressed.$value, $key) == $sig) {␊
            return $compressed.$value;␊
        } else {␊
            throw new Exception(sprintf('Signature failed: "%s".', $sig));␊
        }␊
         if ($key === null) {␊
             $key = Pluf::f('secret_key');␊
         }␊
+        $compressed = ($signed_value[0] == '.') ? '.' : '';␊
+        if ($compressed) {␊
+            $signed_value = substr($signed_value, 1);␊
+        }␊
         if (false === strpos($signed_value, '.')) {␊
             throw new Exception('Missing signature (no . found in value).');␊
         }␊
         list($value, $sig) = explode('.', $signed_value, 2);␊
-        if (self::base64_hmac($value, $key) == $sig) {␊
-            return $value;␊
+        if (self::base64_hmac($compressed.$value, $key) == $sig) {␊
+            return $compressed.$value;␊
         } else {␊
             throw new Exception(sprintf('Signature failed: "%s".', $sig));␊
         }␊

Download the corresponding diff file

pluf2

File differences

Branches