diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-20 03:26:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-20 03:26:56 +0000 |
| commit | 1f1b9de4bf6ee69a0baaa9171cc163bd790ec2da (patch) | |
| tree | 83c66fd35fb5e707e7c6cabf75ebb20a2f03aa05 | |
| parent | 79a2cc44bce8c922278e95f643b85376f257408e (diff) | |
| parent | 13ca1b923e479905f9d1debdea6125be92f44808 (diff) | |
| download | nova-1f1b9de4bf6ee69a0baaa9171cc163bd790ec2da.tar.gz nova-1f1b9de4bf6ee69a0baaa9171cc163bd790ec2da.tar.xz nova-1f1b9de4bf6ee69a0baaa9171cc163bd790ec2da.zip | |
Merge "Strip out characters that should be escaped from console output"
| -rw-r--r-- | nova/api/openstack/compute/contrib/console_output.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py index 1eb86a092..3c3a597c6 100644 --- a/nova/api/openstack/compute/contrib/console_output.py +++ b/nova/api/openstack/compute/contrib/console_output.py @@ -16,6 +16,7 @@ # License for the specific language governing permissions and limitations # under the License +import re import webob from nova import compute @@ -57,6 +58,10 @@ class ConsoleOutputController(wsgi.Controller): except exception.NotFound: raise webob.exc.HTTPNotFound(_('Instance not found')) + # XML output is not correctly escaped, so remove invalid characters + remove_re = re.compile('[\x00-\x08\x0B-\x0C\x0E-\x1F]') + output = remove_re.sub('', output) + return {'output': output} |