ohai 8.0.1 → 8.1.0

data/lib/ohai/plugins/php.rb

@@ -1,6 +1,8 @@
 #
 # Author:: Doug MacEachern <dougm@vmware.com>
+# Author:: Tim Smith <tim@cozy.co>
 # Copyright:: Copyright (c) 2009 VMware, Inc.
+# Copyright:: Copyright (c) 2014 Cozy Services, Ltd.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,17 +24,22 @@ Ohai.plugin(:PHP) do
   depends "languages"
 
   collect_data do
-    output = nil
-
     php = Mash.new
 
     so = shell_out("php -v")
     if so.exitstatus == 0
-      output = /PHP (\S+).+built: ([^)]+)/.match(so.stdout)
-      if output
-        php[:version] = output[1]
-        php[:builddate] = output[2]
+      so.stdout.each_line do |line|
+        case line
+        when /PHP (\S+).+built: ([^)]+)/
+          php[:version] = $1
+          php[:builddate] = $2
+        when /Zend Engine v([^\s]+),/
+          php[:zend_engine_version] = $1
+        when /Zend OPcache v([^\s]+),/
+          php[:zend_opcache_version] = $1
+        end
       end
+
       languages[:php] = php if php[:version]
     end
   end

data/lib/ohai/plugins/ruby.rb

@@ -34,16 +34,16 @@ Ohai.plugin(:Ruby) do
       :platform => "RUBY_PLATFORM",
       :version => "RUBY_VERSION",
       :release_date => "RUBY_RELEASE_DATE",
-      :target => "::Config::CONFIG['target']",
-      :target_cpu => "::Config::CONFIG['target_cpu']",
-      :target_vendor => "::Config::CONFIG['target_vendor']",
-      :target_os => "::Config::CONFIG['target_os']",
-      :host => "::Config::CONFIG['host']",
-      :host_cpu => "::Config::CONFIG['host_cpu']",
-      :host_os => "::Config::CONFIG['host_os']",
-      :host_vendor => "::Config::CONFIG['host_vendor']",
-      :bin_dir => "::Config::CONFIG['bindir']",
-      :ruby_bin => "::File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])"
+      :target => "RbConfig::CONFIG['target']",
+      :target_cpu => "RbConfig::CONFIG['target_cpu']",
+      :target_vendor => "RbConfig::CONFIG['target_vendor']",
+      :target_os => "RbConfig::CONFIG['target_os']",
+      :host => "RbConfig::CONFIG['host']",
+      :host_cpu => "RbConfig::CONFIG['host_cpu']",
+      :host_os => "RbConfig::CONFIG['host_os']",
+      :host_vendor => "RbConfig::CONFIG['host_vendor']",
+      :bin_dir => "RbConfig::CONFIG['bindir']",
+      :ruby_bin => "::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])"
     }
 
     # Create a query string from above hash

data/lib/ohai/plugins/rust.rb

@@ -0,0 +1,32 @@
+# Author:: Christopher M Luciano (<cmlucian@us.ibm.com>)
+# 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.
+
+Ohai.plugin(:Rust) do
+  provides "languages/rust"
+
+  depends "languages"
+
+  collect_data do
+    output = nil
+
+    rust = Mash.new
+    so = shell_out("rustc --version")
+    if so.exitstatus == 0
+      output =  so.stdout.split
+      rust[:version] = output[1]
+      languages[:rust] = rust if rust[:version]
+    end
+  end
+end

data/lib/ohai/plugins/ssh_host_key.rb

@@ -28,6 +28,8 @@ Ohai.plugin(:SSHHostKey) do
       [ "rsa", nil ]
     when /^ecdsa/
       [ "ecdsa", content[0] ]
+    when 'ssh-ed25519'
+      [ 'ed25519', nil ]
     else
       [ nil, nil ]
     end
@@ -73,5 +75,9 @@ Ohai.plugin(:SSHHostKey) do
       keys[:ssh][:host_ecdsa_public] = content.split[1]
       keys[:ssh][:host_ecdsa_type] = content.split[0]
     end
+
+    if keys[:ssh][:host_ed25519_public].nil? && File.exists?("/etc/ssh/ssh_host_ed25519_key.pub")
+      keys[:ssh][:host_ed25519_public] = IO.read("/etc/ssh/ssh_host_ed25519_key.pub").split[1]
+    end
   end
 end

data/lib/ohai/util/ip_helper.rb

