Skip to content
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

Jump to bottom

[4.0] Issue warnings when unsafe-inline or unsafe-eval are used in auto mode #29602

Merged
merged 10 commits into from
Jun 16, 2020
Merged

[4.0] Issue warnings when unsafe-inline or unsafe-eval are used in auto mode #29602

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d6704b
issue warnings when unsafe-inline or unsafe-eval are used in auto mode
zero-24 Jun 14, 2020
cd8ec1f
Update administrator/components/com_csp/src/Helper/ReporterHelper.php
zero-24 Jun 14, 2020
b7edd18
Update administrator/components/com_csp/src/Helper/ReporterHelper.php
zero-24 Jun 14, 2020
701cab1
Update ReporterHelper.php
zero-24 Jun 14, 2020
3da38c2
Update administrator/language/en-GB/com_csp.ini
zero-24 Jun 16, 2020
99b6b43
Update administrator/components/com_csp/src/Helper/ReporterHelper.php
zero-24 Jun 16, 2020
eb58c08
Update administrator/components/com_csp/src/Helper/ReporterHelper.php
zero-24 Jun 16, 2020
2612dcb
Update ReporterHelper.php
zero-24 Jun 16, 2020
5d8cfae
Update administrator/components/com_csp/src/Helper/ReporterHelper.php
zero-24 Jun 16, 2020
38e3442
Update administrator/components/com_csp/src/Helper/ReporterHelper.php
zero-24 Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 66 additions & 0 deletions administrator/components/com_csp/src/Helper/ReporterHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public static function getHttpHeadersPluginId()
catch (\RuntimeException $e)
{
Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');

return false;
zero-24 marked this conversation as resolved.
Show resolved Hide resolved
}

return $result;
Expand Down Expand Up @@ -72,6 +74,70 @@ public static function getCspTrashStatus()
catch (\RuntimeException $e)
{
Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');

return false;
}

return boolval($result);
}

/**
* Check whether there are unsafe-inline rules published
*
* @return boolean Whether there are unsafe-inline rules published
*
* @since 4.0.0
*/
public static function getCspUnsafeInlineStatus()
{
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select('COUNT(*)')
->from($db->quoteName('#__csp'))
->where($db->quoteName('blocked_uri') . ' = ' . $db->quote("'unsafe-inline'"))
->where($db->quoteName('published') . ' = ' . $db->quote('1'));
zero-24 marked this conversation as resolved.
Show resolved Hide resolved
$db->setQuery($query);

try
{
$result = (int) $db->loadResult();
}
catch (\RuntimeException $e)
{
Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');

return false;
}

return boolval($result);
richard67 marked this conversation as resolved.
Show resolved Hide resolved
}

/**
* Check whether there are unsafe-eval rules published
*
* @return boolean Whether there are unsafe-eval rules published
*
* @since 4.0.0
*/
public static function getCspUnsafeEvalStatus()
{
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select('COUNT(*)')
->from($db->quoteName('#__csp'))
->where($db->quoteName('blocked_uri') . ' = ' . $db->quote("'unsafe-eval'"))
->where($db->quoteName('published') . ' = 1'));
richard67 marked this conversation as resolved.
Show resolved Hide resolved
$db->setQuery($query);

try
{
$result = (int) $db->loadResult();
}
catch (\RuntimeException $e)
{
Factory::getApplication()->enqueueMessage($e->getMessage(), 'error');

return false;
}

return boolval($result);
Expand Down
16 changes: 15 additions & 1 deletion administrator/components/com_csp/src/View/Reports/HtmlView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,27 @@ public function display($tpl = null)
$this->httpHeadersId = ReporterHelper::getHttpHeadersPluginId();
}

if (ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy_mode', 'custom') === 'detect'
if (ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy_mode', 'detect') === 'detect'
&& ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy', 0)
&& ReporterHelper::getCspTrashStatus())
{
$this->trashWarningMessage = Text::_('COM_CSP_COLLECTING_TRASH_WARNING');
}

if (ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy_mode', 'detect') === 'auto'
&& ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy', 0)
&& ReporterHelper::getCspUnsafeInlineStatus())
{
$this->unsafeInlineWarningMessage = Text::_('COM_CSP_AUTO_UNSAFE_INLINE_WARNING');
}

if (ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy_mode', 'detect') === 'auto'
&& ComponentHelper::getParams('com_csp')->get('contentsecuritypolicy', 0)
&& ReporterHelper::getCspUnsafeEvalStatus())
{
$this->unsafeEvalWarningMessage = Text::_('COM_CSP_AUTO_UNSAFE_EVAL_WARNING');
}

$this->addToolbar();

return parent::display($tpl);
Expand Down
6 changes: 6 additions & 0 deletions administrator/components/com_csp/tmpl/reports/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@
<?php if (isset($this->trashWarningMessage)) : ?>
<?php Factory::getApplication()->enqueueMessage($this->trashWarningMessage, 'warning'); ?>
<?php endif; ?>
<?php if (isset($this->unsafeInlineWarningMessage)) : ?>
<?php Factory::getApplication()->enqueueMessage($this->unsafeInlineWarningMessage, 'warning'); ?>
<?php endif; ?>
<?php if (isset($this->unsafeEvalWarningMessage)) : ?>
<?php Factory::getApplication()->enqueueMessage($this->unsafeEvalWarningMessage, 'warning'); ?>
<?php endif; ?>
<?php if (empty($this->items)) : ?>
<div class="alert alert-info">
<span class="fas fa-info-circle" aria-hidden="true"></span><span class="sr-only"><?php echo Text::_('INFO'); ?></span>
Expand Down
2 changes: 2 additions & 0 deletions administrator/language/en-GB/com_csp.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
; Note : All ini files need to be saved as UTF-8

COM_CSP="Content Security Policy"
COM_CSP_AUTO_UNSAFE_EVAL_WARNING="You have configured a rule that still allows 'unsafe-eval' that bypasses the Content Security Policy and allows the execution of code injected into DOM APIs such as eval()."
COM_CSP_AUTO_UNSAFE_INLINE_WARNING="You have configured a rule that still allows 'unsafe-inline' that bypasses the Content Security Policy and allows the execution of unsafe in-page scripts and event handlers."
COM_CSP_COLLECTING_TRASH_WARNING="The Content Security Policy is in detect mode. Items that have been trashed will not be detected again until they are removed from the trash."
COM_CSP_CONFIGURATION="Content Security Policy: Options"
; Please do not translate the following language string
Expand Down