diff options
author | Ryan Harper <ryan.harper@canonical.com> | 2020-08-14 12:51:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-14 13:51:54 -0400 |
commit | ef041fd822a2cf3a4022525e942ce988b1f95180 (patch) | |
tree | 88632871e544393fca01997058f211c44439fa6b /upstart | |
parent | 2d3533b59c7bf00affbda9c2c94fb5f214ffcb11 (diff) | |
download | vyos-cloud-init-ef041fd822a2cf3a4022525e942ce988b1f95180.tar.gz vyos-cloud-init-ef041fd822a2cf3a4022525e942ce988b1f95180.zip |
user-data: only verify mime-types for TYPE_NEEDED and x-shellscript (#511)
Commit d00126c167fc06d913d99cfc184bf3402cb8cf53 regressed cloud-init
handling in multipart MIME user-data. Specifically, cloud-init would
examine the payload of the MIME part to determine what the content
type and subsequently which handler to use. This meant that user-data
which had shellscript payloads (starts with #!) were always handled
as shellscripts, rather than their declared MIME type and affected
when the payload was handled.
One failing scenario was a MIME part with text/cloud-boothook type
declared and a shellscript payload. This was run at shellscript
processing time rather than boothook time resulting in an change in
behavior from previous cloud-init releases.
To continue to support known scenarios where clouds have specifed
a MIME type of text/x-shellscript but provided a payload of something
other than shellscripts, we're changing the lookup logic to check for
the TYPES_NEEDED (text/plain, text/x-not-multipart) and only
text/x-shellscript.
It is safe to check text/x-shellscript parts as all shellscripts must
include the #! marker and will be detected as text/x-shellscript types.
If the content is missing the #! marker, it will not be excuted. If
the content is detected as something cloud-init supports, such as
#cloud-config the appropriate cloud-init handler will be used.
This change will fix hanldling for parts which were shellscripts but
ran with the wrong handler due to ignoring of the provided mime-type.
LP: #1888822
Diffstat (limited to 'upstart')
0 files changed, 0 insertions, 0 deletions