xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[zephyr_mirror] add support for zcrypt'ed classes with colons

Browse source 
The regex used for parsing .crypt-table didn't allow colons in class
names. This commit changes the [^:] token with \S, meaning that class
names can now contain colons but can no longer contain whitespace.

I think this should be fine, since zcrypt is only used for MIT zephyr,
where (by convention) class names do not contain whitespace.

Additionally, it should not be possible for us to accidentally consume a
field-separating colon as part of the class capture group because the
regex enforces that all field-separating colons are followed by one or
more whitespace characters, whereas the class name cannot contain
whitespace.
This commit is contained in:
Jacob Hurwitz 2017-03-19 21:31:45 -07:00 committed by Tim Abbott
parent fa67e87d3d
commit baefa61edf
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bots/zephyr_mirror_backend.py
View file

@ -313,7 +313,7 @@ def parse_crypt_table(zephyr_class, instance):
if line.strip() == "": if line.strip() == "":
# Ignore blank lines # Ignore blank lines
continue continue
match = re.match("^crypt-(?P<class>[^:]+):\s+((?P<algorithm>(AES|DES)):\s+)?(?P<keypath>\S+)$", line) match = re.match("^crypt-(?P<class>\S+):\s+((?P<algorithm>(AES|DES)):\s+)?(?P<keypath>\S+)$", line)
if match is None: if match is None:
# Malformed crypt_table line # Malformed crypt_table line
logger.debug("Invalid crypt_table line!") logger.debug("Invalid crypt_table line!")