clearlinux/autospec
2
0
Fork 0
mirror of https://github.com/clearlinux/autospec.git synced 2026-08-24 08:48:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add regex escaping for NEWS file parsing

Browse Source 
In some cases, the lack of escaping here leads to unhandled exceptions.
For example, if `tarball.name` == `libsigc++`, then an exception is
raised due to `++` not being a valid sequence in the regular expression.

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
This commit is contained in:
Patrick McCarty
2019-07-08 11:56:47 -07:00
committed by William Douglas
parent 0942f31ffc
commit 2d848ea73c
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autospec/commitmessage.py
+15 -10
View File
@@ -111,21 +111,26 @@ def process_NEWS(newsfile):
newslines = [news.rstrip('\n') for news in newslines]
# escape some values for use in regular expressions below
escaped_curver = re.escape(tarball.version)
escaped_oldver = re.escape(config.old_version)
escaped_tarname = re.escape(tarball.name)
# these are patterns that define the beginning of a block of information
# regarding the current version.
news_start = [r'Version.*{}'.format(tarball.version),
r'(v|- )?{}:?'.format(tarball.version),
r'{}-{}:?'.format(tarball.name, tarball.version),
r'{} 20'.format(tarball.version)]
news_start = [r'Version.*{}'.format(escaped_curver),
r'(v|- )?{}:?'.format(escaped_curver),
r'{}-{}:?'.format(escaped_tarname, escaped_curver),
r'{} 20'.format(escaped_curver)]
# these are patterns that define the end of a block of information
# regarding the current version.
news_end = [r'\*\*\* Changes in.*{}'.format(config.old_version),
r'{}.*201'.format(config.old_version),
r'Version.*{}'.format(config.old_version),
r'^Overview of changes leading to {}'.format(config.old_version),
r'^{}(-| ){}:?'.format(tarball.name, config.old_version),
r'v?{}:?'.format(config.old_version)]
news_end = [r'\*\*\* Changes in.*{}'.format(escaped_oldver),
r'{}.*201'.format(escaped_oldver),
r'Version.*{}'.format(escaped_oldver),
r'^Overview of changes leading to {}'.format(escaped_oldver),
r'^{}(-| ){}:?'.format(escaped_tarname, escaped_oldver),
r'v?{}:?'.format(escaped_oldver)]
for idx, news in enumerate(newslines):
# only check headers for begin and end patterns