Skip to content

[4.0] Make sure the renderer does not manipulate the inline CSS and JS #28719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilsonge merged 6 commits into from
Aug 11, 2020
Merged

[4.0] Make sure the renderer does not manipulate the inline CSS and JS #28719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53d4538
make sure there rendere does not manipulate the inline CSS and JS
zero-24 Apr 18, 2020
e2bf53a
extend the array patch for styles too
zero-24 Apr 18, 2020
da87782
fix auto mode
zero-24 Apr 18, 2020
c3a0c3a
we need to check both
zero-24 Apr 18, 2020
b50d48f
styles
zero-24 Apr 18, 2020
169e33e
Merge branch '4.0-dev' into fix_style_script_renderer
zero-24 Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions libraries/src/Document/Renderer/Html/ScriptsRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,23 +256,23 @@ private function renderInlineElement($item) : string

$buffer .= $tab . '<script';
$buffer .= $this->renderAttributes($attribs);
$buffer .= '>' . $lnEnd;
$buffer .= '>';

// This is for full XHTML support.
if ($this->_doc->_mime !== 'text/html')
{
$buffer .= $tab . $tab . '//<![CDATA[' . $lnEnd;
Copy link
Contributor

@wilsonge wilsonge Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this CData tag still work without the line break above? Honestly don't know enough here to be sure.

Copy link
Contributor Author

@zero-24 zero-24 Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How to trigger that stuff anyway? Does joomla actually support something different than html and json?

Copy link
Contributor

@wilsonge wilsonge Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the template of your choice something like $this->setMimeEncoding('application/xhtml+xml')

Copy link
Contributor

@wilsonge wilsonge Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically it does support these things - but I think it dates back to XHTML support. We can probably get rid of it (we should try and track back it's introduction first). But if we leave it in it should work

Copy link
Contributor Author

@zero-24 zero-24 Apr 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to be there since more than 11 years: https://github.com/joomla/joomla-cms/blame/ac1822ffb8368d1e6be4c356d45088fd196c5e81/libraries/joomla/document/html/renderer/head.php#L105

Do you know how to go deeper than that commit here: 83939b8?

Copy link
Contributor

@wilsonge wilsonge May 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean in terms of out of scope I assume if you're running an xhtml mime type it won't work with csp ;)

Copy link
Contributor

@roland-d roland-d Aug 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean it can be removed?

Copy link
Contributor

@roland-d roland-d Aug 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@wilsonge @zero-24 ^^

Copy link
Contributor

@wilsonge wilsonge Aug 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I honestly have no clue. It’s probably safe. But I’m not certain either. I certainly have no clue if the CDATA tag has any use anymore - again I suspect it’s legacy. But I’m not certain

Copy link
Contributor Author

@zero-24 zero-24 Aug 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean in terms of out of scope I assume if you're running an xhtml mime type it won't work with csp ;)

Right we would not try to add hashes there we only do for HTML: https://github.com/joomla/joomla-cms/blob/4.0-dev/plugins/system/httpheaders/httpheaders.php#L140

}

$buffer .= $content . $lnEnd;
$buffer .= $content;

// See above note
if ($this->_doc->_mime !== 'text/html')
{
$buffer .= $tab . $tab . '//]]>' . $lnEnd;
}

$buffer .= $tab . '</script>' . $lnEnd;
$buffer .= '</script>' . $lnEnd;

return $buffer;
}
Expand Down
6 changes: 3 additions & 3 deletions libraries/src/Document/Renderer/Html/StylesRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,23 +250,23 @@ private function renderInlineElement($item) : string

$buffer .= $tab . '<style';
$buffer .= $this->renderAttributes($attribs);
$buffer .= '>' . $lnEnd;
$buffer .= '>';

// This is for full XHTML support.
if ($this->_doc->_mime !== 'text/html')
{
$buffer .= $tab . $tab . '/*<![CDATA[*/' . $lnEnd;
}

$buffer .= $content . $lnEnd;
$buffer .= $content;

// See above note
if ($this->_doc->_mime !== 'text/html')
{
$buffer .= $tab . $tab . '/*]]>*/' . $lnEnd;
}

$buffer .= $tab . '</style>' . $lnEnd;
$buffer .= '</style>' . $lnEnd;

return $buffer;
}
Expand Down
11 changes: 7 additions & 4 deletions plugins/system/httpheaders/httpheaders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,12 @@ public function applyHashesToCspRule(): void
// Generate the hashes for the style-src
$inlineStyles = is_array($headData['style']) ? $headData['style'] : [];

foreach ($inlineStyles as $type => $styleContent)
foreach ($inlineStyles as $type => $styles)
{
$styleHashes[] = "'sha256-" . base64_encode(hash('sha256', $styleContent, true)) . "'";
foreach ($styles as $hash => $styleContent)
{
$styleHashes[] = "'sha256-" . base64_encode(hash('sha256', $styleContent, true)) . "'";
}
}
}

Expand Down Expand Up @@ -413,12 +416,12 @@ private function compileAutomaticCspHeaderRules(): array
$cspHeaderCollection = array_merge($cspHeaderCollection, array_fill_keys(['default-src'], ''));
}

if (!isset($cspHeaderCollection['script-src']) && $nonceEnabled)
if (!isset($cspHeaderCollection['script-src']) && ($scriptHashesEnabled || $nonceEnabled))
{
$cspHeaderCollection = array_merge($cspHeaderCollection, array_fill_keys(['script-src'], ''));
}

if (!isset($cspHeaderCollection['style-src']) && $nonceEnabled)
if (!isset($cspHeaderCollection['style-src']) && ($scriptHashesEnabled || $nonceEnabled))
{
$cspHeaderCollection = array_merge($cspHeaderCollection, array_fill_keys(['style-src'], ''));
}
Expand Down