ohai 6.16.0 → 6.18.0.rc.0

data/lib/ohai/plugins/network.rb

@@ -63,49 +63,51 @@ def sorted_ips(family = "inet")
 end
 
 def find_ip(family = "inet")
-  r=sorted_ips(family)
+  ips=sorted_ips(family)
 
   # return if there isn't any #{family} address !
-  return [ nil, nil ] if r.empty?
+  return [ nil, nil ] if ips.empty?
 
   # shortcuts to access default #{family} interface and gateway
   int_attr = FAMILIES[family] +"_interface"
   gw_attr = FAMILIES[family] + "_gateway"
 
   # If we have a default interface that has addresses,
-  # populate the short-cut attributes
+  # populate the short-cut attributes ipaddress, ip6address and macaddress
   if network[int_attr]
 
-    # network[int_attr] exists, the choosen ip must be exist on this interface
-    r = r.select do |v|
+    # working with the address(es) of the default network interface
+    gw_if_ips = ips.select do |v|
       v[:iface] == network[int_attr]
     end
-    if r.empty?
-      Ohai::Log.warn("[#{family}] no ip on #{network[int_attr]}")
+    if gw_if_ips.empty?
+      Ohai::Log.warn("[#{family}] no ip address on #{network[int_attr]}")
     elsif network[gw_attr] and
         network["interfaces"][network[int_attr]] and
         network["interfaces"][network[int_attr]]["addresses"]
       if [ "0.0.0.0", "::" ].include? network[gw_attr]
         # link level default route
         Ohai::Log.debug("link level default #{family} route, picking ip from #{network[gw_attr]}")
-        r = r.first
+        r = gw_if_ips.first
       else
-        r = r.select do |v|
+        # checking network masks
+        r = gw_if_ips.select do |v|
           network_contains_address(network[gw_attr], v[:ipaddress], v[:iface])
         end.first
         if r.nil?
-          Ohai::Log.warn("[#{family}] no ipaddress/mask on #{network[int_attr]} matching the gateway #{network[gw_attr]}")
+          r = gw_if_ips.first
+          Ohai::Log.warn("[#{family}] no ipaddress/mask on #{network[int_attr]} matching the gateway #{network[gw_attr]}, picking one anyway")
         else
           Ohai::Log.debug("[#{family}] Using default interface #{network[int_attr]} and default gateway #{network[gw_attr]} to set the default ip to #{r[:ipaddress]}")
         end
       end
     else
       # return the first ip address on network[int_attr]
-      r = r.first
+      r = gw_if_ips.first
     end
   else
-    r = r.first
-    Ohai::Log.info("[#{family}] no default interface, picking the first ipaddress")
+    r = ips.first
+    Ohai::Log.debug("[#{family}] no default interface, picking the first ipaddress")
   end
 
   return [ nil, nil ] if r.nil? or r.empty?
@@ -159,7 +161,7 @@ FAMILIES.keys.sort.each do |family|
     else
       ip6address r["ip"]
       if r["mac"] and macaddress.nil? and ipaddress.nil?
-        Ohai::Log.info("macaddress set to #{r["mac"]} from the ipv6 setup")
+        Ohai::Log.debug("macaddress set to #{r["mac"]} from the ipv6 setup")
         macaddress r["mac"]
       end
     end
@@ -169,5 +171,5 @@ end
 
 if results["inet"]["iface"] and results["inet6"]["iface"] and
     results["inet"]["iface"] != results["inet6"]["iface"]
-  Ohai::Log.info("ipaddress and ip6address are set from different interfaces (#{results["inet"]["iface"]} & #{results["inet6"]["iface"]}), macaddress has been set using the ipaddress interface")
+  Ohai::Log.debug("ipaddress and ip6address are set from different interfaces (#{results["inet"]["iface"]} & #{results["inet6"]["iface"]}), macaddress has been set using the ipaddress interface")
 end

data/lib/ohai/plugins/rackspace.rb

@@ -28,17 +28,17 @@ def has_rackspace_kernel?
   kernel[:release].split('-').last.eql?("rscloud")
 end
 
