From ae87d17bdaa049e9ca85e706f1facf46a1552448 Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Wed, 21 Sep 2022 16:23:02 +0200 Subject: [PATCH] escape needs to be imported from markupsafe for newer jinja2 versions --- docs/install.md | 2 +- webapp.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/install.md b/docs/install.md index 80aa3d3..222d28b 100644 --- a/docs/install.md +++ b/docs/install.md @@ -18,7 +18,7 @@ Then: You will need: - this code (see above) -- a Mk3 Coldcard connected via USB, running +- a Mk3 or Mk4 Coldcard connected via USB, running [firmware version 3.1.0 or later](https://coldcardwallet.com/docs/upgrade) - `tord` (Tor program) - an Internet connection diff --git a/webapp.py b/webapp.py index 31846ef..744aa9c 100755 --- a/webapp.py +++ b/webapp.py @@ -21,9 +21,9 @@ from hashlib import sha256 from chain import broadcast_txn from version import VERSION try: - from jinja2 import Markup + from jinja2 import Markup, escape except ImportError: - from markupsafe import Markup + from markupsafe import Markup, escape import policy from ckcc.constants import USER_AUTH_TOTP, USER_AUTH_HMAC, USER_AUTH_SHOW_QR, MAX_USERNAME_LEN @@ -326,7 +326,7 @@ async def rx_handler(ses, ws, orig_request): if failed: # standard error response - await tx_resp(show_modal=True, html=jinja2.escape(msg), selector='.js-api-fail') + await tx_resp(show_modal=True, html=escape(msg), selector='.js-api-fail') async def push_status_updates_handler(ws): # block for a bit, and then send display updates (and all other system status changes)