tweet_live: comparison web/lib/Zend/Feed/Reader.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Feed_Reader
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Reader.php 22662 2010-07-24 17:37:36Z mabe $
+* @version    $Id: Reader.php 25275 2013-03-06 09:55:33Z frosch $
 */
 /**
 * @see Zend_Feed
 */
 require_once 'Zend/Feed/Reader/FeedSet.php';
 /**
 * @category   Zend
 * @package    Zend_Feed_Reader
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Feed_Reader
 {
 /**
 if ($data) {
 if ($etag === null) {
 $etag = $cache->load($cacheId.'_etag');
 }
 if ($lastModified === null) {
-$lastModified = $cache->load($cacheId.'_lastmodified');;
+$lastModified = $cache->load($cacheId.'_lastmodified');
 }
 if ($etag) {
 $client->setHeaders('If-None-Match', $etag);
 }
 if ($lastModified) {
 }
 if ($response->getHeader('Last-Modified')) {
 $cache->save($response->getHeader('Last-Modified'), $cacheId.'_lastmodified');
 }
 }
+if (empty($responseXml)) {
+require_once 'Zend/Feed/Exception.php';
+throw new Zend_Feed_Exception('Feed failed to load, got empty response body');
+}
 return self::importString($responseXml);
 } elseif ($cache) {
 $data = $cache->load($cacheId);
 if ($data !== false) {
 return self::importString($data);
 require_once 'Zend/Feed/Exception.php';
 throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
 }
 $responseXml = $response->getBody();
 $cache->save($responseXml, $cacheId);
+if (empty($responseXml)) {
+require_once 'Zend/Feed/Exception.php';
+throw new Zend_Feed_Exception('Feed failed to load, got empty response body');
+}
 return self::importString($responseXml);
 } else {
 $response = $client->request('GET');
 if ($response->getStatus() !== 200) {
 require_once 'Zend/Feed/Exception.php';
 throw new Zend_Feed_Exception('Feed failed to load, got response code ' . $response->getStatus());
 }
-$reader = self::importString($response->getBody());
+$responseXml = $response->getBody();
+if (empty($responseXml)) {
+require_once 'Zend/Feed/Exception.php';
+throw new Zend_Feed_Exception('Feed failed to load, got empty response body');
+}
+$reader = self::importString($responseXml);
 $reader->setOriginalSourceUri($uri);
 return $reader;
 }
 }
 * @return Zend_Feed_Reader_FeedInterface
 */
 public static function importString($string)
 {
 $libxml_errflag = libxml_use_internal_errors(true);
+$oldValue = libxml_disable_entity_loader(true);
 $dom = new DOMDocument;
 $status = $dom->loadXML($string);
+foreach ($dom->childNodes as $child) {
+if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+require_once 'Zend/Feed/Exception.php';
+throw new Zend_Feed_Exception(
+'Invalid XML: Detected use of illegal DOCTYPE'
+);
+}
+}
+libxml_disable_entity_loader($oldValue);
 libxml_use_internal_errors($libxml_errflag);
 if (!$status) {
 // Build error message
 $error = libxml_get_last_error();
 require_once 'Zend/Feed/Exception.php';
 throw new Zend_Feed_Exception("Failed to access $uri, got response code " . $response->getStatus());
 }
 $responseHtml = $response->getBody();
 $libxml_errflag = libxml_use_internal_errors(true);
+$oldValue = libxml_disable_entity_loader(true);
 $dom = new DOMDocument;
 $status = $dom->loadHTML($responseHtml);
+libxml_disable_entity_loader($oldValue);
 libxml_use_internal_errors($libxml_errflag);
 if (!$status) {
 // Build error message
 $error = libxml_get_last_error();
 if ($error && $error->message) {
 /**
 * Detect the feed type of the provided feed
 *
 * @param  Zend_Feed_Abstract|DOMDocument|string $feed
+* @param  bool                                  $specOnly
 * @return string
+* @throws Zend_Feed_Exception
 */
 public static function detectType($feed, $specOnly = false)
 {
 if ($feed instanceof Zend_Feed_Reader_FeedInterface) {
 $dom = $feed->getDomDocument();
 } elseif($feed instanceof DOMDocument) {
 $dom = $feed;
 } elseif(is_string($feed) && !empty($feed)) {
 @ini_set('track_errors', 1);
+$oldValue = libxml_disable_entity_loader(true);
 $dom = new DOMDocument;
 $status = @$dom->loadXML($feed);
+foreach ($dom->childNodes as $child) {
+if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
+require_once 'Zend/Feed/Exception.php';
+throw new Zend_Feed_Exception(
+'Invalid XML: Detected use of illegal DOCTYPE'
+);
+}
+}
+libxml_disable_entity_loader($oldValue);
 @ini_restore('track_errors');
 if (!$status) {
 if (!isset($php_errormsg)) {
 if (function_exists('xdebug_is_enabled')) {
 $php_errormsg = '(error message not available, when XDebug is running)';
 $xpath->registerNamespace('atom', self::NAMESPACE_ATOM_10);
 if ($xpath->query('//atom:feed')->length) {
 return self::TYPE_ATOM_10;
 }
 if ($xpath->query('//atom:entry')->length) {
 if ($specOnly == true) {
 return self::TYPE_ATOM_10;
 } else {
 return self::TYPE_ATOM_10_ENTRY;
 self::registerExtension('Slash');
 self::registerExtension('WellFormedWeb');
 self::registerExtension('Thread');
 self::registerExtension('Podcast');
 }
 /**
 * Utility method to apply array_unique operation to a multidimensional
 * array.
 *
 * @param array
 foreach ($array as &$value) {
 $value = unserialize($value);
 }
 return $array;
 }
 }

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c