puppet 3.1.1 → 3.2.0.rc1

data/lib/puppet/util/network_device/config.rb

@@ -59,10 +59,11 @@ class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
             device = OpenStruct.new
             device.name = name
             device.line = count
+            device.options = { :debug => false }
             Puppet.debug "found device: #{device.name} at #{device.line}"
             devices[name] = device
-          when /^\s*(type|url)\s+(.+)$/
-            parse_directive(device, $1, $2, count)
+          when /^\s*(type|url|debug)(\s+(.+))*$/
+            parse_directive(device, $1, $3, count)
           else
             raise Puppet::Error, "Invalid line #{count}: #{line}"
           end
@@ -85,6 +86,8 @@ class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
       device.provider = value
     when "url"
       device.url = value
+    when "debug"
+      device.options[:debug] = true
     else
       raise Puppet::Error, "Invalid argument '#{var}' at line #{count}"
     end

data/lib/puppet/util/network_device/ipcalc.rb

@@ -1,5 +1,5 @@
-
 require 'puppet/util/network_device'
+
 module Puppet::Util::NetworkDevice::IPCalc
 
   # This is a rip-off of authstore

data/lib/puppet/util/network_device/transport/ssh.rb

@@ -7,10 +7,11 @@ require 'puppet/util/network_device/transport/base'
 # a sane interface to Net::SSH. Credits goes to net-ssh-telnet authors
 class Puppet::Util::NetworkDevice::Transport::Ssh < Puppet::Util::NetworkDevice::Transport::Base
 
-  attr_accessor :buf, :ssh, :channel, :verbose
+  attr_accessor :buf, :ssh, :channel
 
-  def initialize
-    super
+  def initialize(verbose = false)
+    super()
+    @verbose = verbose
     unless Puppet.features.ssh?
       raise 'Connecting with ssh to a network device requires the \'net/ssh\' ruby library'
     end

data/lib/puppet/util/network_device/transport/telnet.rb

@@ -4,8 +4,9 @@ require 'puppet/util/network_device/transport/base'
 require 'net/telnet'
 
 class Puppet::Util::NetworkDevice::Transport::Telnet < Puppet::Util::NetworkDevice::Transport::Base
-    def initialize
-      super
+    def initialize(verbose = false)
+      super()
+      @verbose = verbose
     end
 
     def handles_login?
@@ -37,6 +38,7 @@ class Puppet::Util::NetworkDevice::Transport::Telnet < Puppet::Util::NetworkDevi
     end
 
     def send(line)
+      Puppet.debug("telnet: send #{line}") if @verbose
       @telnet.puts(line)
     end
 end

data/lib/puppet/util/plugins.rb

@@ -44,7 +44,7 @@ module Puppet
     #
     # Add more places to look for plugins without adding duplicates or changing the
     #   order of ones we've already found.
-    #   
+    #
     def self.look_in(*paths)
       Paths.replace Paths | paths.flatten.collect { |path| File.expand_path(path) }
     end
@@ -53,18 +53,18 @@ module Puppet
     #
     look_in $LOAD_PATH
     #
-    # Calling methods (hooks) on the class calls the method of the same name on 
+    # Calling methods (hooks) on the class calls the method of the same name on
     #   all plugins that use that hook, passing in the same arguments to each
     #   and returning an array containing the results returned by each plugin as
     #   an array of [plugin_name,result] pairs.
-    # 
+    #
     def self.method_missing(hook,*args,&block)
       known.
         select  { |p| p.respond_to? hook }.
         collect { |p| [p.name,p.send(hook,*args,&block)] }
     end
     #
-    # 
+    #
     #
     attr_reader :path,:name
     def initialize(path)

data/lib/puppet/util/posix.rb

@@ -31,7 +31,7 @@ module Puppet::Util::POSIX
 
     begin
       return Etc.send(method, id).send(field)
-    rescue ArgumentError => detail
+    rescue NoMethodError, ArgumentError => detail
       # ignore it; we couldn't find the object
       return nil
     end

data/lib/puppet/util/profiler.rb

@@ -0,0 +1,28 @@
+require 'benchmark'
+
+# A simple profiling callback system.
+#
+# @api private
+module Puppet::Util::Profiler
+  require 'puppet/util/profiler/wall_clock'
+  require 'puppet/util/profiler/object_counts'
+  require 'puppet/util/profiler/none'
+
+  NONE = Puppet::Util::Profiler::None.new
+
+  # @returns This thread's configured profiler
+  def self.current
+    Thread.current[:profiler] || NONE
+  end
+
+  # @param profiler [#profile] A profiler for the current thread
+  def self.current=(profiler)
+    Thread.current[:profiler] = profiler
+  end
+
+  # @param message [String] A description of the profiled event
+  # @param block [Block] The segment of code to profile
+  def self.profile(message, &block)
+    current.profile(message, &block)
+  end
+end

