add CHANGELOG.md

CHANGELOG.md

@@ -1,7 +1,10 @@
 ## CHANGELOG
 
-### [24.6.0] - In Development
+### [24.6.0] - June 20, 2024
 - Added an actual CHANGELOG.md instead of relying on GitHub Release history
+- The `Content-Security-Policy` header is now set as a HTTP response header and uses a standard value for all pages
+- The `Content-Security-Policy` header now allows an `img-src` of all, which means external images are now supported in Markdown
+- Updated `github-markdown-css` JavaScript library to 5.6.1
 
 ### [24.5.0] - May 15, 2024
 - Drop support for Python 3.8
@@ -306,9 +309,85 @@
 ### 21.11.0 - Nov 29, 2021
 - Initial release
 
-[1.0.6]: https://github.com/cmason3/jinjafx/compare/v1.0.5...v1.0.6
-[1.0.5]: https://github.com/cmason3/jinjafx/compare/v1.0.4...v1.0.5
-[1.0.4]: https://github.com/cmason3/jinjafx/compare/v1.0.3...v1.0.4
-[1.0.3]: https://github.com/cmason3/jinjafx/compare/v1.0.2...v1.0.3
-[1.0.2]: https://github.com/cmason3/jinjafx/compare/v1.0.1...v1.0.2
-[1.0.1]: https://github.com/cmason3/jinjafx/compare/v1.0.0...v1.0.1
+[24.6.0]: https://github.com/cmason3/jinjafx_server/compare/24.5.0...24.6.0
+[24.5.0]: https://github.com/cmason3/jinjafx_server/compare/24.3.0...24.5.0
+[24.3.0]: https://github.com/cmason3/jinjafx_server/compare/24.1.1...24.3.0
+[24.1.1]: https://github.com/cmason3/jinjafx_server/compare/24.1.0...24.1.1
+[24.1.0]: https://github.com/cmason3/jinjafx_server/compare/23.12.1...24.1.0
+[23.12.1]: https://github.com/cmason3/jinjafx_server/compare/23.12.0...23.12.1
+[23.12.0]: https://github.com/cmason3/jinjafx_server/compare/23.11.1...23.12.0
+[23.11.1]: https://github.com/cmason3/jinjafx_server/compare/23.11.0...23.11.1
+[23.11.0]: https://github.com/cmason3/jinjafx_server/compare/23.9.1...23.11.0
+[23.9.1]: https://github.com/cmason3/jinjafx_server/compare/23.9.0...23.9.1
+[23.9.0]: https://github.com/cmason3/jinjafx_server/compare/23.8.3...23.9.0
+[23.8.3]: https://github.com/cmason3/jinjafx_server/compare/23.8.2...23.8.3
+[23.8.2]: https://github.com/cmason3/jinjafx_server/compare/23.8.1...23.8.2
+[23.8.1]: https://github.com/cmason3/jinjafx_server/compare/23.8.0...23.8.1
+[23.8.0]: https://github.com/cmason3/jinjafx_server/compare/23.6.0...23.8.0
+[23.6.0]: https://github.com/cmason3/jinjafx_server/compare/23.3.2...23.6.0
+[23.3.2]: https://github.com/cmason3/jinjafx_server/compare/23.3.1...23.3.2
+[23.3.1]: https://github.com/cmason3/jinjafx_server/compare/23.3.0...23.3.1
+[23.3.0]: https://github.com/cmason3/jinjafx_server/compare/23.2.1...23.3.0
+[23.2.1]: https://github.com/cmason3/jinjafx_server/compare/23.2.0...23.2.1
+[23.2.0]: https://github.com/cmason3/jinjafx_server/compare/23.1.0...23.2.0
+[23.1.0]: https://github.com/cmason3/jinjafx_server/compare/22.12.2...23.1.0
+[22.12.2]: https://github.com/cmason3/jinjafx_server/compare/22.12.1...22.12.2
+[22.12.1]: https://github.com/cmason3/jinjafx_server/compare/22.11.4...22.12.1
+[22.11.4]: https://github.com/cmason3/jinjafx_server/compare/22.11.2...22.11.4
+[22.11.2]: https://github.com/cmason3/jinjafx_server/compare/22.11.1...22.11.2
+[22.11.1]: https://github.com/cmason3/jinjafx_server/compare/22.11.0...22.11.1
+[22.11.0]: https://github.com/cmason3/jinjafx_server/compare/22.10.1...22.11.0
+[22.10.1]: https://github.com/cmason3/jinjafx_server/compare/22.10.0...22.10.1
+[22.10.0]: https://github.com/cmason3/jinjafx_server/compare/22.9.5...22.10.0
+[22.9.5]: https://github.com/cmason3/jinjafx_server/compare/22.9.4...22.9.5
+[22.9.4]: https://github.com/cmason3/jinjafx_server/compare/22.9.2...22.9.4
+[22.9.2]: https://github.com/cmason3/jinjafx_server/compare/22.9.1...22.9.2
+[22.9.1]: https://github.com/cmason3/jinjafx_server/compare/22.9.0...22.9.1
+[22.9.0]: https://github.com/cmason3/jinjafx_server/compare/22.8.1...22.9.0
+[22.8.1]: https://github.com/cmason3/jinjafx_server/compare/22.8.0...22.8.1
+[22.8.0]: https://github.com/cmason3/jinjafx_server/compare/22.7.9...22.8.0
+[22.7.9]: https://github.com/cmason3/jinjafx_server/compare/22.7.8...22.7.9
+[22.7.8]: https://github.com/cmason3/jinjafx_server/compare/22.7.7...22.7.8
+[22.7.7]: https://github.com/cmason3/jinjafx_server/compare/22.7.6...22.7.7
+[22.7.6]: https://github.com/cmason3/jinjafx_server/compare/22.7.4...22.7.6
+[22.7.4]: https://github.com/cmason3/jinjafx_server/compare/22.7.3...22.7.4
+[22.7.3]: https://github.com/cmason3/jinjafx_server/compare/22.7.2...22.7.3
+[22.7.2]: https://github.com/cmason3/jinjafx_server/compare/22.7.1...22.7.2
+[22.7.1]: https://github.com/cmason3/jinjafx_server/compare/22.7.0...22.7.1
+[22.7.0]: https://github.com/cmason3/jinjafx_server/compare/22.6.2...22.7.0
+[22.6.2]: https://github.com/cmason3/jinjafx_server/compare/22.6.1...22.6.2
+[22.6.1]: https://github.com/cmason3/jinjafx_server/compare/22.6.0...22.6.1
+[22.6.0]: https://github.com/cmason3/jinjafx_server/compare/22.5.9...22.6.0
+[22.5.9]: https://github.com/cmason3/jinjafx_server/compare/22.5.8...22.5.9
+[22.5.8]: https://github.com/cmason3/jinjafx_server/compare/22.5.7...22.5.8
+[22.5.7]: https://github.com/cmason3/jinjafx_server/compare/22.5.6...22.5.7
+[22.5.6]: https://github.com/cmason3/jinjafx_server/compare/22.5.5...22.5.6
+[22.5.5]: https://github.com/cmason3/jinjafx_server/compare/22.5.4...22.5.5
+[22.5.4]: https://github.com/cmason3/jinjafx_server/compare/22.5.3...22.5.4
+[22.5.3]: https://github.com/cmason3/jinjafx_server/compare/22.5.2...22.5.3
+[22.5.2]: https://github.com/cmason3/jinjafx_server/compare/22.5.1...22.5.2
+[22.5.1]: https://github.com/cmason3/jinjafx_server/compare/22.5.0...22.5.1
+[22.5.0]: https://github.com/cmason3/jinjafx_server/compare/22.4.6...22.5.0
+[22.4.6]: https://github.com/cmason3/jinjafx_server/compare/22.4.5...22.4.6
+[22.4.5]: https://github.com/cmason3/jinjafx_server/compare/22.4.4...22.4.5
+[22.4.4]: https://github.com/cmason3/jinjafx_server/compare/22.4.2...22.4.4
+[22.4.2]: https://github.com/cmason3/jinjafx_server/compare/22.4.1...22.4.2
+[22.4.1]: https://github.com/cmason3/jinjafx_server/compare/22.4.0...22.4.1
+[22.4.0]: https://github.com/cmason3/jinjafx_server/compare/22.3.6...22.4.0
+[22.3.6]: https://github.com/cmason3/jinjafx_server/compare/22.3.5...22.3.6
+[22.3.5]: https://github.com/cmason3/jinjafx_server/compare/22.3.4...22.3.5
+[22.3.4]: https://github.com/cmason3/jinjafx_server/compare/22.3.3...22.3.4
+[22.3.3]: https://github.com/cmason3/jinjafx_server/compare/22.3.2...22.3.3
+[22.3.2]: https://github.com/cmason3/jinjafx_server/compare/22.3.1...22.3.2
+[22.3.1]: https://github.com/cmason3/jinjafx_server/compare/22.2.2...22.3.1
+[22.2.2]: https://github.com/cmason3/jinjafx_server/compare/22.2.1...22.2.2
+[22.2.1]: https://github.com/cmason3/jinjafx_server/compare/22.1.7...22.2.1
+[22.1.7]: https://github.com/cmason3/jinjafx_server/compare/22.1.6...22.1.7
+[22.1.6]: https://github.com/cmason3/jinjafx_server/compare/22.1.5...22.1.6
+[22.1.5]: https://github.com/cmason3/jinjafx_server/compare/22.1.4...22.1.5
+[22.1.4]: https://github.com/cmason3/jinjafx_server/compare/22.1.3...22.1.4
+[22.1.3]: https://github.com/cmason3/jinjafx_server/compare/22.1.2...22.1.3
+[22.1.2]: https://github.com/cmason3/jinjafx_server/compare/21.12.3...22.1.2
+[21.12.3]: https://github.com/cmason3/jinjafx_server/compare/21.12.2...21.12.3
+[21.12.2]: https://github.com/cmason3/jinjafx_server/compare/21.12.1...21.12.2
+[21.12.1]: https://github.com/cmason3/jinjafx_server/compare/21.11.0...21.12.1

