Skip to content

Commit

Permalink
Merge branch 'MDL-54847-31' of git://github.com/cameron1729/moodle in…
Browse files Browse the repository at this point in the history 
…to MOODLE_31_STABLE
  • Loading branch information
@danpoltawski
danpoltawski committed Aug 2, 2016
2 parents 20eb9b3 + 469aa91 commit 8cf6371
Show file tree
Hide file tree
Showing 2 changed files with 158 additions and 1 deletion.
126 changes: 126 additions & 0 deletions lib/tests/htmlpurifier_test.php
View file
Expand Up @@ -318,4 +318,130 @@ public function test_allowed_schemes() {
$text = '<a href="hmmm://www.example.com">link</a>';
$this->assertSame('<a>link</a>', purify_html($text));
}

/**
* Tests media tags.
*
* @dataProvider media_tags_provider
* @param string $mediatag HTML media tag
* @param string $expected expected result
*/
public function test_media_tags($mediatag, $expected) {
$actual = format_text($mediatag, FORMAT_MOODLE, ['filter' => false, 'noclean' => true]);
$this->assertEquals($expected, $actual);
}

/**
* Test cases for the test_media_tags test.
*/
public function media_tags_provider() {
// Given a 1D array, computes the power set of those elements.
$p = function(array $set) {
return array_reduce($set, function($carry, $element) {
return array_merge($carry, array_map(function($subset) use ($element) {
return array_merge([$element], $subset);
}, $carry));
}, [[]]);
};

// Takes an array of attributes, then generates a test for every possible combination of them
// (i.e., every element of the power set). The testcases are named using $prefix and then
// a '/' delimited string describing the attributes being used. $templats is for the
// raw data and expected result.
$generatetestcases = function($prefix, array $attrs, array $templates) use ($p) {
$attrcombinations = $p($attrs);
return array_reduce($attrcombinations, function($carry, $attrset) use ($prefix, $templates) {
$testcase = [$prefix . '/' . join('/', $attrset) => [
sprintf($templates[0], join(" ", $attrset)),
sprintf($templates[1], join(" ", $attrset))
]];
return empty(array_values($carry)[0]) ? $testcase : $carry + $testcase;
}, [[]]);
};

$audioattrs = [
'preload="auto"', 'autoplay=""', 'loop=""', 'muted=""', 'controls=""',
'crossorigin="anonymous"', 'crossorigin="use-credentials"'
];
$videoattrs = [
'crossorigin="anonymous"', 'crossorigin="use-credentials"',
'poster="https://upload.wikimedia.org/wikipedia/en/1/14/Space_jam.jpg"',
'preload=""', 'autoplay=""', 'playsinline=""', 'loop=""', 'muted=""',
'controls=""', 'width="420px"', 'height="69px"'
];
return $generatetestcases('Plain audio', $audioattrs + ['src="http://example.com/jam.wav"'], [
'<audio %1$s>Looks like you can\'t slam the jams.</audio>',
'<div class="text_to_html"><audio %1$s>Looks like you can\'t slam the jams.</audio></div>'
]) + $generatetestcases('Audio with one source', $audioattrs, [
'<audio %1$s><source src="http://example.com/getup.wav">No tasty jams for you.</audio>',
'<div class="text_to_html">' .
'<audio %1$s>' .
'<source src="http://example.com/getup.wav">' .
'No tasty jams for you.' .
'</audio>' .
'</div>'
]) + $generatetestcases('Audio with multiple sources', $audioattrs, [
'<audio %1$s>' .
'<source src="http://example.com/getup.wav" type="audio/wav">' .
'<source src="http://example.com/getup.mp3" type="audio/mpeg">' .
'<source src="http://example.com/getup.ogg" type="audio/ogg">' .
'No tasty jams for you.' .
'</audio>',
'<div class="text_to_html">' .
'<audio %1$s>' .
'<source src="http://example.com/getup.wav" type="audio/wav">' .
'<source src="http://example.com/getup.mp3" type="audio/mpeg">' .
'<source src="http://example.com/getup.ogg" type="audio/ogg">' .
'No tasty jams for you.' .
'</audio>' .
'</div>'
]) + $generatetestcases('Plain video', $videoattrs + ['src="http://example.com/prettygood.mp4'], [
'<video %1$s>Oh, that\'s pretty bad 😦</video>',
'<div class="text_to_html"><video %1$s>Oh, that\'s pretty bad 😦</video></div>'
]) + $generatetestcases('Video with one source', $videoattrs, [
'<video %1$s><source src="http://example.com/prettygood.mp4">Oh, that\'s pretty bad 😦</video>',
'<div class="text_to_html">' .
'<video %1$s>' .
'<source src="http://example.com/prettygood.mp4">' .
'Oh, that\'s pretty bad 😦' .
'</video>' .
'</div>'
]) + $generatetestcases('Video with multiple sources', $videoattrs, [
'<video %1$s>' .
'<source src="http://example.com/prettygood.mp4" type="video/mp4">' .
'<source src="http://example.com/eljefe.mp4" type="video/mp4">' .
'<source src="http://example.com/turnitup.mov type="video/mov"' .
'Oh, that\'s pretty bad 😦' .
'</video>',
'<div class="text_to_html">' .
'<video %1$s>' .
'<source src="http://example.com/prettygood.mp4" type="video/mp4">' .
'<source src="http://example.com/eljefe.mp4" type="video/mp4">' .
'<source src="http://example.com/turnitup.mov type="video/mov"' .
'Oh, that\'s pretty bad 😦' .
'</video>' .
'</div>'
] + [
'Video with invalid crossorigin' => [
'<video src="http://example.com/turnitup.mov type="video/mov crossorigin="can i pls hab?">' .
'Oh, that\'s pretty bad 😦' .
'</video>',
'<div class="text_to_html">' .
'<video src="http://example.com/turnitup.mov type="video/mov">' .
'Oh, that\'s pretty bad 😦' .
'</video>',
'</div>'
],
'Audio with invalid crossorigin' => [
'<audio src="http://example.com/getup.wav" type="audio/wav" crossorigin="give me. the jams.">' .
'nyemnyemnyem' .
'</audio>',
'<div class="text_to_html">' .
'<audio src="http://example.com/getup.wav" type="audio/wav" crossorigin="give me. the jams.">' .
'nyemnyemnyem' .
'</audio>' .
'</div>'
]
]);
}
}
33 changes: 32 additions & 1 deletion lib/weblib.php
View file
Expand Up @@ -1780,7 +1780,7 @@ function purify_html($text, $options = array()) {
$config = HTMLPurifier_Config::createDefault();

$config->set('HTML.DefinitionID', 'moodlehtml');
$config->set('HTML.DefinitionRev', 4);
$config->set('HTML.DefinitionRev', 5);
$config->set('Cache.SerializerPath', $cachedir);
$config->set('Cache.SerializerPermissions', $CFG->directorypermissions);
$config->set('Core.NormalizeNewlines', false);
Expand Down Expand Up @@ -1820,6 +1820,37 @@ function purify_html($text, $options = array()) {
$def->addElement('lang', 'Block', 'Flow', array(), array('lang'=>'CDATA')); // Original multilang style - only our hacked lang attribute.
$def->addAttribute('span', 'xxxlang', 'CDATA'); // Current very problematic multilang.

// Media elements.
// https://html.spec.whatwg.org/#the-video-element
$def->addElement('video', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
'src' => 'URI',
'crossorigin' => 'Enum#anonymous,use-credentials',
'poster' => 'URI',
'preload' => 'Enum#auto,metadata,none',
'autoplay' => 'Bool',
'playsinline' => 'Bool',
'loop' => 'Bool',
'muted' => 'Bool',
'controls' => 'Bool',
'width' => 'Length',
'height' => 'Length',
]);
// https://html.spec.whatwg.org/#the-audio-element
$def->addElement('audio', 'Block', 'Optional: (source, Flow) | (Flow, source) | Flow', 'Common', [
'src' => 'URI',
'crossorigin' => 'Enum#anonymous,use-credentials',
'preload' => 'Enum#auto,metadata,none',
'autoplay' => 'Bool',
'loop' => 'Bool',
'muted' => 'Bool',
'controls' => 'Bool'
]);
// https://html.spec.whatwg.org/#the-source-element
$def->addElement('source', 'Block', 'Flow', 'Common', [
'src' => 'URI',
'type' => 'Text'
]);

// Use the built-in Ruby module to add annotation support.
$def->manager->addModule(new HTMLPurifier_HTMLModule_Ruby());

Expand Down

0 comments on commit 8cf6371

Please sign in to comment.