ec2_metadata.rb in ohai-6.16.0.beta.1

- old
+ new

@@ -23,13 +23,15 @@
 module Ohai
   module Mixin
     module Ec2Metadata
 
       EC2_METADATA_ADDR = "169.254.169.254" unless defined?(EC2_METADATA_ADDR)
-      EC2_METADATA_URL = "/2008-02-01/meta-data" unless defined?(EC2_METADATA_URL)
-      EC2_USERDATA_URL = "/2008-02-01/user-data" unless defined?(EC2_USERDATA_URL)
+      EC2_METADATA_URL = "/2012-01-12/meta-data" unless defined?(EC2_METADATA_URL)
+      EC2_USERDATA_URL = "/2012-01-12/user-data" unless defined?(EC2_USERDATA_URL)
       EC2_ARRAY_VALUES = %w(security-groups)
+      EC2_ARRAY_DIR    = %w(network/interfaces/macs)
+      EC2_JSON_DIR     = %w(iam)
 
       def can_metadata_connect?(addr, port, timeout=2)
         t = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
         saddr = Socket.pack_sockaddr_in(port, addr)
         connected = false
@@ -60,28 +62,81 @@
       end
 
       def fetch_metadata(id='')
         metadata = Hash.new
         http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
-          key = "#{id}#{o.gsub(/\=.*$/, '/')}"
+          key = expand_path("#{id}#{o}")
           if key[-1..-1] != '/'
-            metadata[key.gsub(/\-|\//, '_').to_sym] =
+            metadata[metadata_key(key)] =
               if EC2_ARRAY_VALUES.include? key
                 http_client.get("#{EC2_METADATA_URL}/#{key}").body.split("\n")
               else
                 http_client.get("#{EC2_METADATA_URL}/#{key}").body
               end
-          else
-            fetch_metadata(key).each{|k,v| metadata[k] = v}
+          elsif not key.eql?(id) and not key.eql?('/')
+            name = key[0..-2]
+	    sym = metadata_key(name)
+            if EC2_ARRAY_DIR.include?(name)
+              metadata[sym] = fetch_dir_metadata(key)
+            elsif EC2_JSON_DIR.include?(name)
+              metadata[sym] = fetch_json_dir_metadata(key)
+            else
+              fetch_metadata(key).each{|k,v| metadata[k] = v}
+            end
           end
         end
         metadata
       end
 
+      def fetch_dir_metadata(id)
+        metadata = Hash.new
+        http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
+          key = expand_path(o)
+          if key[-1..-1] != '/'
+            metadata[metadata_key(key)] = http_client.get("#{EC2_METADATA_URL}/#{id}#{key}").body
+          elsif not key.eql?('/')
+            metadata[key[0..-2]] = fetch_dir_metadata("#{id}#{key}")
+          end
+        end
+        metadata
+      end
+
+      def fetch_json_dir_metadata(id)
+        metadata = Hash.new
+        http_client.get("#{EC2_METADATA_URL}/#{id}").body.split("\n").each do |o|
+          key = expand_path(o)
+          if key[-1..-1] != '/'
+            data = http_client.get("#{EC2_METADATA_URL}/#{id}#{key}").body
+            json = StringIO.new(data)
+            parser = Yajl::Parser.new
+            metadata[metadata_key(key)] = parser.parse(json)
+          elsif not key.eql?('/')
+            metadata[key[0..-2]] = fetch_json_dir_metadata("#{id}#{key}")
+          end
+        end
+        metadata
+      end
+
       def fetch_userdata()
         response = http_client.get("#{EC2_USERDATA_URL}/")
         response.code == "200" ? response.body : nil
       end
+
+      private
+
+      def expand_path(file_name)
+        uri = URI.parse(file_name.gsub(/\=.*$/, '/'))
+        path = uri.normalize.to_s
+        # ignore "./" and "../"
+        path.gsub(%r{/\.\.?(?:/|$)}, '/').
+          sub(%r{^\.\.?(?:/|$)}, '').
+          sub(%r{^$}, '/')
+      end
+
+      def metadata_key(key)
+        key.gsub(/\-|\//, '_')
+      end
+
     end
   end
 end
 