contrib/update_cdnjs_links.py

@@ -11,7 +11,7 @@
   'dayjs': '1.11.11',
   'pako': '2.1.0',
   'jszip': '3.10.1',
-  'github-markdown-css': '5.5.1'
+  'github-markdown-css': '5.6.1'
 }
 
 def update_file(cdnjs_url, sri, f):

jinjafx_server.py

@@ -28,7 +28,7 @@
 import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess
 import cmarkgfm, emoji
 
-__version__ = '24.5.0'
+__version__ = '24.6.0'
 
 llock = threading.RLock()
 rlock = threading.RLock()
@@ -406,7 +406,6 @@ def do_GET(self, head=False, cache=True, versioned=False):
 
         self.send_header('Content-Type', r[0])
         self.send_header('Content-Length', str(len(r[2])))
-        self.send_header('X-Content-Type-Options', 'nosniff')
 
       if versioned:
         self.send_header('Cache-Control', 'public, max-age=31536000')
@@ -416,7 +415,9 @@ def do_GET(self, head=False, cache=True, versioned=False):
 
       elif r[1] == 200 or r[1] == 304:
         if r[1] == 200:
-          self.send_header('Content-Security-Policy', "frame-ancestors 'none'")
+          # self.send_header('Content-Security-Policy', "frame-ancestors 'none'")
+          self.send_header('X-Content-Type-Options', 'nosniff')
+          self.send_header('Content-Security-Policy', "default-src 'self'; style-src 'self' https://cdnjs.cloudflare.com 'unsafe-inline'; script-src 'self' https://cdnjs.cloudflare.com; img-src *; frame-ancestors 'none'")
           self.send_header('Referrer-Policy', 'strict-origin-when-cross-origin')
 
         self.send_header('Cache-Control', 'max-age=0, must-revalidate')
