Skip to content

tolerate more mime types for cc part of user-data. #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
garloff wants to merge 11 commits into from
Closed

tolerate more mime types for cc part of user-data. #234

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2f4dd3
tolerate more mime types for cc part of user-data.
garloff Mar 5, 2020
1f476de
Avoid violating pycodestyle violation.
garloff Mar 5, 2020
556eb92
Merge remote-tracking branch 'upstream/master' into tolerate-more-cco…
garloff Mar 9, 2020
6687b96
Merge branch 'master' into tolerate-more-cconfig-mimetypes
garloff Mar 11, 2020
e786818
Merge branch 'master' into tolerate-more-cconfig-mimetypes
garloff Mar 25, 2020
a2bb184
Merge branch 'master' into tolerate-more-cconfig-mimetypes
OddBloke Mar 26, 2020
3640328
Merge branch 'master' into tolerate-more-cconfig-mimetypes
garloff Mar 26, 2020
70ddf96
Revert "Avoid violating pycodestyle violation."
garloff Mar 26, 2020
7168657
Revert "tolerate more mime types for cc part of user-data."
garloff Mar 26, 2020
35a6030
Fix cloud-init ignoring some mimetypes in user-data.
garloff Mar 27, 2020
4960778
Merge branch 'master' into tolerate-more-cconfig-mimetypes
garloff Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cloudinit/user_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
NOT_MULTIPART_TYPE = handlers.NOT_MULTIPART_TYPE
PART_FN_TPL = handlers.PART_FN_TPL
OCTET_TYPE = handlers.OCTET_TYPE
INCLUDE_MAP = handlers.INCLUSION_TYPES_MAP

# Saves typing errors
CONTENT_TYPE = 'Content-Type'
Expand Down Expand Up @@ -115,7 +116,8 @@ def find_ctype(payload):
# Attempt to figure out the payloads content-type
if not ctype_orig:
ctype_orig = UNDEF_TYPE
if ctype_orig in TYPE_NEEDED:
if ctype_orig in TYPE_NEEDED or (ctype_orig in
INCLUDE_MAP.values()):
ctype = find_ctype(payload)
if ctype is None:
ctype = ctype_orig
Expand Down