Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backup: minor: compile regex once

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2016-04-02 23:53:56 +02:00 committed by Wojtek Porczyk
parent e9b8b6428c
commit 78dbadab57
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubes/backup.py
View File

@ -58,6 +58,7 @@ HEADER_QUBES_XML_MAX_SIZE = 1024 * 1024
BLKSIZE = 512 BLKSIZE = 512
_re_alphanum = re.compile(r'^[A-Za-z0-9-]*$')
class BackupCanceledError(qubes.exc.QubesException): class BackupCanceledError(qubes.exc.QubesException):
def __init__(self, msg, tmpdir=None): def __init__(self, msg, tmpdir=None):
@ -109,12 +110,12 @@ class BackupHeader(object):
if untrusted_line.count('=') != 1: if untrusted_line.count('=') != 1:
raise qubes.exc.QubesException("Invalid backup header") raise qubes.exc.QubesException("Invalid backup header")
(key, value) = untrusted_line.strip().split('=') (key, value) = untrusted_line.strip().split('=')
if not re.match(r"^[a-zA-Z0-9-]*$", key): if not _re_alphanum.match(key):
raise qubes.exc.QubesException("Invalid backup header (key)") raise qubes.exc.QubesException("Invalid backup header (key)")
if key not in self.header_keys.keys(): if key not in self.header_keys.keys():
# Ignoring unknown option # Ignoring unknown option
continue continue
if not re.match(r"^[a-zA-Z0-9-]*$", value): if not _re_alphanum.match(value):
raise qubes.exc.QubesException("Invalid backup header (value)") raise qubes.exc.QubesException("Invalid backup header (value)")
if getattr(self, self.header_keys[key]) is not None: if getattr(self, self.header_keys[key]) is not None:
raise qubes.exc.QubesException( raise qubes.exc.QubesException(