Allow multiple htmlsupport rules

Author: oliverfoster

frontend/src/modules/scaffold/backboneFormsOverrides.js

@@ -91,14 +91,11 @@ define([
         enterMode: CKEDITOR[Origin.constants.ckEditorEnterMode],
         entities: false,
         htmlSupport: {
-          allow: [
-            {
-              "name": new RegExp(Origin.constants.htmlSupportAllowed.name),
-              "attributes": Origin.constants.htmlSupportAllowed.attributes,
-              "classes": Origin.constants.htmlSupportAllowed.classes,
-              "styles": Origin.constants.htmlSupportAllowed.styles
-            }
-          ]
+          // Convert all allow/disallow values to regexp, as config is json only
+          allow: ((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.allow) || [])
+            .map(obj => Object.fromEntries(Object.entries(obj).map(([name, value]) => ([name, new RegExp(value)])))),
+          disallow: ((Origin.constants.ckEditorHtmlSupport && Origin.constants.ckEditorHtmlSupport.disallow) || [])
+            .map(obj => Object.fromEntries(Object.entries(obj).map(([name, value]) => ([name, new RegExp(value)]))))
         },
         on: {
           change: function() {

lib/configuration.js

@@ -32,7 +32,7 @@ var ALLOWED_CLIENT_SIDE_KEYS = [
   'useSmtp',
   'isProduction',
   'maxLoginAttempts',
-  'htmlSupportAllowed',
+  'ckEditorHtmlSupport',
   'ckEditorEnterMode',
   'maxFileUploadSize',
   'supportLink',
@@ -81,11 +81,17 @@ function Configuration() {
   this.conf = {
     root: this.serverRoot,
     maxLoginAttempts: 3,
-    htmlSupportAllowed: {
-      name: ".*",
-      attributes: true,
-      classes: true,
-      styles: true
+    ckEditorHtmlSupport: {
+      allow: [{
+        name: "^(blockquote|ul|ol|span)$"
+      },{
+        name: ".*",
+        classes: ".*",
+        styles: ".*"
+      },{
+        name: "^a$",
+        attributes: "^target$"
+      }]
     },
     maxFileUploadSize: '200MB',
     ckEditorEnterMode: 'ENTER_P'