Upgrade to 2.11.3 to support OpenStack-W
This upgrades version to 2.11.3 to support OpenStack-W, and remove the patch because 2.11.3 has resolved the problem already.
This commit is contained in:
huangtianhua
parent
922bad4df2
commit
e39659657a
Binary file not shown.
BIN
Jinja2-2.11.3.tar.gz
Normal file
BIN
Jinja2-2.11.3.tar.gz
Normal file
Binary file not shown.
@ -1,170 +0,0 @@
|
||||
From ef658dc3b6389b091d608e710a810ce8b87995b3 Mon Sep 17 00:00:00 2001
|
||||
From: David Lord <davidism@gmail.com>
|
||||
Date: Sun, 31 Jan 2021 07:54:40 -0800
|
||||
Subject: [PATCH] speed up urlize matching
|
||||
|
||||
---
|
||||
Jinja2-2.11.2/CHANGES.rst | 10 +++
|
||||
Jinja2-2.11.2/src/jinja2/utils.py | 107 ++++++++++++++++--------------
|
||||
2 files changed, 66 insertions(+), 51 deletions(-)
|
||||
|
||||
diff --git a/Jinja2-2.11.2/CHANGES.rst b/Jinja2-2.11.2/CHANGES.rst
|
||||
index 9b8b24e..6dfe912 100644
|
||||
--- a/Jinja2-2.11.2/CHANGES.rst
|
||||
+++ b/Jinja2-2.11.2/CHANGES.rst
|
||||
@@ -1,5 +1,15 @@
|
||||
.. currentmodule:: jinja2
|
||||
|
||||
+Version 2.11.3
|
||||
+--------------
|
||||
+
|
||||
+Unreleased
|
||||
+
|
||||
+- Improve the speed of the ``urlize`` filter by reducing regex
|
||||
+ backtracking. Email matching requires a word character at the start
|
||||
+ of the domain part, and only word characters in the TLD. :pr:`1343`
|
||||
+
|
||||
+
|
||||
Version 2.11.2
|
||||
--------------
|
||||
|
||||
diff --git a/Jinja2-2.11.2/src/jinja2/utils.py b/Jinja2-2.11.2/src/jinja2/utils.py
|
||||
index b422ba9..6afca81 100644
|
||||
--- a/Jinja2-2.11.2/src/jinja2/utils.py
|
||||
+++ b/Jinja2-2.11.2/src/jinja2/utils.py
|
||||
@@ -6,6 +6,8 @@ import warnings
|
||||
from collections import deque
|
||||
from random import choice
|
||||
from random import randrange
|
||||
+from string import ascii_letters as _letters
|
||||
+from string import digits as _digits
|
||||
from threading import Lock
|
||||
|
||||
from markupsafe import escape
|
||||
@@ -16,20 +18,6 @@ from ._compat import string_types
|
||||
from ._compat import text_type
|
||||
from ._compat import url_quote
|
||||
|
||||
-_word_split_re = re.compile(r"(\s+)")
|
||||
-_punctuation_re = re.compile(
|
||||
- "^(?P<lead>(?:%s)*)(?P<middle>.*?)(?P<trail>(?:%s)*)$"
|
||||
- % (
|
||||
- "|".join(map(re.escape, ("(", "<", "<"))),
|
||||
- "|".join(map(re.escape, (".", ",", ")", ">", "\n", ">"))),
|
||||
- )
|
||||
-)
|
||||
-_simple_email_re = re.compile(r"^\S+@[a-zA-Z0-9._-]+\.[a-zA-Z0-9._-]+$")
|
||||
-_striptags_re = re.compile(r"(<!--.*?-->|<[^>]*>)")
|
||||
-_entity_re = re.compile(r"&([^;]+);")
|
||||
-_letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
-_digits = "0123456789"
|
||||
-
|
||||
# special singleton representing missing values for the runtime
|
||||
missing = type("MissingType", (), {"__repr__": lambda x: "missing"})()
|
||||
|
||||
@@ -210,48 +198,65 @@ def urlize(text, trim_url_limit=None, rel=None, target=None):
|
||||
and (x[:limit] + (len(x) >= limit and "..." or ""))
|
||||
or x
|
||||
)
|
||||
- words = _word_split_re.split(text_type(escape(text)))
|
||||
+ words = re.split(r"(\s+)", text_type(escape(text)))
|
||||
rel_attr = rel and ' rel="%s"' % text_type(escape(rel)) or ""
|
||||
target_attr = target and ' target="%s"' % escape(target) or ""
|
||||
|
||||
for i, word in enumerate(words):
|
||||
- match = _punctuation_re.match(word)
|
||||
+ head, middle, tail = "", word, ""
|
||||
+ match = re.match(r"^([(<]|<)+", middle)
|
||||
+
|
||||
if match:
|
||||
- lead, middle, trail = match.groups()
|
||||
- if middle.startswith("www.") or (
|
||||
- "@" not in middle
|
||||
- and not middle.startswith("http://")
|
||||
- and not middle.startswith("https://")
|
||||
- and len(middle) > 0
|
||||
- and middle[0] in _letters + _digits
|
||||
- and (
|
||||
- middle.endswith(".org")
|
||||
- or middle.endswith(".net")
|
||||
- or middle.endswith(".com")
|
||||
- )
|
||||
- ):
|
||||
- middle = '<a href="http://%s"%s%s>%s</a>' % (
|
||||
- middle,
|
||||
- rel_attr,
|
||||
- target_attr,
|
||||
- trim_url(middle),
|
||||
- )
|
||||
- if middle.startswith("http://") or middle.startswith("https://"):
|
||||
- middle = '<a href="%s"%s%s>%s</a>' % (
|
||||
- middle,
|
||||
- rel_attr,
|
||||
- target_attr,
|
||||
- trim_url(middle),
|
||||
- )
|
||||
- if (
|
||||
- "@" in middle
|
||||
- and not middle.startswith("www.")
|
||||
- and ":" not in middle
|
||||
- and _simple_email_re.match(middle)
|
||||
- ):
|
||||
- middle = '<a href="mailto:%s">%s</a>' % (middle, middle)
|
||||
- if lead + middle + trail != word:
|
||||
- words[i] = lead + middle + trail
|
||||
+ head = match.group()
|
||||
+ middle = middle[match.end() :]
|
||||
+
|
||||
+ # Unlike lead, which is anchored to the start of the string,
|
||||
+ # need to check that the string ends with any of the characters
|
||||
+ # before trying to match all of them, to avoid backtracking.
|
||||
+ if middle.endswith((")", ">", ".", ",", "\n", ">")):
|
||||
+ match = re.search(r"([)>.,\n]|>)+$", middle)
|
||||
+
|
||||
+ if match:
|
||||
+ tail = match.group()
|
||||
+ middle = middle[: match.start()]
|
||||
+
|
||||
+ if middle.startswith("www.") or (
|
||||
+ "@" not in middle
|
||||
+ and not middle.startswith("http://")
|
||||
+ and not middle.startswith("https://")
|
||||
+ and len(middle) > 0
|
||||
+ and middle[0] in _letters + _digits
|
||||
+ and (
|
||||
+ middle.endswith(".org")
|
||||
+ or middle.endswith(".net")
|
||||
+ or middle.endswith(".com")
|
||||
+ )
|
||||
+ ):
|
||||
+ middle = '<a href="http://%s"%s%s>%s</a>' % (
|
||||
+ middle,
|
||||
+ rel_attr,
|
||||
+ target_attr,
|
||||
+ trim_url(middle),
|
||||
+ )
|
||||
+
|
||||
+ if middle.startswith("http://") or middle.startswith("https://"):
|
||||
+ middle = '<a href="%s"%s%s>%s</a>' % (
|
||||
+ middle,
|
||||
+ rel_attr,
|
||||
+ target_attr,
|
||||
+ trim_url(middle),
|
||||
+ )
|
||||
+
|
||||
+ if (
|
||||
+ "@" in middle
|
||||
+ and not middle.startswith("www.")
|
||||
+ and ":" not in middle
|
||||
+ and re.match(r"^\S+@\w[\w.-]*\.\w+$", middle)
|
||||
+ ):
|
||||
+ middle = '<a href="mailto:%s">%s</a>' % (middle, middle)
|
||||
+
|
||||
+ words[i] = head + middle + tail
|
||||
+
|
||||
return u"".join(words)
|
||||
|
||||
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -1,14 +1,13 @@
|
||||
%global _name Jinja2
|
||||
|
||||
Name: python-jinja2
|
||||
Version: 2.11.2
|
||||
Release: 3
|
||||
Version: 2.11.3
|
||||
Release: 1
|
||||
Summary: A full-featured template engine for Python
|
||||
License: BSD
|
||||
URL: http://jinja.pocoo.org/
|
||||
Source0: https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-%{version}.tar.gz
|
||||
|
||||
Patch6000: backport-CVE-2020-28493.patch
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -58,6 +57,9 @@ popd
|
||||
%doc Jinja2-%{version}/ext Jinja2-%{version}/examples
|
||||
|
||||
%changelog
|
||||
* Mon Jul 12 2021 huangtianhua <huangtianhua@huawei.com> - 2.11.3
|
||||
- Upgrade to 2.11.3 to support OpenStack-W
|
||||
|
||||
* Fri Apr 23 2021 shangyibin <shangyibin1@huawei.com> - 2.11.2-3
|
||||
- Type:bugfix
|
||||
- ID:CVE-2020-28493
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user