-# Checks for matching rackspace arp mac
+# Checks for rackspace provider attribute
 #
 # === Return
-# true:: If mac address matches
+# true:: If rackspace provider attribute found
 # false:: Otherwise
-def has_rackspace_mac?
-  network[:interfaces].values.each do |iface|
-    unless iface[:arp].nil?
-      return true if iface[:arp].value?("00:00:0c:07:ac:01") or iface[:arp].value?("00:00:0c:9f:f0:01")
-    end
+def has_rackspace_metadata?
+  status, stdout, stderr = run_command(:no_status_check => true, :command => "xenstore-read vm-data/provider_data/provider")
+  if status == 0
+    stdout.strip.downcase == 'rackspace'
   end
+rescue Ohai::Exceptions::Exec
   false
 end
 
@@ -48,7 +48,7 @@ end
 # true:: If the rackspace cloud can be identified
 # false:: Otherwise
 def looks_like_rackspace?
-  hint?('rackspace') || has_rackspace_mac? || has_rackspace_kernel?
+  hint?('rackspace') || has_rackspace_metadata? || has_rackspace_kernel?
 end
 
 # Names rackspace ip address
@@ -59,7 +59,7 @@ end
 def get_ip_address(name, eth)
   network[:interfaces][eth][:addresses].each do |key, info|
     if info['family'] == 'inet'
-      rackspace[name] = key 
+      rackspace[name] = key
       break # break when we found an address
     end
   end
@@ -74,7 +74,7 @@ def get_global_ipv6_address(name, eth)
   network[:interfaces][eth][:addresses].each do |key, info|
     # check if we got an ipv6 address and if its in global scope
     if info['family'] == 'inet6' && info['scope'] == 'Global'
-      rackspace[name] = key 
+      rackspace[name] = key
       break # break when we found an address
     end
   end

data/lib/ohai/plugins/root_group.rb

@@ -0,0 +1,30 @@
+#
+# Author:: Joseph Anthony Pasquale Holsten (<joseph@josephholsten.com>)
+# Copyright:: Copyright (c) 2013 Joseph Anthony Pasquale Holsten
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+provides 'root_group'
+
+case ::RbConfig::CONFIG['host_os']
+when /mswin|mingw32|windows/
+  # Per http://support.microsoft.com/kb/243330 SID: S-1-5-32-544 is the
+  # internal name for the Administrators group, which lets us work
+  # properly in environments with a renamed or localized name for the
+  # Administrators group
+  group = WMI::Win32_Group.find(:first, :conditions => {:SID => 'S-1-5-32-544'})
+  root_group group['Name']
+else
+  root_group Etc.getgrgid(Etc.getpwnam('root').gid).name
+end

data/lib/ohai/plugins/ssh_host_key.rb

@@ -21,14 +21,16 @@ require_plugin "keys"
 
 keys[:ssh] = Mash.new
 
-def is_dsa_or_rsa?(file)
-  case IO.read(file).split[0]
+def extract_keytype?(content)
+  case content[0]
   when "ssh-dss"
-    "dsa"
+    [ "dsa", nil ]
   when "ssh-rsa"
-    "rsa"
+    [ "rsa", nil ]
+  when /^ecdsa/
+    [ "ecdsa", content[0] ]
   else
-    nil
+    [ nil, nil ]
   end
 end
 
@@ -47,17 +49,25 @@ if sshd_config
     conf.each_line do |line|
       if line.match(/^hostkey\s/i)
         pub_file = "#{line.split[1]}.pub"
-        key_type = is_dsa_or_rsa?(pub_file)
-        keys[:ssh]["host_#{key_type}_public"] = IO.read(pub_file).split[1] unless key_type.nil?
+        content = IO.read(pub_file).split
+        key_type, key_subtype = extract_keytype?(content)
+        keys[:ssh]["host_#{key_type}_public"] = content[1] unless key_type.nil?
+        keys[:ssh]["host_#{key_type}_type"] = key_subtype unless key_subtype.nil?
       end
     end
   end
