fix CSP warning, remove inline style from FontAwesome moinwiki#1816

src/moin/macros/FontAwesome.py

@@ -19,7 +19,7 @@
 """
 
 
-from moin.utils.tree import moin_page
+from moin.utils.tree import html, moin_page
 from moin.macros._base import MacroInlineBase, fail_message
 from moin.i18n import _
 
@@ -39,22 +39,15 @@ def macro(self, content, arguments, page_url, alternative):
             try:
                 int(color[1:], 16)
                 assert len(color) in (4, 7)
-                color = f"color: {color}; "
             except (ValueError, AssertionError):
                 color = ""
-        else:
-            color = f"color: {color}; " if color.isalpha() else ""
-
         if size:
             try:
                 s = float(size)
                 assert s > 0.1
                 assert s < 99
-                size = f"font-size: {size}em;"
             except (ValueError, AssertionError):
                 size = ""
-
-        style = color + size
         classes = []
         for font in fonts:
             f = font if font.startswith("fa-") else "fa-" + font
@@ -66,6 +59,5 @@ def macro(self, content, arguments, page_url, alternative):
         classes = " ".join(classes)
 
         attrib = {moin_page.class_: classes}
-        if style:
-            attrib[moin_page.style] = style
+        attrib[html.data_style] = ",".join((color, size))
         return moin_page.span(attrib=attrib)

src/moin/static/js/common.js

@@ -821,6 +821,20 @@ $(document).ready(function () {
             alert(_("Your edit lock will expire in 1 minute: ") + $('#moin-item-name').val())}, (($("#moin-lock_duration").val() - 60) * 1000));
     }
 
+    // convert FontAwesome data-style color & font-size attributes to css attr,
+    // cannot do style in macros/FontAwesome.py because CSP flags inline style attributes
+    var styl;
+    var elements = $('[data-style]');
+    elements.each(function() {
+        styl = $(this).data('style').split(",");
+        if (styl.length > 0) {
+            $(this).css('color', styl[0]);
+        }
+        if (styl.length > 1) {
+            $(this).css('font-size', styl[1] + "em");
+        }
+    });
+
     moinFontChangeOnReady();
 
     $('textarea.moin-autosize').autosize();