diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b7682e..f843846 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,79 +1,82 @@ ## CHANGELOG -### [25.7.0] - Mar 31, 2025 +### [25.7.1] - April 1, 2025 +- Minor tweak to exception handling, so it now prints the line number within the template under certain conditions + +### [25.7.0] - March 31, 2025 - Added support for `jinjafx.rows` and `jinjafx.data()` to allow access to `data.csv` via JavaScript from within JinjaFx Input modals -### [25.6.2] - Mar 20, 2025 +### [25.6.2] - March 20, 2025 - Fixed an issue where `select` tags within JinjaFx Input modals weren't working when multi-select was enabled -### [25.6.1] - Mar 20, 2025 +### [25.6.1] - March 20, 2025 - Fixed an issue where JinjaFx Input scripts were removed when the modal was reset - You can now pass `?g` at the end of the URL to trigger auto-generate - you will need to allow popups or use a JinjaFx Input modal -### [25.6.0] - Mar 20, 2025 +### [25.6.0] - March 20, 2025 - Added support for `-allowjs` which allows dynamic JavaScript in HTML outputs and JinjaFx Input modals - this should only be enabled in internal environments where you trust your users - Added support for a `script` option for JinjaFx Input modals to allow dynamic input modals - requires `-allowjs` -### [25.5.5] - Mar 17, 2025 +### [25.5.5] - March 17, 2025 - Update font look on MacOS to make it less heavy - Added support for `-nocache` argument for internal development - Updated Pandoc to 3.6.4 in Dockerfile -### [25.5.4] - Feb 21, 2025 +### [25.5.4] - February 21, 2025 - Actually fixed issue #72 properly this time as we now deal with multi-line strings -### [25.5.3] - Feb 21, 2025 +### [25.5.3] - February 21, 2025 - Fixed issue #72 - `textarea` Inputs Not Recognized in Custom JinjaFx Input Forms -### [25.5.2] - Feb 11, 2025 +### [25.5.2] - February 11, 2025 - Fixed a regression where Pandoc conversion to DOCX hasn't been working since 25.3.0 -### [25.5.1] - Feb 11, 2025 +### [25.5.1] - February 11, 2025 - Changed behaviour of `jinjafx_vault_undefined`, so it only returns undefined if the password is missing - Added support for adding blank lines between output sections using `` as closing tag -### [25.5.0] - Feb 10, 2025 +### [25.5.0] - February 10, 2025 - Disabled dropdowns for DataSets and Templates are now opaque and don't show text behind them - Overhauled how Ansible Vault works and added `jinjafx_vault_undefined` from JinjaFx - Updated `minSize` of panes, so they can't be resized smaller than their content - Updated Pandoc to 3.6.3 in Dockerfile -### [25.4.0] - Feb 3, 2025 +### [25.4.0] - February 3, 2025 - Add the ability to hide the `Global.yml` pane via a toggle switch - If you delete a DataSet or Template with the dropdown open it will now close automatically. -### [25.3.2] - Jan 28, 2025 +### [25.3.2] - January 28, 2025 - Allow `/` and `.` to be used in template names - Updated code to call `JinjaFx()._jinjafx()` instead of `JinjaFx().jinjafx()` - Updated exception handling during template generation -### [25.3.1] - Jan 23, 2025 +### [25.3.1] - January 23, 2025 - Fixed a regression where `jinjafx_input` wasn't working due to Output name validation -### [25.3.0] - Jan 23, 2025 +### [25.3.0] - January 23, 2025 - Add directory structure to outputs in output pane if the output name contains `/` - Add output name validation to sanitise output names if invalid values are provided - Add ability to sort outputs based on a numerical prefix (e.g. `0/` or `1/`) within the name - Set a minimum width of 200px on the output list - Updated Pandoc to 3.6.2 in Dockerfile -### [25.2.2] - Jan 7, 2025 +### [25.2.2] - January 7, 2025 - Don't send sensitive metadata in fetched DataTemplates as it isn't needed - Fixed an issue where we broke CSP due to our use of `javascript:void(0)` to stop hashes appearing within the URL -### [25.2.1] - Jan 6, 2025 +### [25.2.1] - January 6, 2025 - Fixed a regression when adding support for "Delete Link" -### [25.2.0] - Jan 6, 2025 +### [25.2.0] - January 6, 2025 - Added a "Delete Link" button to allow DataTemplates to be deleted - Added support so a specific DataSet can be selected via the DataTemplate URL using `?ds=` or `/dt/
/` - Don't add a hash symbol to the end of the URL when clicking on links - Fixed an issue where the "Protect Link" button was losing it's icon under certain conditions -### [25.1.1] - Jan 1, 2025 +### [25.1.1] - January 1, 2025 - Rewritten Web Log authentication so it will now prompt you for a password -### [25.1.0] - Dec 29, 2024 +### [25.1.0] - December 29, 2024 - Added support for nested templates within `template.j2` using Jinja2 include syntax - Added support for encrypted DataTemplates using Vaulty (ChaCha20-Poly1305 encryption) - Fixed a cosmetic issue where the button bar would visibily change size when loading a DataTemplate @@ -86,20 +89,20 @@ - Don't output timestamp when running via systemd - Updated Pandoc to 3.6.1 in Dockerfile -### [24.12.1] - Dec 3, 2024 +### [24.12.1] - December 3, 2024 - Fixed an issue where rows with an incorrect number of fields in `data.csv` weren't being coloured red -### [24.12.0] - Dec 2, 2024 +### [24.12.0] - December 2, 2024 - Updated `data.csv` pane so it handles escaped commas as per JinjaFx 1.22.1 - Updated `github-markdown-css` to 5.8.1 - Updated copyright notices in preparation for 2025 -### [24.10.1] - Nov 4, 2024 +### [24.10.1] - November 4, 2024 - Don't call `socket.shutdown()` before `socket.close()` else it raises an error on MacOS - Updated `github-markdown-css` to 5.7.0 - Updated `codemirror` to 5.65.18 -### [24.10.0] - Oct 7, 2024 +### [24.10.0] - October 7, 2024 - Rewrote how Drop and Paste is handled - we now support dropping or pasting images and they are converted to Markdown Data URIs - however, there is a performance issue with large images - this won't get fixed until I migrate to CodeMirror 6 - Updated `/logs` so it can scroll back through the history - Increased the size of the `logring` from 128 to 1024 @@ -108,27 +111,27 @@ - Updated DataTemplate Export so it wraps long lines - Updated Pandoc to 3.5 in Dockerfile -### [24.9.0] - Sep 2, 2024 +### [24.9.0] - September 2, 2024 - Removed 'Fira Code' font from `/logs` as it adds no value over 'Consolas' - Updated `codemirror` JavaScript library to 5.65.17 - Updated `dayjs` JavaScript library to 1.11.13 - Updated Pandoc to 3.3 in Dockerfile -### [24.6.4] - Jun 26, 2024 +### [24.6.4] - June 26, 2024 - The selected DataSet is now saved when you save the DataTemplate - Updated Pandoc to 3.2.1 in Dockerfile -### [24.6.3] - Jun 24, 2024 +### [24.6.3] - June 24, 2024 - Fixed an issue with `/logs` as it didn't adhere to the default `Content-Security-Policy` - Updated instructions for deploying JinjaFx Server as a Container using Kubernetes -### [24.6.2] - Jun 20, 2024 +### [24.6.2] - June 20, 2024 - The ETag hash is now across all additional headers including `Content-Type` and `Content-Security-Policy` as well as the content itself -### [24.6.1] - Jun 20, 2024 +### [24.6.1] - June 20, 2024 - Updated `Content-Security-Policy` to explicitly allow `data:` scheme for `img-src` as `*` doesn't permit it -### [24.6.0] - Jun 20, 2024 +### [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 @@ -141,79 +144,79 @@ - Updated `github-markdown-css` to 5.5.1 - Updated Pandoc to 3.2 in Dockerfile -### [24.3.0] - Mar 7, 2024 +### [24.3.0] - March 7, 2024 - Update pandoc to v3.1.12.2 - Update bootstrap js lib to v5.3.3 - Update github-markdown-css to v5.5.1 -### [24.1.1] - Jan 16, 2024 +### [24.1.1] - January 16, 2024 - Update Pandoc reference template -### [24.1.0] - Jan 9, 2024 +### [24.1.0] - January 9, 2024 - Update `Dockerfile` to use Pandoc 3.1.11.1 -### [23.12.1] - Dec 12, 2023 +### [23.12.1] - December 12, 2023 - Update `github-markdown-css` on CDNJS to version 5.5.0 - Update `update_cdnjs_links.py` to scan `jinjafx_server.py` for libraries to update - Update copyright notices in preparation for 2024 -### [23.12.0] - Dec 4, 2023 +### [23.12.0] - December 4, 2023 - Update `Dockerfile` to use Pandoc 3.1.9 - Update CodeMirror JavaScript library to 5.65.16 -### [23.11.1] - Nov 17, 2023 +### [23.11.1] - November 17, 2023 - Add `-pandoc` command line option to explicitly enable support for converting HTML to DOCX using pandoc -### [23.11.0] - Nov 3, 2023 +### [23.11.0] - November 3, 2023 - Update JavaScript libraries to the latest versions - Add support for the conversion from HTML/Markdown to DOCX via Pandoc - Update GitHub Markdown CSS to 5.3.0 -### [23.9.1] - Sep 27, 2023 +### [23.9.1] - September 27, 2023 - Fix deprecation of `datetime.datetime.utcnow()` -### [23.9.0] - Sep 21, 2023 +### [23.9.0] - September 21, 2023 - Enforce minimal Python version in code -### [23.8.3] - Aug 23, 2023 +### [23.8.3] - August 23, 2023 - Add support for keyless YAML via the `_` variable -### [23.8.2] - Aug 21, 2023 +### [23.8.2] - August 21, 2023 - Add `-weblog` feature to view logs from the browser - Improve rate limiting algorithm and extend to `weblog` and `get_dt` -- Separate out thread locks for logging and rate limiting +- Septemberarate out thread locks for logging and rate limiting - Improve logging by including HTTP version number and mask out a couple of messages unless verbose logging is enabled -### [23.8.1] - Aug 8, 2023 +### [23.8.1] - August 8, 2023 - Improve error reporting if an exception happens in `window.onload()` -### [23.8.0] - Aug 7, 2023 +### [23.8.0] - August 7, 2023 - Update JavaScript libraries to latest version -### [23.6.0] - Jun 6, 2023 +### [23.6.0] - June 6, 2023 - Drop support for Python 3.7 - Update JavaScript libraries to latest version -### [23.3.2] - Mar 20, 2023 +### [23.3.2] - March 20, 2023 - Added support for Unicode symbols within templates (including Emojis) - Fixed an issue where downloads weren't working in some scenarios -### [23.3.1] - Mar 17, 2023 +### [23.3.1] - March 17, 2023 - Code cleanup - removed unused commented out code -### [23.3.0] - Mar 16, 2023 +### [23.3.0] - March 16, 2023 - Replaced CryptoJS with native Subtle Crypto for Ansible Vault encryption - Removed dependency on utf8 library as we no longer allow non-ASCII templates - Downloads are now handled in the browser and don't require a POST request - Updated CodeMirror JavaScript library to 5.65.12 -### [23.2.1] - Feb 22, 2023 +### [23.2.1] - February 22, 2023 - Updated content encoding within JSON requests and responses -### [23.2.0] - Feb 1, 2023 +### [23.2.0] - February 1, 2023 - Improvements around exception handling and logging -### [23.1.0] - Dec 31, 2022 +### [23.1.0] - December 31, 2022 - Add support for `global.yml` when using DataSets - Remove support for Python 3.6 due to end of life - Update Python build to use `pyproject.toml` to avoid deprecation @@ -223,101 +226,101 @@ - Remove expansion icons from panes in favour of full screen mode - Minor updates to JavaScript libraries -### [22.12.2] - Dec 14, 2022 +### [22.12.2] - December 14, 2022 - Update various JavaScript libraries to latest versions - Update copyright year to 2023 -### [22.12.1] - Dec 8, 2022 +### [22.12.1] - December 8, 2022 - Improve exception reporting when using a persistent logfile -### [22.11.4] - Nov 28, 2022 +### [22.11.4] - November 28, 2022 - Add support for GitHub integration via the GitHub API to allow GitHub to be used to store DataTemplates -### [22.11.2] - Nov 18, 2022 +### [22.11.2] - November 18, 2022 - Fix issue with `-logfile` due to error in regexp for removing ansi colours -### [22.11.1] - Nov 10, 2022 +### [22.11.1] - November 10, 2022 - Updated the colour palette to hopefully be more aesthetically pleasing - Updated `update_cdnjs_links.py` so it will update all html files automatically with latest JavaScript libs - Added `update_versioned_links.py` to create static content links based on sha256 as a `pre-commit` Git Hook - Updated various JavaScript libraries to latest versions -### [22.11.0] - Nov 8, 2022 +### [22.11.0] - November 8, 2022 - Add support for command line option `-logfile` for persistent logging -### [22.10.1] - Nov 7, 2022 +### [22.10.1] - November 7, 2022 - Fix issue with zIndex of `template.j2` -### [22.10.0] - Oct 25, 2022 +### [22.10.0] - October 25, 2022 - Update Dockerfile to use Python 3.11 - Update JavaScript libraries to latest version - Fixed code scanning alert #67 -### [22.9.5] - Sep 26, 2022 +### [22.9.5] - September 26, 2022 - Add support for a `Save As` button on DataTemplate Export -### [22.9.4] - Sep 20, 2022 +### [22.9.4] - September 20, 2022 - Add support for an `Import DataTemplate` button -### [22.9.2] - Sep 9, 2022 +### [22.9.2] - September 9, 2022 - Add `jinjafx.html` to permanent cache -### [22.9.1] - Sep 7, 2022 +### [22.9.1] - September 7, 2022 - Moved js/css/png content to versioned urls to enable permanent cacheing -### [22.9.0] - Sep 7, 2022 +### [22.9.0] - September 7, 2022 - Updated `codemirror` to 5.65.8 - Updated `bootstrap` to 5.2.0 - Updated `dayjs` to 1.11.5 -### [22.8.1] - Aug 19, 2022 +### [22.8.1] - August 19, 2022 - Added support for `-ml` command line argument to set the maximum memory usage -### [22.8.0] - Aug 19, 2022 +### [22.8.0] - August 19, 2022 - Added support for `-tl` command line argument to set the maximum execution time of a request - Fixed an issue where text highlighting wasn't visible when showing where non-ASCII characters were detected in `data.csv` - JinjaFx Server will now execute JinjaFx using the Jinja2 SandboxEnvironment - POST requests will now display total duration in output logging -### [22.7.9] - Jul 21, 2022 +### [22.7.9] - July 21, 2022 - Various cosmetic changes associated with syntax highlighting -### [22.7.8] - Jul 11, 2022 +### [22.7.8] - July 11, 2022 - Revert all font related changes to pre 22.7.0 as they didn't really work - Finalise `` tag highlighting to colour ":html" and ":markdown" in red -### [22.7.7] - Jul 8, 2022 +### [22.7.7] - July 8, 2022 - Cosmetic changes to the CSV table within the `data.csv` pane - Added support for highlighting `` tags in `template.j2` -### [22.7.6] - Jul 7, 2022 +### [22.7.6] - July 7, 2022 - Fix syntax highlighting of `template.j2` that I broke with the previous release - Add CDNJS link to `output.html` for "Fira Code" -### [22.7.4] - Jul 7, 2022 +### [22.7.4] - July 7, 2022 - Disable ligatures on everything except `template.j2` -### [22.7.3] - Jul 7, 2022 +### [22.7.3] - July 7, 2022 - Disable ligatures for Output window and print view -### [22.7.2] - Jul 7, 2022 +### [22.7.2] - July 7, 2022 - Add missing `content-security-policy` for `font-src` - Update Output window and print view to use "Fira Code" font -### [22.7.1] - Jul 7, 2022 +### [22.7.1] - July 7, 2022 - Align font sizes across all panes -### [22.7.0] - Jul 7, 2022 +### [22.7.0] - July 7, 2022 - Change CodeMirror font to "Fira Code" and enable ligatures - Add `update_cdnjs_links.py` script to automatically update CDNJS links -### [22.6.2] - Jun 21, 2022 +### [22.6.2] - June 21, 2022 - More cosmetic changes to information pane -### [22.6.1] - Jun 20, 2022 +### [22.6.1] - June 20, 2022 - Cosmetic changes to information pane -### [22.6.0] - Jun 14, 2022 +### [22.6.0] - June 14, 2022 - Fix CodeQL issue - exception text reinterpreted as HTML ### [22.5.9] - May 31, 2022 @@ -358,85 +361,86 @@ ### [22.5.0] - May 6, 2022 - Set minimum version of `jinjafx` for Ansible Vault support -### [22.4.6] - Apr 30, 2022 +### [22.4.6] - April 30, 2022 - Handle Python 3.6 deprecation by dependencies by forcing lower versions of modules under Python 3.6 -### [22.4.5] - Apr 20, 2022 +### [22.4.5] - April 20, 2022 - Fixed an issue where output downloads didn't correct mark HTML with a .html extension -### [22.4.4] - Apr 13, 2022 +### [22.4.4] - April 13, 2022 - Encrypt when enter is pressed on "String to Encrypt" -### [22.4.2] - Apr 12, 2022 +### [22.4.2] - April 12, 2022 - Add support for Ansible Vault encryption of strings with client-side JavaScript -### [22.4.1] - Apr 11, 2022 +### [22.4.1] - April 11, 2022 - Update Ansible Vault decryption routines to use `Vault().decrypt()` -### [22.4.0] - Apr 6, 2022 +### [22.4.0] - April 6, 2022 - Remove undocumented `-api` command line option - Update logging so it only shows limited requests without `-v` -### [22.3.6] - Mar 23, 2022 +### [22.3.6] - March 23, 2022 - Update `dayjs` JavaScript library to 1.11.0 - Fix issue with href link on JinjaFx header -### [22.3.5] - Mar 21, 2022 +### [22.3.5] - March 21, 2022 - Remove `ansible-core` dependency as JinjaFx now provides a native method to decrypt Ansible Vault credentials -### [22.3.4] - Mar 3, 2022 +### [22.3.4] - March 3, 2022 - Remove support for importing Ansible filters from Ansible as JinjaFx now provides some of them as a custom extension -### [22.3.3] - Mar 2, 2022 +### [22.3.3] - March 2, 2022 - Fix dependency issue -### [22.3.2] - Mar 2, 2022 +### [22.3.2] - March 2, 2022 - Update Lambda to support GZIP compression -### [22.3.1] - Feb 28, 2022 +### [22.3.1] - February 28, 2022 - Added support for JinjaFx to be used as an AWS Lambda (FaaS) - Fixed an issue with logging -### [22.2.2] - Feb 25, 2022 +### [22.2.2] - February 25, 2022 - Updated link format for DataTemplates to use `/dt/` -### [22.2.1] - Feb 8, 2022 +### [22.2.1] - February 8, 2022 - The `data` and `template` variables are now passed as type `str` to `JinjaFx().jinjafx()` - Update JinjaFx Server with latest JavaScript libraries -### [22.1.7] - Jan 21, 2022 +### [22.1.7] - January 21, 2022 - Move the custom extensions into JinjaFx core -### [22.1.6] - Jan 20, 2022 +### [22.1.6] - January 20, 2022 - Update JinjaFx Server using the new JinjaFx method for searching for extensions -### [22.1.5] - Jan 19, 2022 +### [22.1.5] - January 19, 2022 - Added support for custom filter `cisco7encode` - Added support for custom filter `junos9encode` -### [22.1.4] - Jan 19, 2022 +### [22.1.4] - January 19, 2022 - Added support for custom filter `junos_snmpv3_key` -### [22.1.3] - Jan 18, 2022 +### [22.1.3] - January 18, 2022 - Fix CodeQL Security Alerts -### [22.1.2] - Jan 17, 2022 +### [22.1.2] - January 17, 2022 - Add custom JinjaFx Extensions in `/extensions` -### [21.12.3] - Dec 12, 2021 +### [21.12.3] - December 12, 2021 - Detect and highlight non-ascii characters - Check `Content-Length` isn't too large on POST requests -### [21.12.2] - Dec 10, 2021 +### [21.12.2] - December 10, 2021 - Add support for detecting non-ascii characters in `template.j2` - Increase maximum POST request length from 512KB to 2MB -### [21.12.1] - Dec 3, 2021 +### [21.12.1] - December 3, 2021 - Make JinjaFx Server available as a PyPi module -### 21.11.0 - Nov 29, 2021 +### 21.11.0 - November 29, 2021 - Initial release +[25.7.1]: https://github.com/cmason3/jinjafx_server/compare/25.7.0...25.7.1 [25.7.0]: https://github.com/cmason3/jinjafx_server/compare/25.6.2...25.7.0 [25.6.2]: https://github.com/cmason3/jinjafx_server/compare/25.6.1...25.6.2 [25.6.1]: https://github.com/cmason3/jinjafx_server/compare/25.6.0...25.6.1 diff --git a/jinjafx_server.py b/jinjafx_server.py index 6591999..7d9597d 100755 --- a/jinjafx_server.py +++ b/jinjafx_server.py @@ -27,7 +27,7 @@ import re, argparse, hashlib, traceback, glob, hmac, uuid, struct, binascii, gzip, requests, ctypes, subprocess import cmarkgfm, emoji -__version__ = '25.7.0' +__version__ = '25.7.1' llock = threading.RLock() rlock = threading.RLock() @@ -628,8 +628,14 @@ def html_escape(text): self.error = error except Exception as e: - xyz = sys.exc_info() - error = f'error[jinjafx_server.py:{xyz[2].tb_lineno}]: {type(e).__name__}: {e}' + m = re.search(r'(?s:.*)File "(.+)", line ([0-9]+), .+ template', traceback.format_exc(), re.IGNORECASE | re.MULTILINE) + if m: + error = f'error[{m.group(1)}:{m.group(2)}]: {type(e).__name__}: {e}' + + else: + traceback.print_exc() + xyz = sys.exc_info() + error = f'error[jinjafx_server.py:{xyz[2].tb_lineno}]: {type(e).__name__}: {e}' jsr = { 'status': 'error',