Skip to content

refactor: keep CSP lazy when resetting Kint in worker mode #10147

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
michalsn merged 1 commit into from
Apr 28, 2026
+35 −4
Merged

refactor: keep CSP lazy when resetting Kint in worker mode #10147

Show file tree
Hide file tree
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
17 changes: 13 additions & 4 deletions system/CodeIgniter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
use Config\Cache;
use Config\Feature;
use Config\Services;
use Kint\Kint;
use Kint\Renderer\RichRenderer;
use Locale;
use ReflectionFunction;
use ReflectionFunctionAbstract;
Expand Down Expand Up @@ -207,10 +209,17 @@ private function resetKintForWorkerMode(): void
return;
}

$csp = service('csp');
if ($csp->enabled()) {
RichRenderer::$js_nonce = $csp->getScriptNonce();
RichRenderer::$css_nonce = $csp->getStyleNonce();
// Keep CSP lazy unless it was already initialized or explicitly enabled.
if (Services::has('csp') || config(App::class)->CSPEnabled) {
$csp = service('csp');

if ($csp->enabled()) {
RichRenderer::$js_nonce = $csp->getScriptNonce();
RichRenderer::$css_nonce = $csp->getStyleNonce();
} else {
RichRenderer::$js_nonce = null;
RichRenderer::$css_nonce = null;
}
} else {
RichRenderer::$js_nonce = null;
RichRenderer::$css_nonce = null;
Expand Down
22 changes: 22 additions & 0 deletions tests/system/CodeIgniterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,4 +1306,26 @@ public function testResetForWorkerMode(): void
$this->assertSame($csp->getStyleNonce(), RichRenderer::$css_nonce);
$this->assertTrue(RichRenderer::$needs_pre_render);
}

public function testResetForWorkerModeDoesNotLoadCspWhenDisabled(): void
{
$this->resetServices();

config(App::class)->CSPEnabled = false;

RichRenderer::$js_nonce = 'stale-script-nonce';
RichRenderer::$css_nonce = 'stale-style-nonce';
RichRenderer::$needs_pre_render = false;

$codeigniter = new MockCodeIgniter(new App());

$this->assertFalse(Services::has('csp'));

$codeigniter->resetForWorkerMode();

$this->assertFalse(Services::has('csp'));
$this->assertNull(RichRenderer::$js_nonce);
$this->assertNull(RichRenderer::$css_nonce);
$this->assertTrue(RichRenderer::$needs_pre_render);
}
}
Loading