Improvement to bugfix for issue #104: json_encode(): Invalid UTF-8 se…

…quence in argument in Log.php. getLastResponse()->asString() would not gunzip the response first leading to binary data in the logs.
OpenConext · Nov 25, 2014 · d3fd3a1 · d3fd3a1
1 parent bbcccb0
commit d3fd3a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/library/EngineBlock/Rest/Client.php b/library/EngineBlock/Rest/Client.php
@@ -40,7 +40,10 @@ public function get($args = array())
         $this->_data = array();//Initializes for next Rest method.
 
         if ($response->getStatus() !== 200) {
-            EngineBlock_ApplicationSingleton::getLog()->attach($response->asString(), 'Response');
+            EngineBlock_ApplicationSingleton::getLog()->attach(
+                $response->getHeadersAsString() . PHP_EOL . $response->getBody(),
+                'Response'
+            );
 
             throw new EngineBlock_Exception(
                 'Response status !== 200', EngineBlock_Exception::CODE_WARNING
@@ -54,7 +57,10 @@ public function get($args = array())
                 return new Zend_Rest_Client_Result($response->getBody());
             }
             catch (Zend_Rest_Client_Result_Exception $e) {
-                EngineBlock_ApplicationSingleton::getLog()->attach($response->asString(), 'Response');
+                EngineBlock_ApplicationSingleton::getLog()->attach(
+                    $response->getHeadersAsString() . PHP_EOL . $response->getBody(),
+                    'Response'
+                );
 
                 throw new EngineBlock_Exception(
                     'Error parsing response', null, $e

diff --git a/library/EngineBlock/VirtualOrganization/GroupValidator.php b/library/EngineBlock/VirtualOrganization/GroupValidator.php
@@ -46,7 +46,10 @@ protected function _validateGroupMembership($subjectId, array $groups, $requireN
                 return $this->_validateGroupMembership($subjectId, $groups, true);
             }
             else {
-                EngineBlock_ApplicationSingleton::getLog()->attach($response->asString(), 'API Response');
+                EngineBlock_ApplicationSingleton::getLog()->attach(
+                    $response->getHeadersAsString() . PHP_EOL . $response->getBody(),
+                    'API Response'
+                );
                 throw new EngineBlock_Exception(
                     'Non-200 from API trying to get the group memberships'
                 );
@@ -121,4 +124,4 @@ protected function _ensureTrailingSlash($configuredUrl)
         return $configuredUrl;
     }
 
-}
+}
diff --git a/library/Janus/Client/CacheProxy.php b/library/Janus/Client/CacheProxy.php
@@ -58,13 +58,10 @@ public function __call($name, $arguments)
             );
 
             if ($httpClient->getLastResponse()) {
+                $response = $httpClient->getLastResponse();
                 $application->getLogInstance()->attach(
-                    $httpClient->getLastResponse()->getHeadersAsString(),
-                    'HTTP Response headers'
-                );
-                $application->getLogInstance()->attach(
-                    $httpClient->getLastResponse()->getBody(),
-                    'HTTP Response body'
+                    $response->getHeadersAsString() . PHP_EOL . $response->getBody(),
+                    'HTTP Response'
                 );
             }