@@ -0,0 +1,52 @@
+#
+# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
+# 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.
+
+module Ohai
+  module Util
+    module IpHelper
+      # Corresponding to RFC 4193
+      IPV6_PRIVATE_ADDRESS_BLOCK = IPAddress('fc00::/7')
+
+      def private_address?(addr)
+        ip = IPAddress(addr)
+
+        if ip.respond_to? :private?
+          ip.private?
+        else
+          IPV6_PRIVATE_ADDRESS_BLOCK.include?(ip)
+        end
+      end
+      alias :unique_local_address? :private_address?
+
+      def public_address?(addr)
+        !private_address?(addr)
+      end
+
+      # The ipaddress gem doesn't implement loopback?
+      # for IPv4 addresses
+      # https://github.com/bluemonk/ipaddress/issues/25
+      def loopback?(addr)
+        ip = IPAddress(addr)
+
+        if ip.respond_to? :loopback?
+          ip.loopback?
+        else
+          IPAddress('127.0.0.0/8').include? ip
+        end
+      end
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '8.0.1'
+  VERSION = '8.1.0'
 end

data/spec/data/plugins/php.output

@@ -141,3 +141,19 @@ params "-v"
 stdout "PHP 5.4.9-4ubuntu2.2 (cli) (built: Jul 15 2013 18:23:35) \nCopyright (c) 1997-2012 The PHP Group\nZend Engine v2.4.0, Copyright (c) 1998-2012 Zend Technologies\n"
 stderr ""
 exit_status 0
+
+platform "ubuntu-14.04"
+arch "x64"
+env []
+params "-v"
+stdout ""
+stderr "bash: line 2: php: command not found\n"
+exit_status 127
+
+platform "ubuntu-14.04"
+arch "x64"
+env ["php"]
+params "-v"
+stdout "PHP 5.5.9-1ubuntu4.5 (cli) (built: Oct 29 2014 11:59:10) \nCopyright (c) 1997-2014 The PHP Group\nZend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies\n    with Zend OPcache v7.0.3, Copyright (c) 1999-2014, by Zend Technologies"
+stderr ""
+exit_status 0

data/spec/unit/plugins/cloud_spec.rb

@@ -30,6 +30,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:linode] = nil
       @plugin[:azure] = nil
       @plugin[:cloudstack] = nil
+      @plugin[:digital_ocean] = nil
       @plugin.run
       expect(@plugin[:cloud]).to be_nil
     end
@@ -61,38 +62,38 @@ describe Ohai::System, "plugin cloud" do
   describe "with rackspace" do
     before do
       @plugin[:rackspace] = Mash.new()
-    end  
-    
+    end
+
     it "populates cloud public ip" do
       @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
       @plugin.run
       expect(@plugin[:cloud][:public_ipv4]).to eq(@plugin[:rackspace][:public_ipv4])
     end
-    
+
     it "populates cloud public ipv6" do
       @plugin[:rackspace][:public_ipv6] = "2a00:1a48:7805:111:e875:efaf:ff08:75"
       @plugin.run
       expect(@plugin[:cloud][:public_ipv6]).to eq(@plugin[:rackspace][:public_ipv6])
     end
-    
+
     it "populates cloud private ip" do
       @plugin[:rackspace][:local_ipv4] = "10.252.42.149"
       @plugin.run
       expect(@plugin[:cloud][:local_ipv4]).to eq(@plugin[:rackspace][:local_ipv4])
     end
-    
+
     it "populates cloud private ipv6" do
       @plugin[:rackspace][:local_ipv6] = "2a00:1a48:7805:111:e875:efaf:ff08:75"
       @plugin.run
       expect(@plugin[:cloud][:local_ipv6]).to eq(@plugin[:rackspace][:local_ipv6])
     end
-    
+
     it "populates first cloud public ip" do
       @plugin[:rackspace][:public_ipv4] = "174.129.150.8"
       @plugin.run
       expect(@plugin[:cloud][:public_ips].first).to eq(@plugin[:rackspace][:public_ipv4])
     end
-    
+
     it "populates first cloud public ip" do
       @plugin[:rackspace][:local_ipv4] = "174.129.150.8"
       @plugin.run
@@ -212,9 +213,9 @@ describe Ohai::System, "plugin cloud" do
     end
 
     it "populates cloud public ip" do
-      @plugin[:cloudstack]['public_ipv4'] = "174.129.150.8"
+      @plugin[:cloudstack]['local_ipv4'] = "174.129.150.8"
       @plugin.run
