Skip to content

Use csp nonceprovider #88

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use csp nonceprovider #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 25 additions & 1 deletion Block/Tab/Panel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ class Panel extends \Magento\Framework\View\Element\Template

protected $qdbHelperRegister;

private $cspNonceProvider;


public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
Expand All @@ -27,6 +29,10 @@ public function __construct(

$this->helper = $helper;
$this->qdbHelperRegister = $qdbHelperRegister;

if(class_exists(\Magento\Csp\Helper\CspNonceProvider::class)) {
$this->cspNonceProvider = ObjectManager::getInstance()->get(\Magento\Csp\Helper\CspNonceProvider::class);
}
}

/**
Expand Down Expand Up @@ -190,7 +196,9 @@ protected function _toHtml()
{
try {
$buffer = parent::_toHtml();
return $this->sanitizeOutput($buffer);
$buffer = $this->sanitizeOutput($buffer);
$buffer = $this->addNonceOnScript($buffer);
return $buffer;
} catch (\Exception $e) {
return $e->getMessage();
}
Expand Down Expand Up @@ -225,6 +233,20 @@ protected function sanitizeOutput($buffer)
return $buffer;
}

private function addNonceOnScript($buffer)
{
//$this->setAutoNonceOnSrciptTag(true);
if($this->getAutoNonceOnSrciptTag() && $this->cspNonceProvider) {
$openscriptPattern = '/<(script)(.*)>/';
$nonceTiInject = 'nonce="' . $this->cspNonceProvider->generateNonce() .'"';
if(preg_match($openscriptPattern, $buffer, $matches) ) {
$buffer = preg_replace($openscriptPattern, '<${1} ' . $nonceTiInject . '${2}>', $buffer);
}
}

return $buffer;
}

public function htmlFormatClass($class)
{
return $this->helper->getIDELinkForClass($class);
Expand All @@ -245,4 +267,6 @@ public function getQdbConfig($key, $scopeType = ScopeConfigInterface::SCOPE_TYPE
return $this->helper->getQdbConfig($key, $scopeType, $scopeCode);
}



}
Loading