From ecc5d10c09cd9ae07b3c83078a9b752dcb535a45 Mon Sep 17 00:00:00 2001 From: Greg Brockman Date: Tue, 24 Aug 2010 01:36:02 -0400 Subject: [PATCH] Escape text in zephyr messages --- build-hooks/post-build | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/build-hooks/post-build b/build-hooks/post-build index bb69aff..8dd8eb4 100755 --- a/build-hooks/post-build +++ b/build-hooks/post-build @@ -62,7 +62,8 @@ from email.mime import text from invirt import common, database, builder from invirt.config import structs as config -def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x): +def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x, + escape=lambda x: x): """Format a message reporting the results of a build""" values = dict(values) if not verbose and values['traceback'] is not None: @@ -75,6 +76,9 @@ def build_completion_msg(succeeded, values, verbose=True, success=lambda x: x, f break values['traceback'] = truncated + for key in ['package', 'version', 'pocket', 'principal', 'inserted_at', 'short_commit']: + values[key] = escape(values[key]) + if succeeded: values['result'] = success(values['result']) msg = """Build of %(package)s %(version)s in %(pocket)s %(result)s. @@ -87,17 +91,21 @@ Job submitted by %(principal)s at %(inserted_at)s. Error: %(traceback)s""" % values return msg -def submit_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x): +def submit_completion_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x, + escape=lambda x: x): values = dict(values) if succeeded: values['result'] = success(values['result']) else: values['result'] = failure(values['result']) + for key in ['commit', 'pocket', 'principal']: + values[key] = escape(values[key]) msg = """Submission of %(commit)s to be built in %(pocket)s %(result)s. Build submitted by %(principal)s.""" % values return msg -def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x): +def repo_creation_msg(succeeded, values, verbose=True, success=lambda x: x, failure=lambda x: x, + escape=lambda x: x): values = dict(values) assert succeeded msg = '%(principal)s just created a new repository, %(category)s/%(name)s.git' % values @@ -129,6 +137,7 @@ message_generators = { } def zephyr_escape(m): + m = str(m) m = re.sub('@', '@@', m) m = re.sub('}', '@(})', m) return m @@ -229,7 +238,8 @@ def main(): else: make_msg = message_generators[ZEPHYR][prog] msg = '@{%s}' % make_msg(succeeded, values, verbose=False, - success=zephyr_success, failure=zephyr_failure) + success=zephyr_success, failure=zephyr_failure, + escape=zephyr_escape) instance = zephyr_config.get('instance', values['default_instance']) % values zsig = zephyr_config.get('zsig', 'XVM Buildbot') % values common.captureOutput(['zwrite', '-c', klass, '-i', instance, '-s', -- 1.7.9.5