0003-crossbar-webservice-wap-use-markupsafe-instead-of-we.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. From a6866509b0387ab6d6f99f68cd82bcac922fe839 Mon Sep 17 00:00:00 2001
  2. From: Romain Naour <romain.naour@gmail.com>
  3. Date: Mon, 30 May 2022 19:38:11 +0200
  4. Subject: [PATCH] crossbar/webservice/wap: use markupsafe instead of werkzeug
  5. wap.py use escape from werkzeug but it has been removed since
  6. the version 2.1.0 [1].
  7. Replace with escape from markupsafe like upstream commit [2]
  8. (wihout other changes).
  9. [1] https://github.com/pallets/werkzeug/commit/22d1e9ac13829b83347107a9b4d77072a8e1af6a
  10. [2] https://github.com/crossbario/crossbar/commit/ca8d383f01231e2b3f986e791f215f12f2deee5d
  11. Signed-off-by: Romain Naour <romain.naour@gmail.com>
  12. ---
  13. crossbar/webservice/wap.py | 7 ++++++-
  14. requirements-min.txt | 1 +
  15. 2 files changed, 7 insertions(+), 1 deletion(-)
  16. diff --git a/crossbar/webservice/wap.py b/crossbar/webservice/wap.py
  17. index 825558b1..6daa9b21 100644
  18. --- a/crossbar/webservice/wap.py
  19. +++ b/crossbar/webservice/wap.py
  20. @@ -36,7 +36,12 @@ from collections.abc import Mapping, Sequence
  21. from werkzeug.routing import Map, Rule
  22. from werkzeug.exceptions import NotFound, MethodNotAllowed
  23. -from werkzeug.utils import escape
  24. +
  25. +try:
  26. + # removed in werkzeug 2.1.0
  27. + from werkzeug.utils import escape
  28. +except ImportError:
  29. + from markupsafe import escape
  30. from jinja2 import Environment, FileSystemLoader
  31. from jinja2.sandbox import SandboxedEnvironment
  32. diff --git a/requirements-min.txt b/requirements-min.txt
  33. index cdd82d27..50cb1489 100644
  34. --- a/requirements-min.txt
  35. +++ b/requirements-min.txt
  36. @@ -7,6 +7,7 @@ cryptography>=2.6.1
  37. importlib-resources>=4.1.1
  38. jinja2>=2.10.1
  39. lmdb>=0.92
  40. +MarkupSafe>=1.1.1
  41. mistune>=0.7.4
  42. passlib>=1.7.1
  43. priority>=1.3.0
  44. --
  45. 2.37.1