commit a713e2575a9ea59db59444deb29a951a395aec7e
author Alex Miller <milleral@chromium.org> Fri Mar 01 10:45:44 2013 -0800
committer ChromeBot <chrome-bot@google.com> Fri Mar 01 12:29:47 2013 -0800
tree 9e61489fca4811834f41c5f11b203ace99b1a97b
parent e8d3332efa6a63c9dab89eae6930fde3c62f2df6

[autotest] Do not allow unicode control files.

Our system does not properly handle non-ascii characters.  Therefore,
rather than having the scheduler explode somewhere down the line, let's
just explicitly disallow control files that contain unicode characters.

BUG=chromium-os:39337
TEST=local run_suite

Change-Id: Id2dcee75087803f1bd4236872f75e71039ae034b
Reviewed-on: https://gerrit.chromium.org/gerrit/44401
Tested-by: Alex Miller <milleral@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Scott Zawalski <scottz@chromium.org>
Commit-Queue: Alex Miller <milleral@chromium.org>

frontend/afe/rpc_interface.py

diff --git a/frontend/afe/rpc_interface.py b/frontend/afe/rpc_interface.py
index b24e12e..c578589 100644
--- a/frontend/afe/rpc_interface.py
+++ b/frontend/afe/rpc_interface.py
@@ -33,6 +33,8 @@
 
 import datetime
 import common
+from autotest_lib.client.common_lib import control_data
+from autotest_lib.client.common_lib import error
 from autotest_lib.frontend.afe import models, model_logic, model_attributes
 from autotest_lib.frontend.afe import control_file, rpc_utils
 
@@ -537,6 +539,12 @@
     @returns The created Job id number.
     """
 
+    # Force control files to only contain ascii characters.
+    try:
+        control_file.encode('ascii')
+    except UnicodeDecodeError as e:
+        raise error.ControlFileMalformed(str(e))
+
     if image is None:
         return rpc_utils.create_job_common(
                 **rpc_utils.get_create_job_common_args(locals()))

frontend/afe/site_rpc_interface.py

diff --git a/frontend/afe/site_rpc_interface.py b/frontend/afe/site_rpc_interface.py
index 40447dd..0aef296 100644
--- a/frontend/afe/site_rpc_interface.py
+++ b/frontend/afe/site_rpc_interface.py
@@ -66,6 +66,12 @@
     if not control_file_in:
         raise error.ControlFileEmpty(
                 "Fetching %s returned no data." % suite_name)
+    # Force control files to only contain ascii characters.
+    try:
+        control_file_in.encode('ascii')
+    except UnicodeDecodeError as e:
+        raise error.ControlFileMalformed(str(e))
+
     return control_file_in