-else
-  if keys[:ssh][:host_dsa_public].nil? && File.exists?("/etc/ssh/ssh_host_dsa_key.pub")
-    keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
-  end
+end
 
-  if keys[:ssh][:host_rsa_public].nil? && File.exists?("/etc/ssh/ssh_host_rsa_key.pub")
-    keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
-  end
+if keys[:ssh][:host_dsa_public].nil? && File.exists?("/etc/ssh/ssh_host_dsa_key.pub")
+  keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
+end
+
+if keys[:ssh][:host_rsa_public].nil? && File.exists?("/etc/ssh/ssh_host_rsa_key.pub")
+  keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
+end
+
+if keys[:ssh][:host_ecdsa_public].nil? && File.exists?("/etc/ssh/ssh_host_ecdsa_key.pub")
+  content = IO.read("/etc/ssh/ssh_host_ecdsa_key.pub")
+  keys[:ssh][:host_ecdsa_public] = content.split[1]
+  keys[:ssh][:host_ecdsa_type] = content.split[0]
 end

data/lib/ohai/system.rb

@@ -133,7 +133,7 @@ module Ohai
           Dir[File.join(path, '*')],
           Dir[File.join(path, @data[:os], '**', '*')]
         ].flatten.each do |file|
-          file_regex = Regexp.new("#{path}#{File::SEPARATOR}(.+).rb$")
+          file_regex = Regexp.new("#{File.expand_path(path)}#{File::SEPARATOR}(.+).rb$")
           md = file_regex.match(file)
           if md
             plugin_name = md[1].gsub(File::SEPARATOR, "::")

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '6.16.0'
+  VERSION = '6.18.0.rc.0'
 end
 

data/spec/unit/mixin/ec2_metadata_spec.rb

