Stefan Caraiman 8e5fff7016
Improve MIME multipart userdata handling
The 'exec_file' will now try to check for the headers inside the file, in
case that it doesn't recognize the format or no format has been provided.
Also the processing part of the user data now checks if the 'Content-Type' is
in the file instead of checking if the file starts with the header, in
order to comply with RFC2045.

Change-Id: I53fda9f5c17f35cb35d93a86434ecc4c7c579802
Closes-Bug: #1623393
Closes-Bug: #1672222
2017-03-13 15:57:46 +02:00

41 lines
1.4 KiB
Python

# Copyright 2014 Cloudbase Solutions Srl
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as oslo_logging
from cloudbaseinit.plugins.common import userdatautils
LOG = oslo_logging.getLogger(__name__)
def exec_file(file_path):
ret_val = 0
command = userdatautils.get_command_from_path(file_path)
if not command:
# File format not provided or not recognized
LOG.debug('No valid extension or header found in the '
'userdata: %s' % file_path)
return ret_val
try:
out, err, ret_val = command.execute()
except Exception as ex:
LOG.warning('An error occurred during file execution: \'%s\'', ex)
else:
LOG.debug('User_data stdout:\n%s', out)
LOG.debug('User_data stderr:\n%s', err)
LOG.info('Script "%(file_path)s" ended with exit code: %(ret_val)d',
{"file_path": file_path, "ret_val": ret_val})
return ret_val