WordPress.org

Make WordPress Core

Ticket #21990: 21990-subclass.4.diff

File 21990-subclass.4.diff, 2.3 KB (added by rmccue, 9 years ago)

Update patch to also check SIMPLEPIE_CONSTRUCT_MAYBE_HTML and base 64 encoding

  • wp-includes/feed.php

    new file mode 100644
    ---wp-includes/class-simplepie-kses.php	(revision 0)
    +++wp-includes/class-simplepie-kses.php	(revision 0)
    @@ -0,0 +1,43 @@
    +<?php
    +/**
    + * WordPress extension of SimplePie sanitization
    + *
    + * Contains the WP_SimplePie_Sanitize_KSES class
    + *
    + * @package WordPress
    + */
    +
    +/**
    + * WordPress SimplePie Sanitization Class
    + *
    + * Extension of the SimplePie_Sanitize class to use KSES, because
    + * we cannot universally count on DOMDocument being available
    + *
    + * @package WordPress
    + * @since 3.5.0
    + */
    +class WP_SimplePie_Sanitize_KSES extends SimplePie_Sanitize {
    +	public function sanitize( $data, $type, $base = '' ) {
    +		$data = trim( $data );
    +		if ( $type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML ) {
    +			if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) {
    +				$type |= SIMPLEPIE_CONSTRUCT_HTML;
    +			}
    +			else {
    +				$type |= SIMPLEPIE_CONSTRUCT_TEXT;
    +			}
    +		}
    +		if ( $type & SIMPLEPIE_CONSTRUCT_BASE64 ) {
    +			$data = base64_decode( $data );
    +		}
    +		if ( $type & ( SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML ) ) {
    +			$data = wp_kses_post( $data );
    +			if ( $this->output_encoding !== 'UTF-8' ) {
    +				$data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
    +			}
    +			return $data;
    +		} else {
    +			return parent::sanitize( $data, $type, $base );
    +		}
    +	}
    +}
    function feed_content_type( $type = '' ) { 
    525525 */
    526526function fetch_feed($url) {
    527527        require_once (ABSPATH . WPINC . '/class-feed.php');
     528        require_once (ABSPATH . WPINC . '/class-simplepie-kses.php');
    528529
    529530        $feed = new SimplePie();
    530531
     532        $feed->set_sanitize_class( 'WP_SimplePie_Sanitize_KSES' );
     533        // We must manually overwrite $feed->sanitize because SimplePie's
     534        // constructor sets it before we have a chance to set the sanitization class
     535        $feed->sanitize = new WP_SimplePie_Sanitize_KSES();
     536       
    531537        $feed->set_cache_class( 'WP_Feed_Cache' );
    532538        $feed->set_file_class( 'WP_SimplePie_File' );
    533539