@@ -0,0 +1,82 @@
+#
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDIT"Net::HTTP Response"NS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require 'ohai/mixin/ec2_metadata'
+
+describe Ohai::Mixin::Ec2Metadata do
+  let(:mixin) {
+    metadata_object = Object.new.extend(Ohai::Mixin::Ec2Metadata)
+    http_client = mock("Net::HTTP client")
+    http_client.stub!(:get).and_return(response)
+    metadata_object.stub!(:http_client).and_return(http_client)
+    metadata_object
+  }
+
+  context "#best_api_version" do
+    context "with a sorted list of metadata versions" do
+      let(:response) { mock("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "200") }
+
+      it "returns the most recent version" do
+        mixin.best_api_version.should == "2012-01-12"
+      end
+    end
+
+    context "with an unsorted list of metadata versions" do
+      let(:response) { mock("Net::HTTP Response", :body => "1.0\n2009-04-04\n2007-03-01\n2011-05-01\n2008-09-01\nUnsupported", :code => "200") }
+
+      it "returns the most recent version (using string sort)" do
+        mixin.best_api_version.should == "2011-05-01"
+      end
+    end
+
+    context "when no supported versions are found" do
+      let(:response) { mock("Net::HTTP Response", :body => "2020-01-01\nUnsupported", :code => "200") }
+
+      it "raises an error" do
+        lambda { mixin.best_api_version}.should raise_error
+      end
+    end
+
+    context "when the response code is 404" do
+      let(:response) { mock("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "404") }
+
+      it "raises an error" do
+        lambda { mixin.best_api_version}.should raise_error
+      end
+    end
+
+    context "when the response code is unexpected" do
+      let(:response) { mock("Net::HTTP Response", :body => "1.0\n2011-05-01\n2012-01-12\nUnsupported", :code => "418") }
+
+      it "raises an error" do
+        lambda { mixin.best_api_version}.should raise_error
+      end
+    end
+  end
+
+  context "#metadata_get" do
+    context "when the response code is unexpected" do
+      let(:response) { mock("Net::HTTP Response", :body => "", :code => "418") }
+
+      it "raises an error" do
+        lambda { mixin.metadata_get('', '2012-01-12') }.should raise_error(RuntimeError)
+      end
+    end
+  end
+end

data/spec/unit/plugins/azure_spec.rb

@@ -0,0 +1,73 @@
+#
+# Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
+# Copyright:: Copyright (c) 2011-2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
+require 'open-uri'
+
+describe Ohai::System, "plugin azure" do
+  before(:each) do
+    @ohai = Ohai::System.new
+    @ohai.stub!(:require_plugin).and_return(true)
+  end
+
+  describe "with azure cloud file" do
+    before(:each) do
+      File.stub!(:exist?).with('/etc/chef/ohai/hints/azure.json').and_return(true)
+      File.stub!(:read).with('/etc/chef/ohai/hints/azure.json').and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
+      File.stub!(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(true)
+      File.stub!(:read).with('C:\chef\ohai\hints/azure.json').and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
+      @ohai._require_plugin("azure")
+    end
+
+    it 'should set the azure cloud attributes' do
+      @ohai[:azure].should_not be_nil
+      @ohai[:azure]['public_ip'].should  == "137.135.46.202"
+      @ohai[:azure]['vm_name'].should == "test-vm"
+      @ohai[:azure]['public_fqdn'].should == "service.cloudapp.net"
+      @ohai[:azure]['public_ssh_port'].should == "22"
+      @ohai[:azure]['public_winrm_port'].should == "5985"
+    end
+
+  end
+
+  describe "without azure cloud file" do
+    before(:each) do
+      File.stub!(:exist?).with('/etc/chef/ohai/hints/azure.json').and_return(false)
+      File.stub!(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+    end
+
+    it 'should not behave like azure' do
+      @ohai[:azure].should be_nil
+    end
+  end
+
+  describe "with rackspace cloud file" do
+    before(:each) do
+      File.stub!(:exist?).with('/etc/chef/ohai/hints/rackspace.json').and_return(true)
+      File.stub!(:read).with('/etc/chef/ohai/hints/rackspace.json').and_return('')
+      File.stub!(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
+      File.stub!(:read).with('C:\chef\ohai\hints/rackspace.json').and_return('')
+    end
+
+    it 'should not behave like azure' do
+      @ohai[:azure].should be_nil
+    end
+  end
+
+end

data/spec/unit/plugins/cloud_spec.rb

@@ -29,6 +29,7 @@ describe Ohai::System, "plugin cloud" do
       @ohai[:rackspace] = nil
       @ohai[:eucalyptus] = nil
       @ohai[:linode] = nil
+      @ohai[:azure] = nil
       @ohai._require_plugin("cloud")
       @ohai[:cloud].should be_nil
     end
@@ -156,4 +157,51 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
+  describe "with Azure mash" do
+    before do
+      @ohai[:azure] = Mash.new()
+    end
+
+    it "populates cloud public ip" do
+      @ohai[:azure]['public_ip'] = "174.129.150.8"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ips][0].should == @ohai[:azure]['public_ip']
+    end
+
+    it "populates cloud vm_name" do
+      @ohai[:azure]['vm_name'] = "linux-vm"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:vm_name].should == @ohai[:azure]['vm_name']
+    end
+
+    it "populates cloud public_fqdn" do
+      @ohai[:azure]['public_fqdn'] = "linux-vm-svc.cloudapp.net"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_fqdn].should == @ohai[:azure]['public_fqdn']
+    end
+
+    it "populates cloud public_ssh_port" do
+      @ohai[:azure]['public_ssh_port'] = "22"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ssh_port].should == @ohai[:azure]['public_ssh_port']
+    end
+
+    it "should not populate cloud public_ssh_port when winrm is used" do
+      @ohai[:azure]['public_winrm_port'] = "5985"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_ssh_port].should be_nil
+    end
+
+    it "populates cloud public_winrm_port" do
+      @ohai[:azure]['public_winrm_port'] = "5985"
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:public_winrm_port].should == @ohai[:azure]['public_winrm_port']
+    end
+
+    it "populates cloud provider" do
+      @ohai._require_plugin("cloud")
+      @ohai[:cloud][:provider].should == "azure"
+    end
+  end
+
 end