UIMacros: added n:nonce

Author: dg

src/Application/UI/Presenter.php

@@ -1365,7 +1365,7 @@ public function getContext()
 	/**
 	 * @return Nette\Http\IRequest
 	 */
-	protected function getHttpRequest()
+	public function getHttpRequest()
 	{
 		return $this->httpRequest;
 	}
@@ -1374,7 +1374,7 @@ protected function getHttpRequest()
 	/**
 	 * @return Nette\Http\IResponse
 	 */
-	protected function getHttpResponse()
+	public function getHttpResponse()
 	{
 		return $this->httpResponse;
 	}

src/Bridges/ApplicationLatte/TemplateFactory.php

@@ -103,6 +103,8 @@ public function createTemplate(UI\Control $control = NULL)
 			$latte->addProvider('uiControl', $control);
 			$latte->addProvider('uiPresenter', $presenter);
 			$latte->addProvider('snippetBridge', new Nette\Bridges\ApplicationLatte\SnippetBridge($control));
+			$nonce = preg_match('#\s\'nonce-([\w+/]+=*)\'#', $presenter->getHttpResponse()->getHeader('Content-Security-Policy'), $m) ? $m[1] : NULL;
+			$latte->addProvider('uiNonce', $nonce);
 		}
 		$latte->addProvider('cacheStorage', $this->cacheStorage);
 

src/Bridges/ApplicationLatte/UIMacros.php

@@ -21,6 +21,7 @@
  * - {link destination ...} control link
  * - {plink destination ...} presenter link
  * - {snippet ?} ... {/snippet ?} control snippet
+ * - n:once
  */
 class UIMacros extends Latte\Macros\MacroSet
 {
@@ -41,6 +42,7 @@ public static function install(Latte\Compiler $compiler)
 		$me->addMacro('ifCurrent', [$me, 'macroIfCurrent'], '}'); // deprecated; use n:class="$presenter->linkCurrent ? ..."
 		$me->addMacro('extends', [$me, 'macroExtends']);
 		$me->addMacro('layout', [$me, 'macroExtends']);
+		$me->addMacro('nonce', NULL, NULL, 'echo $this->global->uiNonce ? " nonce=\"{$this->global->uiNonce}\"" : "";');
 	}
 
 

tests/Bridges.Latte/TemplateFactory.nonce.phpt

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Test: TemplateFactory nonce
+ */
+
+use Nette\Application\UI;
+use Nette\Bridges\ApplicationLatte;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$latte = new Latte\Engine;
+
+$latteFactory = Mockery::mock(ApplicationLatte\ILatteFactory::class);
+$latteFactory->shouldReceive('create')->andReturn($latte);
+
+$response = Mockery::mock(Nette\Http\Response::class);
+$response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
+
+$presenter = Mockery::mock(UI\Presenter::class);
+$presenter->shouldReceive('getPresenter')->andReturn($presenter);
+$presenter->shouldReceive('getHttpResponse')->andReturn($response);
+$presenter->shouldIgnoreMissing();
+
+$factory = new ApplicationLatte\TemplateFactory($latteFactory);
+$factory->createTemplate($presenter);
+
+$latte->setLoader(new Latte\Loaders\StringLoader);
+
+Assert::match(
+	'<script nonce="abcd123=="></script>',
+	$latte->renderToString('<script n:nonce></script>')
+);