From 7a6c63cb852317e92fb8e3b9cbc10bce4ca75a35 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Mon, 6 Feb 2023 12:06:37 -0500
Subject: [PATCH 1/4] When catching non-jinja errors from Jinja, raise a good
 error message, and make a best effort at tracking down the line number and
 error line if possible.

---
 .../routes/tasks_controller.py                    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
index 79cd84249..f7a6e57e2 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
@@ -2,6 +2,7 @@
 import json
 import os
 import uuid
+from sys import exc_info
 from typing import Any
 from typing import Dict
 from typing import Optional
@@ -562,6 +563,20 @@ def _render_jinja_template(unprocessed_template: str, spiff_task: SpiffTask) ->
             "Jinja2 template errors can happen when trying to displaying task data"
         )
         raise wfe from template_error
+    except Exception as error:
+        type, value, tb = exc_info()
+        wfe = WorkflowTaskException(
+            str(error), task=spiff_task, exception=error
+        )
+        while tb:
+            if tb.tb_frame.f_code.co_filename == '<template>':
+                wfe.line_number = tb.tb_lineno
+                wfe.error_line = unprocessed_template.split("\n")[tb.tb_lineno - 1]
+            tb = tb.tb_next
+        wfe.add_note(
+            "Jinja2 template errors can happen when trying to displaying task data"
+        )
+        raise wfe from error
 
 
 def _get_spiff_task_from_process_instance(

From f945b58756b814a20ed2737c0018db2174d127e6 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Mon, 6 Feb 2023 12:14:15 -0500
Subject: [PATCH 2/4] Use the same markdown library for displaying as for
 editing - could enable a security plugin, but doing so would prevent BPMN
 developers from using the Sub and Sup markdown supported by GitHub.

---
 spiffworkflow-frontend/package-lock.json       | 16 +++++++---------
 spiffworkflow-frontend/package.json            |  4 +---
 spiffworkflow-frontend/src/routes/TaskShow.tsx |  7 ++-----
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/spiffworkflow-frontend/package-lock.json b/spiffworkflow-frontend/package-lock.json
index 463a616d9..d3a2743d5 100644
--- a/spiffworkflow-frontend/package-lock.json
+++ b/spiffworkflow-frontend/package-lock.json
@@ -32,7 +32,7 @@
         "@types/node": "^18.6.5",
         "@types/react": "^18.0.17",
         "@types/react-dom": "^18.0.6",
-        "@uiw/react-md-editor": "^3.19.5",
+        "@uiw/react-md-editor": "^3.20.2",
         "autoprefixer": "10.4.8",
         "axios": "^0.27.2",
         "bootstrap": "^5.2.0",
@@ -58,11 +58,9 @@
         "react-dom": "^18.2.0",
         "react-icons": "^4.4.0",
         "react-jsonschema-form": "^1.8.1",
-        "react-markdown": "^8.0.3",
         "react-router": "^6.3.0",
         "react-router-dom": "^6.3.0",
         "react-scripts": "^5.0.1",
-        "remark-gfm": "^3.0.1",
         "serve": "^14.0.0",
         "timepicker": "^1.13.18",
         "typescript": "^4.7.4",
@@ -6473,9 +6471,9 @@
       }
     },
     "node_modules/@uiw/react-md-editor": {
-      "version": "3.19.5",
-      "resolved": "https://registry.npmjs.org/@uiw/react-md-editor/-/react-md-editor-3.19.5.tgz",
-      "integrity": "sha512-uhFGLOrKEtADM8QUauTdG5x8wqNS15ry2jCYMBr/E1Or3njvg7jpB0KRv+QTgZDnglevCTjuQxZPH7I7hG2uKw==",
+      "version": "3.20.2",
+      "resolved": "https://registry.npmjs.org/@uiw/react-md-editor/-/react-md-editor-3.20.2.tgz",
+      "integrity": "sha512-L3sp3dsbpTOcVX+mzkmwwDl2Jl/UEgrySTun4XCMck1QF1WX53z0sHbN6XET+veHOML9Tw8TUUECR7IqajYjDw==",
       "dependencies": {
         "@babel/runtime": "^7.14.6",
         "@uiw/react-markdown-preview": "^4.1.5",
@@ -36996,9 +36994,9 @@
       }
     },
     "@uiw/react-md-editor": {
-      "version": "3.19.5",
-      "resolved": "https://registry.npmjs.org/@uiw/react-md-editor/-/react-md-editor-3.19.5.tgz",
-      "integrity": "sha512-uhFGLOrKEtADM8QUauTdG5x8wqNS15ry2jCYMBr/E1Or3njvg7jpB0KRv+QTgZDnglevCTjuQxZPH7I7hG2uKw==",
+      "version": "3.20.2",
+      "resolved": "https://registry.npmjs.org/@uiw/react-md-editor/-/react-md-editor-3.20.2.tgz",
+      "integrity": "sha512-L3sp3dsbpTOcVX+mzkmwwDl2Jl/UEgrySTun4XCMck1QF1WX53z0sHbN6XET+veHOML9Tw8TUUECR7IqajYjDw==",
       "requires": {
         "@babel/runtime": "^7.14.6",
         "@uiw/react-markdown-preview": "^4.1.5",
diff --git a/spiffworkflow-frontend/package.json b/spiffworkflow-frontend/package.json
index e91b64787..ade625c7b 100644
--- a/spiffworkflow-frontend/package.json
+++ b/spiffworkflow-frontend/package.json
@@ -27,7 +27,7 @@
     "@types/node": "^18.6.5",
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
-    "@uiw/react-md-editor": "^3.19.5",
+    "@uiw/react-md-editor": "^3.20.2",
     "autoprefixer": "10.4.8",
     "axios": "^0.27.2",
     "bootstrap": "^5.2.0",
@@ -53,11 +53,9 @@
     "react-dom": "^18.2.0",
     "react-icons": "^4.4.0",
     "react-jsonschema-form": "^1.8.1",
-    "react-markdown": "^8.0.3",
     "react-router": "^6.3.0",
     "react-router-dom": "^6.3.0",
     "react-scripts": "^5.0.1",
-    "remark-gfm": "^3.0.1",
     "serve": "^14.0.0",
     "timepicker": "^1.13.18",
     "typescript": "^4.7.4",
diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx
index 948bafb73..974f91d96 100644
--- a/spiffworkflow-frontend/src/routes/TaskShow.tsx
+++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx
@@ -12,8 +12,7 @@ import {
   // @ts-ignore
 } from '@carbon/react';
 
-import ReactMarkdown from 'react-markdown';
-import remarkGfm from 'remark-gfm';
+import MDEditor from '@uiw/react-md-editor';
 // eslint-disable-next-line import/no-named-as-default
 import Form from '../themes/carbon';
 import HttpService from '../services/HttpService';
@@ -263,9 +262,7 @@ export default function TaskShow() {
     }
     return (
       <div className="markdown">
-        <ReactMarkdown remarkPlugins={[remarkGfm]}>
-          {instructions}
-        </ReactMarkdown>
+        <MDEditor.Markdown source={instructions} />
       </div>
     );
   };

From a2f91999e2b149493e9e6301e76e24425d129341 Mon Sep 17 00:00:00 2001
From: Dan <daniel.h.funk@gmail.com>
Date: Mon, 6 Feb 2023 12:20:29 -0500
Subject: [PATCH 3/4] Use the same markdown library for displaying as for
 editing - could enable a security run_pyl

---
 .../keycloak/realm_exports/spiffworkflow-realm.json         | 2 +-
 .../src/spiffworkflow_backend/routes/tasks_controller.py    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json b/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json
index b4e2e08a5..4e3863985 100644
--- a/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json
+++ b/spiffworkflow-backend/keycloak/realm_exports/spiffworkflow-realm.json
@@ -3634,4 +3634,4 @@
   "clientPolicies" : {
     "policies" : [ ]
   }
-}
\ No newline at end of file
+}
diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
index f7a6e57e2..26f7e0ecc 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
@@ -565,11 +565,9 @@ def _render_jinja_template(unprocessed_template: str, spiff_task: SpiffTask) ->
         raise wfe from template_error
     except Exception as error:
         type, value, tb = exc_info()