-      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:cloudstack]['public_ipv4'])
+      expect(@plugin[:cloud][:public_ips][0]).to eq(@plugin[:cloudstack]['local_ipv4'])
     end
 
     it "populates cloud private ip" do
@@ -235,5 +236,58 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
+  describe "with digital_ocean mash" do
+    before do
+      @plugin[:digital_ocean] = Mash.new
+      @plugin[:digital_ocean][:name] = "public.example.com"
+      @plugin[:digital_ocean][:networks] = Mash.new
+      @plugin[:digital_ocean][:networks][:v4] = [{"ip_address" => "1.2.3.4", "type" => "public"},
+                                                 {"ip_address" => "5.6.7.8", "type" => "private"}]
+      @plugin[:digital_ocean][:networks][:v6] = [{"ip_address" => "fe80::4240:95ff:fe47:6eee", "type" => "public"},
+                                                 {"ip_address" => "fdf8:f53b:82e4::53", "type" => "private"}]
+    end
+
+    before(:each) do
+      @plugin.run
+    end
+
+    it "populates cloud public hostname" do
+      expect(@plugin[:cloud][:public_hostname]).to eq("public.example.com")
+    end
+
+    it "populates cloud local hostname" do
+      expect(@plugin[:cloud][:local_hostname]).to be_nil
+    end
+
+    it "populates cloud public ips" do
+      expect(@plugin[:cloud][:public_ips]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'public'} +
+                                             @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'public'})
+    end
+
+    it "populates cloud private ips" do
+      expect(@plugin[:cloud][:private_ips]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'private'} +
+                                              @plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'private'})
+    end
+
+    it "populates cloud public_ipv4" do
+      expect(@plugin[:cloud][:public_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'public'})
+    end
+
+    it "populates cloud local_ipv4" do
+      expect(@plugin[:cloud][:local_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'private'})
+    end
+
+    it "populates cloud public_ipv6" do
+      expect(@plugin[:cloud][:public_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'public'})
+    end
+
+    it "populates cloud local_ipv6" do
+      expect(@plugin[:cloud][:local_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'private'})
+    end
+
+    it "populates cloud provider" do
+      expect(@plugin[:cloud][:provider]).to eq("digital_ocean")
+    end
+  end
 
 end

data/spec/unit/plugins/cloud_v2_spec.rb

@@ -86,6 +86,7 @@ describe Ohai::System, "plugin cloud" do
       @plugin[:linode] = nil
       @plugin[:azure] = nil
       @plugin[:gce] = nil
+      @plugin[:digital_ocean] = nil
       @plugin.run
       expect(@plugin[:cloud_v2]).to be_nil
     end
@@ -115,31 +116,62 @@ describe Ohai::System, "plugin cloud" do
   end
 
   describe "with GCE mash" do
-    before do
-      @plugin[:gce] = Mash.new()
-      @plugin[:gce]['instance'] = Mash.new()
-      @plugin[:gce]['instance']['networkInterfaces'] = [
-        {
-          "accessConfigs" => [ {"externalIp" => "8.35.198.173", "type"=>"ONE_TO_ONE_NAT"} ],
-          "ip" => "10.240.0.102",
-          "network"=> "projects/foo/networks/default"
-        }
-      ]
-    end
-
-    it "populates cloud public ip" do
-      @plugin.run
-      expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq("8.35.198.173")
-    end
-
-    it "populates cloud private ip" do
-      @plugin.run
-      expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq("10.240.0.102")
-    end
-
-    it "populates cloud provider" do
-      @plugin.run
-      expect(@plugin[:cloud_v2][:provider]).to eq("gce")
+    describe "with a public IP" do
+      before do
+        @plugin[:gce] = Mash.new()
+        @plugin[:gce]['instance'] = Mash.new()
+        @plugin[:gce]['instance']['networkInterfaces'] = [
+          {
+            "accessConfigs" => [ {"externalIp" => "8.35.198.173", "type"=>"ONE_TO_ONE_NAT"} ],
+            "ip" => "10.240.0.102",
+            "network"=> "projects/foo/networks/default"
+          }
+        ]
+      end
+
+      it "populates cloud public ip" do
+        @plugin.run
+        expect(@plugin[:cloud_v2][:public_ipv4_addrs][0]).to eq("8.35.198.173")
+      end
+
+      it "populates cloud private ip" do
+        @plugin.run
+        expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq("10.240.0.102")
+      end
+
+      it "populates cloud provider" do
+        @plugin.run
+        expect(@plugin[:cloud_v2][:provider]).to eq("gce")
+      end
+    end
+
+    describe "with no public IP" do
+      before do
+        @plugin[:gce] = Mash.new()
+        @plugin[:gce]['instance'] = Mash.new()
+        @plugin[:gce]['instance']['networkInterfaces'] = [
+          {
+            "accessConfigs" => [ {"externalIp" => "", "type" => "ONE_TO_ONE_NAT"} ],
+            "ip" => "10.240.0.102",
+            "network" => "projects/foo/networks/default"
+          }
+        ]
+      end
+
+      it "does not populate cloud public ip" do
+        @plugin.run
+        expect(@plugin[:cloud_v2][:public_ipv4_addrs]).to be_nil
+      end
+
+      it "populates cloud private ip" do
+        @plugin.run
+        expect(@plugin[:cloud_v2][:local_ipv4_addrs][0]).to eq("10.240.0.102")
+      end
+
+      it "populates cloud provider" do
+        @plugin.run
+        expect(@plugin[:cloud_v2][:provider]).to eq("gce")
+      end
     end
   end
 