data/lib/puppet/util/profiler/logging.rb

@@ -0,0 +1,47 @@
+class Puppet::Util::Profiler::Logging
+  def initialize(logger, identifier)
+    @logger = logger
+    @identifier = identifier
+    @sequence = Sequence.new
+  end
+
+  def profile(description, &block)
+    retval = nil
+    @sequence.next
+    @sequence.down
+    context = start
+    begin
+      retval = yield
+    ensure
+      profile_explanation = finish(context)
+      @sequence.up
+      @logger.call("PROFILE [#{@identifier}] #{@sequence} #{description}: #{profile_explanation}")
+    end
+    retval
+  end
+
+  class Sequence
+    INITIAL = 0
+    SEPARATOR = '.'
+
+    def initialize
+      @elements = [INITIAL]
+    end
+
+    def next
+      @elements[-1] += 1
+    end
+
+    def down
+      @elements << INITIAL
+    end
+
+    def up
+      @elements.pop
+    end
+
+    def to_s
+      @elements.join(SEPARATOR)
+    end
+  end
+end

data/lib/puppet/util/profiler/none.rb

@@ -0,0 +1,8 @@
+# A no-op profiler. Used when there is no profiling wanted.
+#
+# @api private
+class Puppet::Util::Profiler::None
+  def profile(description, &block)
+    yield
+  end
+end

data/lib/puppet/util/profiler/object_counts.rb

@@ -0,0 +1,17 @@
+require 'puppet/util/profiler/logging'
+
+class Puppet::Util::Profiler::ObjectCounts < Puppet::Util::Profiler::Logging
+  def start
+    ObjectSpace.count_objects
+  end
+
+  def finish(before)
+    after = ObjectSpace.count_objects
+
+    diff = before.collect do |type, count|
+      [type, after[type] - count]
+    end
+
+    diff.sort.collect { |pair| pair.join(': ') }.join(', ')
+  end
+end

data/lib/puppet/util/profiler/wall_clock.rb

@@ -0,0 +1,34 @@
+require 'puppet/util/profiler/logging'
+
+# A profiler implementation that measures the number of seconds a segment of
+# code takes to execute and provides a callback with a string representation of
+# the profiling information.
+#
+# @api private
+class Puppet::Util::Profiler::WallClock < Puppet::Util::Profiler::Logging
+  def start
+    Timer.new
+  end
+
+  def finish(context)
+    context.stop
+    "took #{context} seconds"
+  end
+
+  class Timer
+    FOUR_DECIMAL_DIGITS = '%0.4f'
+
+    def initialize
+      @start = Time.now
+    end
+
+    def stop
+      @finish = Time.now
+    end
+
+    def to_s
+      format(FOUR_DECIMAL_DIGITS, @finish - @start)
+    end
+  end
+end
+

data/lib/puppet/util/provider_features.rb

@@ -113,7 +113,7 @@ module Puppet::Util::ProviderFeatures
   end
 
   # Generates a module that sets up the boolean predicate methods to test for given features.
-  # 
+  #
   def feature_module
     unless defined?(@feature_module)
       @features ||= {}

data/lib/puppet/util/rdoc/parser.rb

@@ -8,18 +8,18 @@ require "rdoc/code_objects"
 require "puppet/util/rdoc/code_objects"
 require "rdoc/tokenstream"
 
-if ::RUBY_VERSION =~ /1.9/
-	require "rdoc/markup/preprocess"
-	require "rdoc/parser"
-else
+if ::RUBY_VERSION =~ /^1.8/
 	require "rdoc/markup/simple_markup/preprocess"
 	require "rdoc/parsers/parserfactory"
+else
+	require "rdoc/markup/preprocess"
+	require "rdoc/parser"
 end
 
 module RDoc
 
 class Parser
-  extend ParserFactory unless ::RUBY_VERSION =~ /1.9/
+  extend ParserFactory if ::RUBY_VERSION =~ /^1.8/
 
   SITE = "__site__"
 

data/lib/puppet/util/ssl.rb

@@ -0,0 +1,38 @@
+##
+# SSL is a private module with class methods that help work with x.509
+# subjects.
+#
+# @api private
+module Puppet::Util::SSL
+  # Given a DN string, parse it into an OpenSSL certificate subject.  This
+  # method will flexibly handle both OpenSSl and RFC2253 formats, as given by
+  # nginx and Apache, respectively.
+  #
+  # @param [String] dn the x.509 Distinguished Name (DN) string.
+  #
+  # @return [OpenSSL::X509::Name] the certificate subject
+  def self.subject_from_dn(dn)
+    # try to parse both rfc2253 (Apache) and OpenSSL (nginx) formats
+    begin
+      subject = OpenSSL::X509::Name.parse_rfc2253(dn)
+    rescue OpenSSL::X509::NameError
+      subject = OpenSSL::X509::Name.parse_openssl(dn)
+    end
+    subject
+  end
+
+  ##
+  # cn_from_subject extracts the CN from the given OpenSSL certtificate
+  # subject.
+  #
+  # @api private
+  #
+  # @param [OpenSSL::X509::Name] subject the subject to extract the CN field from
+  #
+  # @return [String, nil] the CN, or nil if not found
+  def self.cn_from_subject(subject)
+    if subject.respond_to? :to_a
+      (subject.to_a.assoc('CN') || [])[1]
+    end
+  end
+end

