From 4f7c91bb9f350bc0d7708699a60fb679c90efdbc Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 12 Feb 2025 11:21:02 -0500
Subject: [PATCH 1/2] Sanitize HTML output and increase size of Body textarea
 input fields (CFM-62)

---
 app/src/Controller/PagesController.php     | 14 ++++++++++-
 app/src/Lib/Traits/ValidationTrait.php     |  9 +++----
 app/templates/MessageTemplates/fields.inc  | 28 ++++++++++++++--------
 app/templates/MostlyStaticPages/fields.inc | 19 +++++++++++++--
 app/webroot/css/co-base.css                |  3 +++
 5 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/app/src/Controller/PagesController.php b/app/src/Controller/PagesController.php
index 669a4100..240421c8 100644
--- a/app/src/Controller/PagesController.php
+++ b/app/src/Controller/PagesController.php
@@ -23,6 +23,8 @@
 use Cake\ORM\TableRegistry;
 use Cake\View\Exception\MissingTemplateException;
 use \App\Lib\Enum\SuspendableStatusEnum;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
+use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
 
 /**
  * Static content controller
@@ -130,7 +132,17 @@ public function show(string $coid, string $name) {
         $this->set('vv_bc_skip', true); // this doesn't do anything?
 
         $this->set('vv_title', $msp->title);
-        $this->set('vv_body', $msp->body);
+      
+        // Mostly Static Pages allow HTML input. Pass this through the Symfony HTML Sanitizer to
+        // disallow dom elements like <script> and <style>.
+        // XXX We may need to write a plugin (as in v4) if we want to allow <style> tags
+        $htmlSanitizer = new HtmlSanitizer(
+        // Allow all elements from the W3C Sanitizer API. This is more permissive than "allowSafeElements()".
+        // See: https://github.com/symfony/symfony/blob/7.2/src/Symfony/Component/HtmlSanitizer/Reference/W3CReference.php
+          (new HtmlSanitizerConfig())->allowStaticElements()
+        );
+        $sanitizedBody = $htmlSanitizer->sanitize($msp->body);
+        $this->set('vv_body', $sanitizedBody);
 
         return $this->render('/MostlyStaticPages/display');
     }
diff --git a/app/src/Lib/Traits/ValidationTrait.php b/app/src/Lib/Traits/ValidationTrait.php
index ff437d3e..8ef1b8d0 100644
--- a/app/src/Lib/Traits/ValidationTrait.php
+++ b/app/src/Lib/Traits/ValidationTrait.php
@@ -33,8 +33,6 @@
 use Cake\Database\Schema\TableSchemaInterface;
 use Cake\ORM\TableRegistry;
 use Cake\Validation\Validator;
-use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
-use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
 
 trait ValidationTrait {
   /**
@@ -241,11 +239,10 @@ public function validateInput($value, array $context) {
       switch($context['type']) {
         case 'html':
           // We are accepting HTML input. We will mostly pass it all through and ensure
-          // properly sanitized output. However, to help warn users about entering tags that 
-          // will be stripped, we can do some very rudimentary checking for script and 
-          // style tags. (An informational note should be placed below these fields as well.)
+          // properly sanitized output. However, we can do some very rudimentary checking for script tags.
+          // (An informational note should be placed below these fields as well.)
           $lowercaseVal = strtolower($value);
-          if(str_contains($lowercaseVal, '<script') || str_contains($lowercaseVal, '<style')) {
+          if(str_contains($lowercaseVal, '<script')) {
             // Disallowed HTML is in the input, so warn the user.
             return __d('error', 'input.invalid.html');
           }
diff --git a/app/templates/MessageTemplates/fields.inc b/app/templates/MessageTemplates/fields.inc
index aabd1d8d..db5e7a71 100644
--- a/app/templates/MessageTemplates/fields.inc
+++ b/app/templates/MessageTemplates/fields.inc
@@ -72,15 +72,20 @@ if($vv_action == 'add' || $vv_action == 'edit') {
     ]
   ]);
   
-  foreach ([
-             'subject',
-             'body_text'
-           ] as $field) {
-    print $this->element('form/listItem', [
-      'arguments' => [
-        'fieldName' => $field
-      ]]);
-  }
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'subject'
+    ]
+  ]);
+  
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'body_text',
+      'fieldOptions' => [
+        'class' => 'big-textarea'
+      ]
+    ]
+  ]);
 
   $afterField = 
     '<div class="alert alert-info small p-2 d-flex gap-1" role="alert">' .
@@ -90,7 +95,10 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   
   print $this->element('form/listItem', [
     'arguments' => [
-      'fieldName' => 'body_html'
+      'fieldName' => 'body_html',
+      'fieldOptions' => [
+        'class' => 'big-textarea'
+      ]
     ],
     'afterField' => $afterField
   ]);
diff --git a/app/templates/MostlyStaticPages/fields.inc b/app/templates/MostlyStaticPages/fields.inc
index 9ec30246..95a432a4 100644
--- a/app/templates/MostlyStaticPages/fields.inc
+++ b/app/templates/MostlyStaticPages/fields.inc
@@ -72,12 +72,27 @@ if($vv_action == 'add' || $vv_action == 'edit') {
   foreach ([
              'description',
              'status',
-             'context',
-             'body'
+             'context'
            ] as $field) {
     print $this->element('form/listItem', [
       'arguments' => [
         'fieldName' => $field
       ]]);
   }
+
+  $afterField =
+    '<div class="alert alert-info small p-2 d-flex gap-1" role="alert">' .
+    '  <em class="material-symbols-outlined" aria-hidden="true">info</em>' .
+    '  <span class="alert-text">' . __d('information','html.sanitization') . '</span>' .
+    '</div>';
+  
+  print $this->element('form/listItem', [
+    'arguments' => [
+      'fieldName' => 'body',
+      'fieldOptions' => [
+        'class' => 'big-textarea'
+      ]
+    ],
+    'afterField' => $afterField
+  ]);
 }
\ No newline at end of file
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index 7c6af684..c18f6f22 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -1618,6 +1618,9 @@ ul.form-list textarea {
   border: 1px solid var(--cmg-color-bg-007);
   padding: 0.5em;
 }
+ul.form-list textarea.big-textarea {
+  height: 24em;
+}
 ul.form-list li.field-stack textarea {
   margin: 0;
   width: 100%;

From 0d8b841f35051e081fde4a19b7e6ff1f41c7a937 Mon Sep 17 00:00:00 2001
From: Arlen Johnson <arlen@sphericalcowgroup.com>
Date: Wed, 12 Feb 2025 16:37:37 -0500
Subject: [PATCH 2/2] Ensure Mostly Static Page body is wrapped with a default
 div element (CFM-62)

---
 app/templates/MostlyStaticPages/display.php | 5 ++++-
 app/webroot/css/co-base.css                 | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/templates/MostlyStaticPages/display.php b/app/templates/MostlyStaticPages/display.php
index b4bf1cf4..e4d20f54 100644
--- a/app/templates/MostlyStaticPages/display.php
+++ b/app/templates/MostlyStaticPages/display.php
@@ -51,4 +51,7 @@
   <?php endif; // $banners ?>
 </div>
   
-<?= $vv_body ?>
\ No newline at end of file
+<div class="page-body">  
+  <?= $vv_body ?>
+</div>
+  
\ No newline at end of file
diff --git a/app/webroot/css/co-base.css b/app/webroot/css/co-base.css
index c18f6f22..edc62e04 100644
--- a/app/webroot/css/co-base.css
+++ b/app/webroot/css/co-base.css
@@ -2188,6 +2188,9 @@ body.pages.logged-out #breadcrumbs {
 body.pages.logged-out .page-title-container {
   margin: 0;
 }
+.page-body {
+  margin-top: 1em;
+}
 /* GENERAL */
 .hidden,
 .invisible,