@@ -548,7 +549,7 @@ def html_escape(text):
                     options = (cmarkgfm.cmark.Options.CMARK_OPT_GITHUB_PRE_LANG | cmarkgfm.cmark.Options.CMARK_OPT_SMART | cmarkgfm.cmark.Options.CMARK_OPT_UNSAFE)
                     output = cmarkgfm.github_flavored_markdown_to_html(html_escape(output), options).replace('&', '&').replace('&', '&')
                     head = '<!DOCTYPE html>\n<html>\n<head>\n'
-                    head += '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.5.1/github-markdown.min.css" crossorigin="anonymous">\n'
+                    head += '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/github-markdown-css/5.6.1/github-markdown.min.css" crossorigin="anonymous">\n'
                     head += '<style>\n  pre, code { white-space: pre-wrap !important; word-wrap: break-word !important; }\n</style>\n</head>\n'
                     output = emoji.emojize(output, language='alias').encode('ascii', 'xmlcharrefreplace').decode('utf-8')
                     output = head + '<body>\n<div class="markdown-body">\n' + output + '</div>\n</body>\n</html>\n'

www/dt.html

@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' https://cdnjs.cloudflare.com 'unsafe-inline'">
     <meta name="viewport" content="width=1536, user-scalable=no">
     <title>JinjaFx DataTemplate</title>
     <link rel="shortcut icon" href="/874f2915/jinjafx.png">

www/index.html

@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' https://cdnjs.cloudflare.com 'unsafe-inline'; script-src 'self' https://cdnjs.cloudflare.com; img-src 'self' data:">
     <meta name="viewport" content="width=1536, user-scalable=no">
     <meta name="description" content="JinjaFx is a Python based Jinja2 Templating Tool with support for Ansible filters that renders output based on CSV or YAML datasets">
     <title>JinjaFx - Jinja2 Templating Tool</title>

www/output.html

@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'self' https://cdnjs.cloudflare.com 'unsafe-inline'; script-src 'self' https://cdnjs.cloudflare.com">
     <meta name="viewport" content="width=1536, user-scalable=no">
     <title>Generating...</title>
     <link rel="shortcut icon" href="/874f2915/jinjafx.png">