svn commit: r979967 - in /shindig/trunk/php/src: gadgets/MakeRequestOptions.php gadgets/MetadataHandler.php social/servlet/ApiServlet.php

[lindner]

Author: lindner
Date: Wed Jul 28 07:12:09 2010
New Revision: 979967

URL: http://svn.apache.org/viewvc?rev=979967&view=rev
Log:
SHINDIG-966 | Patch from Bastian Hofmann |  token over-decoding

Modified:
    shindig/trunk/php/src/gadgets/MakeRequestOptions.php
    shindig/trunk/php/src/gadgets/MetadataHandler.php
    shindig/trunk/php/src/social/servlet/ApiServlet.php

Modified: shindig/trunk/php/src/gadgets/MakeRequestOptions.php
URL: 
http://svn.apache.org/viewvc/shindig/trunk/php/src/gadgets/MakeRequestOptions.php?rev=979967&r1=979966&r2=979967&view=diff
==============================================================================
--- shindig/trunk/php/src/gadgets/MakeRequestOptions.php (original)
+++ shindig/trunk/php/src/gadgets/MakeRequestOptions.php Wed Jul 28 07:12:09 
2010
@@ -247,11 +247,10 @@ class MakeRequestOptions {
             ->setOAuthUseToken($request->getParameter('oauth_use_token'))
             
->setOAuthReceivedCallback($request->getParameter('oauth_received_callback'))
             ->setOAuthClientState($request->getParameter('oauth_state')) // 
Not in osapi.http spec, but nice to support
-            
->setSecurityTokenString(urlencode(base64_encode($request->getToken()->toSerialForm())));
-
-    return $options;
-  }
+            ->setSecurityTokenString($request->getToken()->toSerialForm());
 
+   return $options;
+ }
   /**
    * Gets the configured URL.
    *

Modified: shindig/trunk/php/src/gadgets/MetadataHandler.php
URL: 
http://svn.apache.org/viewvc/shindig/trunk/php/src/gadgets/MetadataHandler.php?rev=979967&r1=979966&r2=979967&view=diff
==============================================================================
--- shindig/trunk/php/src/gadgets/MetadataHandler.php (original)
+++ shindig/trunk/php/src/gadgets/MetadataHandler.php Wed Jul 28 07:12:09 2010
@@ -53,9 +53,6 @@ class MetadataHandler {
         return null;
       }
     }
-    if (count(explode(':', $token)) < 7) {
-      $token = urldecode(base64_decode($token));
-    }
     $gadgetSigner = Config::get('security_token_signer');
     $gadgetSigner = new $gadgetSigner();
     return $gadgetSigner->createToken($token);

Modified: shindig/trunk/php/src/social/servlet/ApiServlet.php
URL: 
http://svn.apache.org/viewvc/shindig/trunk/php/src/social/servlet/ApiServlet.php?rev=979967&r1=979966&r2=979967&view=diff
==============================================================================
--- shindig/trunk/php/src/social/servlet/ApiServlet.php (original)
+++ shindig/trunk/php/src/social/servlet/ApiServlet.php Wed Jul 28 07:12:09 2010
@@ -131,9 +131,6 @@ abstract class ApiServlet extends HttpSe
         return null;
       }
     }
-    if (count(explode(':', $token)) < 7) {
-      $token = urldecode(base64_decode($token));
-    }
     $gadgetSigner = Config::get('security_token_signer');
     $gadgetSigner = new $gadgetSigner();
     return $gadgetSigner->createToken($token);