@@ -289,4 +321,70 @@ describe Ohai::System, "plugin cloud" do
     end
   end
 
+  describe "with digital_ocean mash" do
+    before do
+      @plugin[:digital_ocean] = Mash.new
+      @plugin[:digital_ocean][:name] = "public.example.com"
+      @plugin[:digital_ocean][:networks] = Mash.new
+      @plugin[:digital_ocean][:networks][:v4] = [{"ip_address" => "1.2.3.4", "type" => "public"},
+                                                 {"ip_address" => "5.6.7.8", "type" => "private"}]
+      @plugin[:digital_ocean][:networks][:v6] = [{"ip_address" => "fe80::4240:95ff:fe47:6eee", "type" => "public"},
+                                                 {"ip_address" => "fdf8:f53b:82e4::53", "type" => "private"}]
+    end
+
+    before(:each) do
+      @plugin.run
+    end
+
+    it "populates cloud public hostname" do
+      expect(@plugin[:cloud_v2][:public_hostname]).to eq("public.example.com")
+    end
+
+    it "populates cloud local hostname" do
+      expect(@plugin[:cloud_v2][:local_hostname]).to be_nil
+    end
+
+    it "populates cloud public_ipv4_addrs" do
+      expect(@plugin[:cloud_v2][:public_ipv4_addrs]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'public'}
+                                                                                              .map{|ip| ip['ip_address']})
+                                                       
+    end
+
+    it "populates cloud local_ipv4_addrs" do
+      expect(@plugin[:cloud_v2][:local_ipv4_addrs]).to eq(@plugin[:digital_ocean][:networks][:v4].select{|ip| ip['type'] == 'private'}
+                                                                                             .map{|ip| ip['ip_address']})
+                                                      
+    end
+
+    it "populates cloud public_ipv4" do
+      expect(@plugin[:cloud_v2][:public_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'public'}['ip_address'])
+    end
+
+    it "populates cloud local_ipv4" do
+      expect(@plugin[:cloud_v2][:local_ipv4]).to eq(@plugin[:digital_ocean][:networks][:v4].find{|ip| ip['type'] == 'private'}['ip_address'])
+    end
+
+    it "populates cloud public_ipv6_addrs" do
+      expect(@plugin[:cloud_v2][:public_ipv6_addrs]).to eq(@plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'public'}
+                                                                                              .map{|ip| ip['ip_address']})
+    end
+
+    it "populates cloud local_ipv6_addrs" do
+      expect(@plugin[:cloud_v2][:local_ipv6_addrs]).to eq(@plugin[:digital_ocean][:networks][:v6].select{|ip| ip['type'] == 'private'}
+                                                                                             .map{|ip| ip['ip_address']})
+    end
+
+    it "populates cloud public_ipv6" do
+      expect(@plugin[:cloud_v2][:public_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'public'}['ip_address'])
+    end
+
+    it "populates cloud local_ipv6" do
+      expect(@plugin[:cloud_v2][:local_ipv6]).to eq(@plugin[:digital_ocean][:networks][:v6].find{|ip| ip['type'] == 'private'}['ip_address'])
+    end
+
+    it "populates cloud provider" do
+      expect(@plugin[:cloud_v2][:provider]).to eq("digital_ocean")
+    end
+  end
+
 end