69 lines
3.3 KiB
Diff
69 lines
3.3 KiB
Diff
Index: cloud-init-0.7.9/cloudinit/ec2_utils.py
|
|
===================================================================
|
|
--- cloud-init-0.7.9.orig/cloudinit/ec2_utils.py
|
|
+++ cloud-init-0.7.9/cloudinit/ec2_utils.py
|
|
@@ -82,6 +82,9 @@ class MetadataMaterializer(object):
|
|
field_name = get_name(field)
|
|
if not field or not field_name:
|
|
continue
|
|
+ # Don't materialize credentials
|
|
+ if field_name == 'security-credentials':
|
|
+ continue
|
|
if has_children(field):
|
|
if field_name not in children:
|
|
children.append(field_name)
|
|
Index: cloud-init-0.7.9/tests/unittests/test_ec2_util.py
|
|
===================================================================
|
|
--- cloud-init-0.7.9.orig/tests/unittests/test_ec2_util.py
|
|
+++ cloud-init-0.7.9/tests/unittests/test_ec2_util.py
|
|
@@ -140,4 +140,49 @@ class TestEc2Util(helpers.HttprettyTestC
|
|
self.assertEqual(bdm['ami'], 'sdb')
|
|
self.assertEqual(bdm['ephemeral0'], 'sdc')
|
|
|
|
+ @hp.activate
|
|
+ def test_metadata_no_security_credentials(self):
|
|
+ base_url = 'http://169.254.169.254/%s/meta-data/' % (self.VERSION)
|
|
+ hp.register_uri(hp.GET, base_url, status=200,
|
|
+ body="\n".join(['instance-id',
|
|
+ 'iam/']))
|
|
+ hp.register_uri(hp.GET, uh.combine_url(base_url, 'instance-id'),
|
|
+ status=200, body='i-0123451689abcdef0')
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(base_url, 'iam/'),
|
|
+ status=200,
|
|
+ body="\n".join(['info/', 'security-credentials/']))
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(base_url, 'iam/info/'),
|
|
+ status=200,
|
|
+ body='LastUpdated')
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(base_url, 'iam/info/LastUpdated'),
|
|
+ status=200, body='2016-10-27T17:29:39Z')
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(base_url, 'iam/security-credentials/'),
|
|
+ status=200,
|
|
+ body='ReadOnly/')
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(base_url,
|
|
+ 'iam/security-credentials/ReadOnly/'),
|
|
+ status=200,
|
|
+ body="\n".join(['LastUpdated', 'Expiration']))
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(
|
|
+ base_url,
|
|
+ 'iam/security-credentials/ReadOnly/LastUpdated'),
|
|
+ status=200, body='2016-10-27T17:28:17Z')
|
|
+ hp.register_uri(hp.GET,
|
|
+ uh.combine_url(
|
|
+ base_url,
|
|
+ 'iam/security-credentials/ReadOnly/Expiration'),
|
|
+ status=200, body='2016-10-28T00:00:34Z')
|
|
+ md = eu.get_instance_metadata(self.VERSION, retries=0, timeout=0.1)
|
|
+ self.assertEqual(md['instance-id'], 'i-0123451689abcdef0')
|
|
+ iam = md['iam']
|
|
+ self.assertEqual(1, len(iam))
|
|
+ self.assertEqual(iam['info']['LastUpdated'], '2016-10-27T17:29:39Z')
|
|
+ self.assertNotIn('security-credentials', iam)
|
|
+
|
|
# vi: ts=4 expandtab
|