diff --git a/core/modules/system/css/components/item-list.theme.css b/core/modules/system/css/components/item-list.theme.css index 49f8172..fb4f6e2 100644 --- a/core/modules/system/css/components/item-list.theme.css +++ b/core/modules/system/css/components/item-list.theme.css @@ -17,3 +17,22 @@ [dir="rtl"] .item-list ul li { margin: 0 1.5em 0.25em 0; } +[dir="rtl"] ul.comma-list.inline { + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; +} +[dir="rtl"] ul.comma-list.inline li, +ul.comma-list.inline li { + padding-left: 0; + padding-right: 0; + margin-left: 0; + margin-right: 0; +} +ul.comma-list.inline li:after { + content: ", "; +} +ul.comma-list.inline li:last-child:after { + content: ""; +} diff --git a/core/modules/views_ui/src/Tests/DisplayPathTest.php b/core/modules/views_ui/src/Tests/DisplayPathTest.php index 004b9f0..62c1f2f 100644 --- a/core/modules/views_ui/src/Tests/DisplayPathTest.php +++ b/core/modules/views_ui/src/Tests/DisplayPathTest.php @@ -35,6 +35,7 @@ class DisplayPathTest extends UITestBase { public function testPathUI() { $this->doBasicPathUITest(); $this->doAdvancedPathsValidationTest(); + $this->doPathXssFilterTest(); } /** @@ -60,6 +61,29 @@ protected function doBasicPathUITest() { } /** + * Tests that View paths are properly filtered for XSS. + */ + public function doPathXssFilterTest() { + global $base_path; + $this->drupalGet('admin/structure/views/view/test_view'); + $this->drupalPostForm(NULL, array(), 'Add Page'); + $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_2/path', array('path' => 'malformed_path'), t('Apply')); + $this->drupalPostForm(NULL, array(), 'Add Page'); + $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_3/path', array('path' => ''), t('Apply')); + $this->drupalPostForm(NULL, array(), 'Add Page'); + $this->drupalPostForm('admin/structure/views/nojs/display/test_view/page_4/path', array('path' => ''), t('Apply')); + $this->drupalPostForm('admin/structure/views/view/test_view', array(), t('Save')); + $this->drupalGet('admin/structure/views'); + // The anchor text should be escaped. + $this->assertEscaped('/malformed_path'); + $this->assertEscaped('/'); + $this->assertEscaped('/'); + // Links should be url-encoded. + $this->assertRaw('/%3Cobject%3Emalformed_path%3C/object%3E'); + $this->assertRaw('/%3Cscript%3Ealert%28%22hello%22%29%3B%3C/script%3E'); + } + + /** * Tests a couple of invalid path patterns. */ protected function doAdvancedPathsValidationTest() { diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php index 00be178..a0c6875 100644 --- a/core/modules/views_ui/src/ViewListBuilder.php +++ b/core/modules/views_ui/src/ViewListBuilder.php @@ -91,12 +91,6 @@ public function load() { */ public function buildRow(EntityInterface $view) { $row = parent::buildRow($view); - $display_paths = ''; - $separator = ''; - foreach ($this->getDisplayPaths($view) as $display_path) { - $display_paths .= $separator . SafeMarkup::escape($display_path); - $separator = ', '; - } return array( 'data' => array( 'view_name' => array( @@ -113,7 +107,13 @@ public function buildRow(EntityInterface $view) { 'class' => array('views-table-filter-text-source'), ), 'tag' => $view->get('tag'), - 'path' => SafeMarkup::set($display_paths), + 'path' => array( + 'data' => array( + '#theme' => 'item_list', + '#items' => $this->getDisplayPaths($view), + '#attributes' => array('class' => array('comma-list', 'inline')), + ), + ), 'operations' => $row['operations'], ), 'title' => $this->t('Machine name: @name', array('@name' => $view->id())), diff --git a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php index a42a879..d4bc2b6 100644 --- a/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php +++ b/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php @@ -89,7 +89,10 @@ public function testBuildRowEntityList() { ); $page_display->expects($this->any()) ->method('getPath') - ->will($this->returnValue('test_page')); + ->will($this->onConsecutiveCalls( + $this->returnValue('test_page'), + $this->returnValue('malformed_path'), + $this->returnValue(''))); $embed_display = $this->getMock('Drupal\views\Plugin\views\display\Embed', array('initDisplay'), array(array(), 'default', $display_manager->getDefinition('embed')) @@ -106,6 +109,16 @@ public function testBuildRowEntityList() { $values['display']['page_1']['display_plugin'] = 'page'; $values['display']['page_1']['display_options']['path'] = 'test_page'; + $values['display']['page_2']['id'] = 'page_2'; + $values['display']['page_2']['display_title'] = 'Page 2'; + $values['display']['page_2']['display_plugin'] = 'page'; + $values['display']['page_2']['display_options']['path'] = 'malformed_path'; + + $values['display']['page_3']['id'] = 'page_3'; + $values['display']['page_3']['display_title'] = 'Page 3'; + $values['display']['page_3']['display_plugin'] = 'page'; + $values['display']['page_3']['display_options']['path'] = ''; + $values['display']['embed']['id'] = 'embed'; $values['display']['embed']['display_title'] = 'Embedded'; $values['display']['embed']['display_plugin'] = 'embed'; @@ -115,6 +128,8 @@ public function testBuildRowEntityList() { ->will($this->returnValueMap(array( array('default', $values['display']['default'], $default_display), array('page', $values['display']['page_1'], $page_display), + array('page', $values['display']['page_2'], $page_display), + array('page', $values['display']['page_3'], $page_display), array('embed', $values['display']['embed'], $embed_display), ))); @@ -141,8 +156,16 @@ public function testBuildRowEntityList() { $row = $view_list_builder->buildRow($view); - $this->assertEquals(array('Embed admin label', 'Page admin label'), $row['data']['view_name']['data']['#displays'], 'Wrong displays got added to view list'); - $this->assertEquals($row['data']['path'], '/test_page', 'The path of the page display is not added.'); + $expected_displays = array( + 'Embed admin label', + 'Page admin label', + 'Page admin label', + 'Page admin label', + ); + $this->assertEquals($expected_displays, $row['data']['view_name']['data']['#displays']); + + $display_paths = $row['data']['path']['data']['#items']; + $this->assertEquals('/test_page, /<object>malformed_path</object>, /<script>alert("placeholder_page/%")</script>', implode(', ', $display_paths)); } }