' . $this->esc(t('This product has no technical checklist items defined yet.')) . '
'; + } + + $rows = ''; + foreach ($sections as $section) { + if (!is_array($section)) { + continue; + } + $label = trim((string) ($section['label'] ?? '')); + if ($label !== '') { + $rows .= '' . $this->esc($note) . '
' : '';
+ $rows .= '
+ 
+
+
+ {{title}}
+{{generated_at}}
+ | Customer | {{customer_name}} ({{customer_no}}) |
| Domain | {{domain}} |
| Software product | {{product}} |
| Responsible | {{owner}} |
| Status | {{status}} |
Result
+{{checks_done}} / {{checks_total}} ({{percent}}%)
+
+
+ Technical checklist
+ {{checklist}} + +Process
+ {{process}} + + + + +HTML; + } + + private function esc(string $value): string + { + return htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } +} diff --git a/modules/security/module.php b/modules/security/module.php index 89de0f8..053278c 100644 --- a/modules/security/module.php +++ b/modules/security/module.php @@ -30,6 +30,8 @@ return [ ['path' => 'security/templates/edit/{id}', 'target' => 'security/templates/edit'], ['path' => 'security/settings', 'target' => 'security/settings'], ['path' => 'security/settings/test-connection-data', 'target' => 'security/settings/test-connection-data'], + ['path' => 'security/report-design', 'target' => 'security/report-design'], + ['path' => 'security/report-design/logo-file', 'target' => 'security/report-design/logo-file'], ], 'public_paths' => [], diff --git a/modules/security/pages/security/report-design/index().php b/modules/security/pages/security/report-design/index().php new file mode 100644 index 0000000..b3e970d --- /dev/null +++ b/modules/security/pages/security/report-design/index().php @@ -0,0 +1,84 @@ +isMethod('POST') && !Session::checkCsrfToken()) { + Flash::error(t('Form expired, please try again'), 'security/report-design', 'csrf_expired'); + Router::redirect('security/report-design'); + + return; +} + +if ($request->isMethod('POST')) { + $action = (string) $request->body('action', 'save'); + + if ($action === 'delete_logo') { + $logoService->delete(); + Flash::success(t('Report logo removed'), 'security/report-design', 'report_logo_removed'); + Router::redirect('security/report-design'); + + return; + } + + $errorBag = formErrors(); + + if (!$reportSettings->setTemplateHtml((string) $request->body('template_html', ''))) { + $errorBag->add('template_html', t('The template is too large.')); + } + + // Only touch the logo when a file was actually submitted. + $upload = $request->filesAll()['logo'] ?? []; + if (is_array($upload) && (int) ($upload['error'] ?? UPLOAD_ERR_NO_FILE) !== UPLOAD_ERR_NO_FILE) { + $result = $logoService->saveUpload($upload); + if (!($result['ok'] ?? false)) { + $errorBag->addGlobal((string) ($result['error'] ?? t('Upload failed'))); + } + } + + if ($errorBag->hasAny()) { + flashFormErrors($errorBag, 'security/report-design', 'report_design_error'); + } else { + Flash::success(t('Settings saved'), 'security/report-design', 'report_design_saved'); + } + + Router::redirect('security/report-design'); + + return; +} + +$hasCustomTemplate = $reportSettings->hasCustomTemplate(); +// Prefill the editor with the built-in default scaffold when nothing is stored, +// so the admin has a working baseline to customise. +$templateHtml = $hasCustomTemplate ? $reportSettings->getTemplateHtml() : $templateService->defaultTemplateHtml(); +$variables = $templateService->availableVariables(); + +$hasLogo = $logoService->hasLogo(); +$logoVersion = ''; +if ($hasLogo) { + $logoPath = $logoService->findLogoPath(256); + $logoVersion = ($logoPath && is_file($logoPath)) ? (string) filemtime($logoPath) : ''; +} + +Buffer::set('title', t('Customer report design')); +Buffer::set('style_groups', json_encode(['security'])); +$breadcrumbs = [ + ['label' => t('Home'), 'path' => 'admin'], + ['label' => t('Security'), 'path' => 'security/checks'], + ['label' => t('Customer report design')], +]; diff --git a/modules/security/pages/security/report-design/index(default).phtml b/modules/security/pages/security/report-design/index(default).phtml new file mode 100644 index 0000000..0de7e49 --- /dev/null +++ b/modules/security/pages/security/report-design/index(default).phtml @@ -0,0 +1,75 @@ + +
+
+ t('Customer report design'),
+ 'actions' => [
+ ['label' => t('Save'), 'type' => 'submit', 'form' => 'security-report-design-form', 'class' => 'primary', 'tone' => 'success'],
+ ],
+ ];
+ require templatePath('partials/app-details-titlebar.phtml');
+ ?>
+
+
+
+
+
diff --git a/modules/security/pages/security/report-design/logo-file().php b/modules/security/pages/security/report-design/logo-file().php
new file mode 100644
index 0000000..bc42d9e
--- /dev/null
+++ b/modules/security/pages/security/report-design/logo-file().php
@@ -0,0 +1,31 @@
+queryAll();
+$size = isset($query['size']) ? (int) $query['size'] : null;
+
+$path = $logoService->findLogoPath($size);
+if (!$path || !is_file($path)) {
+ http_response_code(404);
+
+ return;
+}
+
+$mime = $logoService->detectMime($path);
+header('Content-Type: ' . $mime);
+header('X-Content-Type-Options: nosniff');
+header('Content-Security-Policy: sandbox');
+header('Cache-Control: private, max-age=300');
+header('Content-Length: ' . filesize($path));
+readfile($path);
diff --git a/modules/security/templates/aside-security-panel.phtml b/modules/security/templates/aside-security-panel.phtml
index 42d8c69..5777c31 100644
--- a/modules/security/templates/aside-security-panel.phtml
+++ b/modules/security/templates/aside-security-panel.phtml
@@ -9,6 +9,7 @@ $canManageSettings = !empty($securityNav['can_manage_settings']);
$checksActive = navActive(['security/checks', 'security/checks/create', 'security/checks/edit'], true);
$templatesActive = navActive(['security/templates', 'security/templates/create', 'security/templates/edit'], true);
$settingsActive = navActive('security/settings', true);
+$reportDesignActive = navActive('security/report-design', true);
$securityNavGroups = [
[
@@ -41,6 +42,12 @@ $securityNavGroups = [
'active' => $settingsActive,
'visible' => $canManageSettings,
],
+ [
+ 'label' => t('Report design'),
+ 'path' => 'security/report-design',
+ 'active' => $reportDesignActive,
+ 'visible' => $canManageSettings,
+ ],
],
],
];
diff --git a/modules/security/tests/Module/Security/Service/SecurityReportLogoServiceTest.php b/modules/security/tests/Module/Security/Service/SecurityReportLogoServiceTest.php
new file mode 100644
index 0000000..d087dca
--- /dev/null
+++ b/modules/security/tests/Module/Security/Service/SecurityReportLogoServiceTest.php
@@ -0,0 +1,81 @@
+service = new SecurityReportLogoService();
+ }
+
+ public function testReportLogoDirIsScopedToSecurityReportLogo(): void
+ {
+ $this->assertStringEndsWith('/security/report-logo', $this->service->reportLogoDir());
+ }
+
+ public function testSaveUploadRejectsMissingFile(): void
+ {
+ $this->assertFalse($this->service->saveUpload([])['ok']);
+ }
+
+ public function testSaveUploadRejectsUploadError(): void
+ {
+ $result = $this->service->saveUpload([
+ 'tmp_name' => '/tmp/whatever',
+ 'error' => UPLOAD_ERR_NO_FILE,
+ 'size' => 100,
+ ]);
+
+ $this->assertFalse($result['ok']);
+ }
+
+ public function testSaveUploadRejectsOversizedFile(): void
+ {
+ $result = $this->service->saveUpload([
+ 'tmp_name' => '/tmp/whatever',
+ 'error' => UPLOAD_ERR_OK,
+ 'size' => 6 * 1024 * 1024,
+ ]);
+
+ $this->assertFalse($result['ok']);
+ }
+
+ public function testSaveUploadRejectsNonImageContent(): void
+ {
+ $tmp = tempnam(sys_get_temp_dir(), 'sec-logo-test');
+ $this->assertNotFalse($tmp);
+ file_put_contents($tmp, "just some plain text, not an image\n");
+
+ try {
+ $result = $this->service->saveUpload([
+ 'tmp_name' => $tmp,
+ 'error' => UPLOAD_ERR_OK,
+ 'size' => filesize($tmp),
+ ]);
+
+ $this->assertFalse($result['ok']);
+ // Rejection must happen before any directory/file is created.
+ $this->assertFalse(is_dir($this->service->reportLogoDir() . '/__never__'));
+ } finally {
+ @unlink($tmp);
+ }
+ }
+
+ public function testDeleteIsIdempotentWhenNothingStored(): void
+ {
+ // delete() is safe to call even when the directory does not exist.
+ $this->assertTrue($this->service->delete());
+ }
+}
diff --git a/modules/security/tests/Module/Security/Service/SecurityReportPdfServiceTest.php b/modules/security/tests/Module/Security/Service/SecurityReportPdfServiceTest.php
index 7cacc7a..a308445 100644
--- a/modules/security/tests/Module/Security/Service/SecurityReportPdfServiceTest.php
+++ b/modules/security/tests/Module/Security/Service/SecurityReportPdfServiceTest.php
@@ -4,6 +4,8 @@ namespace MintyPHP\Tests\Module\Security\Service;
use MintyPHP\Module\Security\Service\SecurityCheckProcess;
use MintyPHP\Module\Security\Service\SecurityReportPdfService;
+use MintyPHP\Module\Security\Service\SecurityReportSettingsGateway;
+use MintyPHP\Module\Security\Service\SecurityReportTemplateService;
use MintyPHP\Service\Branding\BrandingLogoService;
use PHPUnit\Framework\TestCase;
@@ -48,6 +50,7 @@ class SecurityReportPdfServiceTest extends TestCase
'domain_no' => 'DNS-1',
'product_name' => 'Intranet',
'product_code' => 'intranet',
+ 'owner_name' => 'Jane Doe',
'status' => SecurityCheckProcess::STATUS_IN_PROGRESS,
'process_state' => $processState,
'tech_schema_snapshot' => $snapshot,
@@ -64,6 +67,7 @@ class SecurityReportPdfServiceTest extends TestCase
$this->assertSame('D-100', $context['customer_no']);
$this->assertSame('acme.de', $context['domain']);
$this->assertSame('Intranet', $context['product']);
+ $this->assertSame('Jane Doe', $context['owner']);
$this->assertNotSame('', $context['title']);
// Summary mirrors the progress math (3 tech items, 2 done).
@@ -126,4 +130,28 @@ class SecurityReportPdfServiceTest extends TestCase
$this->assertNotSame('', $pdf);
$this->assertStringStartsWith('%PDF-', $pdf);
}
+
+ public function testRenderCustomerReportPdfUsesConfiguredCustomTemplate(): void
+ {
+ $branding = $this->createMock(BrandingLogoService::class);
+ $branding->method('hasLogo')->willReturn(false);
+
+ $settings = $this->createMock(SecurityReportSettingsGateway::class);
+ $settings->method('getTemplateHtml')->willReturn(
+ '
+
+ 'logo',
+ 'accept' => 'image/svg+xml,image/png,image/jpeg,image/webp',
+ 'hint' => t('Allowed file types: SVG, PNG, JPG, WEBP. Max 5 MB.'),
+ 'currentSrc' => $logoCurrentSrc,
+ 'currentLabel' => t('Current logo'),
+ 'deleteConfirm' => t('Delete this logo?'),
+ 'formId' => 'security-report-design-form',
+ 'deleteFormId' => 'security-report-logo-delete-form',
+ ];
+ require templatePath('partials/app-file-upload.phtml');
+ ?>
+
+
+
+
+
+ Custom {{customer_name}}
{{checklist}}' + ); + + $service = new SecurityReportPdfService( + new SecurityCheckProcess(), + $branding, + null, + $settings, + new SecurityReportTemplateService(), + null + ); + + $pdf = $service->renderCustomerReportPdf($this->enrichedCheck(), ['app_name' => 'CoreCore']); + + $this->assertStringStartsWith('%PDF-', $pdf); + } } diff --git a/modules/security/tests/Module/Security/Service/SecurityReportSettingsGatewayTest.php b/modules/security/tests/Module/Security/Service/SecurityReportSettingsGatewayTest.php new file mode 100644 index 0000000..5bdbb8c --- /dev/null +++ b/modules/security/tests/Module/Security/Service/SecurityReportSettingsGatewayTest.php @@ -0,0 +1,68 @@ + $values + */ + private function makeGateway(array $values = []): SecurityReportSettingsGateway + { + $metadata = $this->createMock(SettingsMetadataGateway::class); + $metadata->method('getValue')->willReturnCallback(static fn (string $key): ?string => $values[$key] ?? null); + $metadata->method('set')->willReturn(true); + + return new SecurityReportSettingsGateway($metadata); + } + + public function testTemplateDefaultsToEmpty(): void + { + $gateway = $this->makeGateway(); + + $this->assertSame('', $gateway->getTemplateHtml()); + $this->assertFalse($gateway->hasCustomTemplate()); + } + + public function testGetTemplateHtmlReturnsTrimmedStoredValue(): void + { + $gateway = $this->makeGateway([ + SecurityReportSettingsGateway::KEY_TEMPLATE_HTML => "{{title}}
", + ]); + + $this->assertSame('{{title}}
', $gateway->getTemplateHtml()); + $this->assertTrue($gateway->hasCustomTemplate()); + } + + public function testSetTemplateHtmlRejectsOversizedTemplate(): void + { + $gateway = $this->makeGateway(); + + $tooLong = str_repeat('a', SecurityReportSettingsGateway::MAX_TEMPLATE_LENGTH + 1); + $this->assertFalse($gateway->setTemplateHtml($tooLong)); + } + + public function testSetTemplateHtmlPersistsValueAndClearsOnEmpty(): void + { + $writes = []; + $metadata = $this->createMock(SettingsMetadataGateway::class); + $metadata->method('getValue')->willReturn(null); + $metadata->method('set')->willReturnCallback(static function (string $key, ?string $value, ?string $description = null) use (&$writes): bool { + $writes[$key] = $value; + + return true; + }); + $gateway = new SecurityReportSettingsGateway($metadata); + + $this->assertTrue($gateway->setTemplateHtml('x
')); + $this->assertSame('x
', $writes[SecurityReportSettingsGateway::KEY_TEMPLATE_HTML]); + + // Blank input clears the setting (restores the built-in default). + $this->assertTrue($gateway->setTemplateHtml(' ')); + $this->assertNull($writes[SecurityReportSettingsGateway::KEY_TEMPLATE_HTML]); + } +} diff --git a/modules/security/tests/Module/Security/Service/SecurityReportTemplateServiceTest.php b/modules/security/tests/Module/Security/Service/SecurityReportTemplateServiceTest.php new file mode 100644 index 0000000..fe46c60 --- /dev/null +++ b/modules/security/tests/Module/Security/Service/SecurityReportTemplateServiceTest.php @@ -0,0 +1,118 @@ + + */ + private function context(): array + { + return [ + 'title' => 'Security check report', + 'customer_name' => 'Acme', + 'customer_no' => 'D-100', + 'domain' => 'acme.de', + 'product' => 'Intranet', + 'owner' => 'Jane Doe', + 'status_label' => 'In progress', + 'generated_at' => '2026-06-22 10:00', + 'app_name' => 'CoreCore', + 'logo_data_uri' => 'data:image/png;base64,AAAA', + 'summary' => ['percent' => 72, 'tech_done' => 2, 'tech_total' => 3], + 'tech_sections' => [ + ['label' => 'Transport', 'items' => [ + ['label' => 'TLS enforced', 'done' => true, 'note' => 'TLS 1.3'], + ['label' => 'HSTS header', 'done' => false, 'note' => ''], + ]], + ], + 'steps' => [ + ['number' => 1, 'label' => 'Kickoff', 'done' => true, 'completed_at' => '2026-06-18'], + ], + ]; + } + + public function testRenderSubstitutesScalarsAndEscapesData(): void + { + $service = new SecurityReportTemplateService(); + + $out = $service->render( + '