data/lib/puppet/util/subclass_loader.rb

@@ -18,11 +18,7 @@ module Puppet::Util::SubclassLoader
     raise ArgumentError, "Must be a class to use SubclassLoader" unless self.is_a?(Class)
     @subclasses = []
 
-          @loader = Puppet::Util::Autoload.new(
-        self,
-        
-      path, :wrap => false
-    )
+    @loader = Puppet::Util::Autoload.new(self, path, :wrap => false)
 
     @subclassname = name
 

data/lib/puppet/util/windows.rb

@@ -7,6 +7,7 @@ module Puppet::Util::Windows
     require 'puppet/util/windows/user'
     require 'puppet/util/windows/process'
     require 'puppet/util/windows/file'
+    require 'puppet/util/windows/root_certs'
   end
   require 'puppet/util/windows/registry'
 end

data/lib/puppet/util/windows/process.rb

@@ -1,4 +1,7 @@
 require 'puppet/util/windows'
+require 'windows/process'
+require 'windows/handle'
+require 'windows/synchronize'
 
 module Puppet::Util::Windows::Process
   extend ::Windows::Process

data/lib/puppet/util/windows/root_certs.rb

@@ -0,0 +1,86 @@
+require 'puppet/util/windows'
+require 'openssl'
+require 'Win32API'
+require 'windows/msvcrt/buffer'
+
+# Represents a collection of trusted root certificates.
+#
+# @api public
+class Puppet::Util::Windows::RootCerts
+  include Enumerable
+
+  CertOpenSystemStore         = Win32API.new('crypt32', 'CertOpenSystemStore', ['L','P'], 'L')
+  CertEnumCertificatesInStore = Win32API.new('crypt32', 'CertEnumCertificatesInStore', ['L', 'L'], 'L')
+  CertCloseStore              = Win32API.new('crypt32', 'CertCloseStore', ['L', 'L'], 'B')
+
+  def initialize(roots)
+    @roots = roots
+  end
+
+  # Enumerates each root certificate.
+  # @yieldparam cert [OpenSSL::X509::Certificate] each root certificate
+  # @api public
+  def each
+    @roots.each {|cert| yield cert}
+  end
+
+  class << self
+    include Windows::MSVCRT::Buffer
+  end
+
+  # Returns a new instance.
+  # @return [Puppet::Util::Windows::RootCerts] object constructed from current root certificates
+  def self.instance
+    new(self.load_certs)
+  end
+
+  # Returns an array of root certificates.
+  #
+  # @return [Array<[OpenSSL::X509::Certificate]>] an array of root certificates
+  # @api private
+  def self.load_certs
+    certs = []
+
+    # This is based on a patch submitted to openssl:
+    # http://www.mail-archive.com/openssl-dev@openssl.org/msg26958.html
+    context = 0
+    store = CertOpenSystemStore.call(0, "ROOT")
+    begin
+      while (context = CertEnumCertificatesInStore.call(store, context) and context != 0)
+        # 466 typedef struct _CERT_CONTEXT {
+        # 467     DWORD      dwCertEncodingType;
+        # 468     BYTE       *pbCertEncoded;
+        # 469     DWORD      cbCertEncoded;
+        # 470     PCERT_INFO pCertInfo;
+        # 471     HCERTSTORE hCertStore;
+        # 472 } CERT_CONTEXT, *PCERT_CONTEXT;
+
+        # buffer to hold struct above
+        ctx_buf = 0.chr * 5 * 8
+
+        # copy from win to ruby
+        memcpy(ctx_buf, context, ctx_buf.size)
+
+        # unpack structure
+        arr = ctx_buf.unpack('LLLLL')
+
+        # create buf of length cbCertEncoded
+        cert_buf = 0.chr * arr[2]
+
+        # copy pbCertEncoded from win to ruby
+        memcpy(cert_buf, arr[1], cert_buf.length)
+
+        # create a cert
+        begin
+          certs << OpenSSL::X509::Certificate.new(cert_buf)
+        rescue => detail
+          Puppet.warning("Failed to import root certificate: #{detail.inspect}")
+        end
+      end
+    ensure
+      CertCloseStore.call(store, 0)
+    end
+
+    certs
+  end
+end