-        wfe = WorkflowTaskException(
-            str(error), task=spiff_task, exception=error
-        )
+        wfe = WorkflowTaskException(str(error), task=spiff_task, exception=error)
         while tb:
-            if tb.tb_frame.f_code.co_filename == '<template>':
+            if tb.tb_frame.f_code.co_filename == "<template>":
                 wfe.line_number = tb.tb_lineno
                 wfe.error_line = unprocessed_template.split("\n")[tb.tb_lineno - 1]
             tb = tb.tb_next

From 721e86f351cd547ed5cfbdb708bf05d202f697d1 Mon Sep 17 00:00:00 2001
From: Kevin Burnett <18027+burnettk@users.noreply.github.com>
Date: Mon, 6 Feb 2023 16:21:55 -0800
Subject: [PATCH 4/4] Update tasks_controller.py

---
 .../src/spiffworkflow_backend/routes/tasks_controller.py        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
index 26f7e0ecc..1cba157d5 100644
--- a/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
+++ b/spiffworkflow-backend/src/spiffworkflow_backend/routes/tasks_controller.py
@@ -560,7 +560,7 @@ def _render_jinja_template(unprocessed_template: str, spiff_task: SpiffTask) ->
                 template_error.lineno - 1
             ]
         wfe.add_note(
-            "Jinja2 template errors can happen when trying to displaying task data"
+            "Jinja2 template errors can happen when trying to display task data"
         )
         raise wfe from template_error
     except Exception as error: