From b81d5ed43e7ebed1d11d4b4109e22e9954316d4c Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 27 Aug 2012 15:20:58 -0400 Subject: DataSourceEc2: require 'instance-data' as top level domain In searching for the metadata service, require 'instance-data' to be at the top level domain. Previously any misconfigured 'search' in /etc/resolv.conf could result in unintended use of a metadata server. LP: #1040200 --- ChangeLog | 1 + cloudinit/sources/DataSourceEc2.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b28566e5..283d1464 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ 0.7.0: + - search only top level dns for 'instance-data' in DataSourceEc2 (LP: #1040200) - add support for config-drive-v2 (LP:#1037567) - support creating users, including the default user. [Ben Howard] (LP: #1028503) diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py index 556dcafb..7e845571 100644 --- a/cloudinit/sources/DataSourceEc2.py +++ b/cloudinit/sources/DataSourceEc2.py @@ -40,7 +40,7 @@ DEF_MD_VERSION = '2009-04-04' # Default metadata urls that will be used if none are provided # They will be checked for 'resolveability' and some of the # following may be discarded if they do not resolve -DEF_MD_URLS = [DEF_MD_URL, "http://instance-data:8773"] +DEF_MD_URLS = [DEF_MD_URL, "http://instance-data.:8773"] class DataSourceEc2(sources.DataSource): -- cgit v1.2.3