puppet 2.6.18 → 2.7.1

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

@@ -0,0 +1,42 @@
+require 'puppet/util/network_device'
+require 'puppet/util/network_device/transport'
+require 'puppet/util/network_device/transport/base'
+require 'net/telnet'
+
+class Puppet::Util::NetworkDevice::Transport::Telnet < Puppet::Util::NetworkDevice::Transport::Base
+    def initialize
+      super
+    end
+
+    def handles_login?
+      false
+    end
+
+    def connect
+      @telnet = Net::Telnet::new("Host" => host, "Port" => port || 23,
+                                 "Timeout" => 10,
+                                 "Prompt" => default_prompt, "Output_log" => "/tmp/out.log")
+    end
+
+    def close
+      @telnet.close if @telnet
+      @telnet = nil
+    end
+
+    def expect(prompt)
+      @telnet.waitfor(prompt) do |out|
+        yield out if block_given?
+      end
+    end
+
+    def command(cmd, options = {})
+      send(cmd)
+      expect(options[:prompt] || default_prompt) do |output|
+        yield output if block_given?
+      end
+    end
+
+    def send(line)
+      @telnet.puts(line)
+    end
+end

data/lib/puppet/util/rdoc.rb

@@ -31,6 +31,7 @@ module Puppet::Util::RDoc
       options << "--force-update" if Options::OptionList.options.any? { |o| o[0] == "--force-update" }
       options += [ "--charset", charset] if charset
       options += files
+      #TODO dedup file paths (not strict duplication sense, parents, children, etc
 
       # launch the documentation process
       r.document(options)
@@ -53,17 +54,10 @@ module Puppet::Util::RDoc
   # of a manifest
   def output(file, ast)
     astobj = []
-    ast.nodes.each do |name, k|
-      astobj << k if k.file == file
+    ast.instantiate('').each do |resource_type|
+      astobj << resource_type if resource_type.file == file
     end
 
-    ast.hostclasses.each do |name,k|
-      astobj << k if k.file == file
-    end
-
-    ast.definitions.each do |name, k|
-      astobj << k if k.file == file
-    end
     astobj.sort! {|a,b| a.line <=> b.line }.each do |k|
       output_astnode_doc(k)
     end
@@ -89,4 +83,4 @@ module Puppet::Util::RDoc
     end
   end
 
-end
+end

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

@@ -7,17 +7,23 @@
 require "rdoc/code_objects"
 require "puppet/util/rdoc/code_objects"
 require "rdoc/tokenstream"
-require "rdoc/markup/simple_markup/preprocess"
-require "rdoc/parsers/parserfactory"
+
+if ::RUBY_VERSION =~ /1.9/
+	require "rdoc/markup/preprocess"
+	require "rdoc/parser"
+else
+	require "rdoc/markup/simple_markup/preprocess"
+	require "rdoc/parsers/parserfactory"
+end
 
 module RDoc
 
 class Parser
-  extend ParserFactory
+  extend ParserFactory unless ::RUBY_VERSION =~ /1.9/
 
   SITE = "__site__"
 
-  attr_accessor :ast, :input_file_name, :top_level
+  attr_accessor :input_file_name, :top_level
 
   # parser registration into RDoc
   parse_files_matching(/\.(rb|pp)$/)
@@ -33,17 +39,19 @@ class Parser
 
   # main entry point
   def scan
-    env = Puppet::Node::Environment.new
-    unless env.known_resource_types.watching_file?(@input_file_name)
+    environment = Puppet::Node::Environment.new
+    @known_resource_types = environment.known_resource_types
+    unless environment.known_resource_types.watching_file?(@input_file_name)
       Puppet.info "rdoc: scanning #{@input_file_name}"
       if @input_file_name =~ /\.pp$/
-        @parser = Puppet::Parser::Parser.new(env)
+        @parser = Puppet::Parser::Parser.new(environment)
         @parser.file = @input_file_name
-        @ast = @parser.parse
+        @parser.parse.instantiate('').each do |type|
+          @known_resource_types.add type
+        end
       end
-    else
-      @ast = env.known_resource_types
     end
+
     scan_top_level(@top_level)
     @top_level
   end
@@ -206,19 +214,21 @@ class Parser
       if stmt.is_a?(Puppet::Parser::AST::Resource) and !stmt.type.nil?
         begin
           type = stmt.type.split("::").collect { |s| s.capitalize }.join("::")
-          title = stmt.title.is_a?(Puppet::Parser::AST::ASTArray) ? stmt.title.to_s.gsub(/\[(.*)\]/,'\1') : stmt.title.to_s
-          Puppet.debug "rdoc: found resource: #{type}[#{title}]"
+          stmt.instances.each do |inst|
+            title = inst.title.is_a?(Puppet::Parser::AST::ASTArray) ? inst.title.to_s.gsub(/\[(.*)\]/,'\1') : inst.title.to_s
+            Puppet.debug "rdoc: found resource: #{type}[#{title}]"
 
-          param = []
-          stmt.parameters.children.each do |p|
-            res = {}
-            res["name"] = p.param
-            res["value"] = "#{p.value.to_s}" unless p.value.nil?
+            param = []
+            inst.parameters.children.each do |p|
+              res = {}
+              res["name"] = p.param
+              res["value"] = "#{p.value.to_s}" unless p.value.nil?
 
-            param << res
-          end
+              param << res
+            end
 
-          container.add_resource(PuppetResource.new(type, title, stmt.doc, param))
+            container.add_resource(PuppetResource.new(type, title, stmt.doc, param))
+          end
         rescue => detail
           raise Puppet::ParseError, "impossible to parse resource in #{stmt.file} at line #{stmt.line}: #{detail}"
         end
@@ -339,7 +349,8 @@ class Parser
   # that contains the documentation
   def parse_elements(container)
     Puppet.debug "rdoc: scanning manifest"
-    @ast.hostclasses.values.sort { |a,b| a.name <=> b.name }.each do |klass|
+
+    @known_resource_types.hostclasses.values.sort { |a,b| a.name <=> b.name }.each do |klass|
       name = klass.name
       if klass.file == @input_file_name
         unless name.empty?
@@ -352,13 +363,13 @@ class Parser
       end
     end
 
-    @ast.definitions.each do |name, define|
+    @known_resource_types.definitions.each do |name, define|
       if define.file == @input_file_name
         document_define(name,define,container)
       end
     end
 
-    @ast.nodes.each do |name, node|
+    @known_resource_types.nodes.each do |name, node|
       if node.file == @input_file_name
         document_node(name.to_s,node,container)
       end

data/lib/puppet/util/reference.rb

@@ -36,15 +36,14 @@ class Puppet::Util::Reference
 
   def self.pdf(text)
     puts "creating pdf"
-    rst2latex = which('rst2latex') || which('rst2latex.py') ||
-      raise("Could not find rst2latex")
-
+    Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
+      f.puts text
+    end
+    rst2latex = which('rst2latex') || which('rst2latex.py') || raise("Could not find rst2latex")
     cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
-    Puppet::Util.replace_file("/tmp/puppetdoc.txt") {|f| f.puts text }
-    # There used to be an attempt to use secure_open / replace_file to secure
-    # the target, too, but that did nothing: the race was still here.  We can
-    # get exactly the same benefit from running this effort:
-    File.unlink('/tmp/puppetdoc.tex') rescue nil
+    Puppet::Util.secure_open("/tmp/puppetdoc.tex","w") do |f|
+      # If we get here without an error, /tmp/puppetdoc.tex isn't a tricky cracker's symlink
+    end
     output = %x{#{cmd}}
     unless $CHILD_STATUS == 0
       $stderr.puts "rst2latex failed"

data/lib/puppet/util/selinux.rb

@@ -1,4 +1,4 @@
-# Provides utility functions to help interfaces Puppet to SELinux.
+# Provides utility functions to help interface Puppet to SELinux.
 #
 # This requires the very new SELinux Ruby bindings.  These bindings closely
 # mirror the SELinux C library interface.
@@ -140,7 +140,7 @@ module Puppet::Util::SELinux
   def read_mounts
     mounts = ""
     begin
-      if File.instance_methods.include? "read_nonblock"
+      if File.method_defined? "read_nonblock"
         # If possible we use read_nonblock in a loop rather than read to work-
         # a linux kernel bug.  See ticket #1963 for details.
         mountfh = File.open("/proc/mounts")

data/lib/puppet/util/settings.rb

@@ -495,11 +495,6 @@ class Puppet::Util::Settings
     end
     type = legacy_to_mode(type, param)
     @sync.synchronize do # yay, thread-safe
-      # Allow later inspection to determine if the setting was set on the
-      # command line, or through some other code path.  Used for the
-      # `dns_alt_names` option during cert generate. --daniel 2011-10-18
-      setting.setbycli = true if type == :cli
-
       @values[type][param] = value
       @cache.clear
 
@@ -726,7 +721,7 @@ if @config.include?(:run_mode)
     end
 
     Puppet::Util::SUIDManager.asuser(*chown) do
-      mode = obj.mode ? obj.mode.to_i : 0640
+      mode = obj.mode || 0640
       args << "w" if args.empty?
 
       args << mode

data/lib/puppet/util/settings/file_setting.rb

@@ -101,7 +101,6 @@ class Puppet::Util::Settings::FileSetting < Puppet::Util::Settings::Setting
 
     resource[:ensure] = type
     resource[:loglevel] = :debug
-    resource[:links] = :follow
     resource[:backup] = false
 
     resource.tag(self.section, self.name, "settings")

data/lib/puppet/util/suidmanager.rb

@@ -1,6 +1,5 @@
 require 'puppet/util/warnings'
 require 'forwardable'
-require 'etc'
 
 module Puppet::Util::SUIDManager
   include Puppet::Util::Warnings
@@ -37,92 +36,37 @@ module Puppet::Util::SUIDManager
   end
   module_function :groups=
 
+  if Facter['kernel'].value == 'Darwin'
+    # Cannot change real UID on Darwin so we set euid
+    alias :uid :euid
+    alias :gid :egid
+  end
+
   def self.root?
     Process.uid == 0
   end
 
-  # Methods to handle changing uid/gid of the running process. In general,
-  # these will noop or fail on Windows, and require root to change to anything
-  # but the current uid/gid (which is a noop).
-
-  # Runs block setting euid and egid if provided then restoring original ids.
-  # If running on Windows or without root, the block will be run with the
-  # current euid/egid.
+  # Runs block setting uid and gid if provided then restoring original ids
   def asuser(new_uid=nil, new_gid=nil)
-    return yield if Puppet.features.microsoft_windows?
-    return yield unless root?
-    return yield unless new_uid or new_gid
+    return yield if Puppet.features.microsoft_windows? or !root?
 
+    # We set both because some programs like to drop privs, i.e. bash.
+    old_uid, old_gid = self.uid, self.gid
     old_euid, old_egid = self.euid, self.egid
+    old_groups = self.groups
     begin
-      change_privileges(new_uid, new_gid, false)
+      self.egid = convert_xid :gid, new_gid if new_gid
+      self.initgroups(convert_xid(:uid, new_uid)) if new_uid
+      self.euid = convert_xid :uid, new_uid if new_uid
 
       yield
     ensure
-      change_privileges(new_uid ? old_euid : nil, old_egid, false)
+      self.euid, self.egid = old_euid, old_egid
+      self.groups = old_groups
     end
   end
   module_function :asuser
 
-  # If `permanently` is set, will permanently change the uid/gid of the
-  # process. If not, it will only set the euid/egid. If only uid is supplied,
-  # the primary group of the supplied gid will be used. If only gid is
-  # supplied, only gid will be changed. This method will fail if used on
-  # Windows.
-  def change_privileges(uid=nil, gid=nil, permanently=false)
-    return unless uid or gid
-
-    unless gid
-      uid = convert_xid(:uid, uid)
-      gid = Etc.getpwuid(uid).gid
-    end
-
-    change_group(gid, permanently)
-    change_user(uid, permanently) if uid
-  end
-  module_function :change_privileges
-
-  # Changes the egid of the process if `permanently` is not set, otherwise
-  # changes gid. This method will fail if used on Windows, or attempting to
-  # change to a different gid without root.
-  def change_group(group, permanently=false)
-    gid = convert_xid(:gid, group)
-    raise Puppet::Error, "No such group #{group}" unless gid
-
-    if permanently
-      Process::GID.change_privilege(gid)
-    else
-      Process.egid = gid
-    end
-  end
-  module_function :change_group
-
-  # As change_group, but operates on uids. If changing user permanently,
-  # supplementary groups will be set the to default groups for the new uid.
-  def change_user(user, permanently=false)
-    uid = convert_xid(:uid, user)
-    raise Puppet::Error, "No such user #{user}" unless uid
-
-    if permanently
-      # If changing uid, we must be root. So initgroups first here.
-      initgroups(uid)
-
-      Process::UID.change_privilege(uid)
-    else
-      # We must be root to initgroups, so initgroups before dropping euid if
-      # we're root, otherwise elevate euid before initgroups.
-      # change euid (to root) first.
-      if Process.euid == 0
-        initgroups(uid)
-        Process.euid = uid
-      else
-        Process.euid = uid
-        initgroups(uid)
-      end
-    end
-  end
-  module_function :change_user
-
   # Make sure the passed argument is a number.
   def convert_xid(type, id)
     map = {:gid => :group, :uid => :user}
@@ -135,13 +79,10 @@ module Puppet::Util::SUIDManager
   end
   module_function :convert_xid
 
-  # Initialize primary and supplemental groups to those of the target user.  We
-  # take the UID and manually look up their details in the system database,
-  # including username and primary group. This method will fail on Windows, or
-  # if used without root to initgroups of another user.
-  def initgroups(uid)
-    pwent = Etc.getpwuid(uid)
-    Process.initgroups(pwent.name, pwent.gid)
+  # Initialize supplementary groups
+  def initgroups(user)
+    require 'etc'
+    Process.initgroups(Etc.getpwuid(user).name, Process.gid)
   end
 
   module_function :initgroups
@@ -151,5 +92,15 @@ module Puppet::Util::SUIDManager
     [output, $CHILD_STATUS.dup]
   end
   module_function :run_and_capture
+
+  def system(command, new_uid=nil, new_gid=nil)
+    status = nil
+    asuser(new_uid, new_gid) do
+      Kernel.system(command)
+      status = $CHILD_STATUS.dup
+    end
+    status
+  end
+  module_function :system
 end
 

data/lib/puppet/util/zaml.rb

@@ -20,7 +20,6 @@ class ZAML
   def self.dump(stuff, where='')
     z = new
     stuff.to_zaml(z)
-    Label.counter_reset
     where << z.to_s
   end
   #
@@ -30,7 +29,8 @@ class ZAML
     @result = []
     @indent = nil
     @structured_key_prefix = nil
-    Label.counter_reset
+    @previously_emitted_object = {}
+    @next_free_label_number = 0
     emit('--- ')
   end
   def nested(tail='  ')
@@ -56,31 +56,30 @@ class ZAML
     #    which we will encounter a reference to the object as we serialize
     #    it can be handled).
     #
-    def self.counter_reset
-      @@previously_emitted_object = {}
-      @@next_free_label_number = 0
-    end
-    def initialize(obj)
+    attr_accessor :this_label_number
+    def initialize(obj,indent)
+      @indent = indent
       @this_label_number = nil
       @obj = obj # prevent garbage collection so that object id isn't reused
-      @@previously_emitted_object[obj.object_id] = self
     end
     def to_s
-      @this_label_number ? ('&id%03d ' % @this_label_number) : ''
+      @this_label_number ? ('&id%03d%s' % [@this_label_number, @indent]) : ''
     end
     def reference
-      @this_label_number ||= (@@next_free_label_number += 1)
       @reference         ||= '*id%03d' % @this_label_number
     end
-    def self.for(obj)
-      @@previously_emitted_object[obj.object_id]
-    end
+  end
+  def label_for(obj)
+    @previously_emitted_object[obj.object_id]
   end
   def new_label_for(obj)
-    Label.new(obj)
+    label = Label.new(obj,(Hash === obj || Array === obj) ? "#{@indent || "\n"}  " : ' ')
+    @previously_emitted_object[obj.object_id] = label
+    label
   end
   def first_time_only(obj)
-    if label = Label.for(obj)
+    if label = label_for(obj)
+      label.this_label_number ||= (@next_free_label_number += 1)
       emit(label.reference)
     else
       if @structured_key_prefix and not obj.is_a? String
@@ -93,7 +92,7 @@ class ZAML
   end
   def emit(s)
     @result << s
-    @recent_nl = false
+    @recent_nl = false unless s.kind_of?(Label)
   end
   def nl(s='')
     emit(@indent || "\n") unless @recent_nl
@@ -225,30 +224,32 @@ class String
     gsub( /([\x80-\xFF])/ ) { |x| "\\x#{x.unpack("C")[0].to_s(16)}" }
   end
   def to_zaml(z)
-    num = '[-+]?(0x)?\d+\.?\d*'
-    case
-      when self == ''
-        z.emit('""')
-      # when self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/
-      #   z.emit("!binary |\n")
-      #   z.emit([self].pack("m*"))
-      when (
-        (self =~ /\A(true|false|yes|no|on|null|off|#{num}(:#{num})*|!|=|~)$/i) or
-        (self =~ /\A\n* /) or
-        (self =~ /[\s:]$/) or
-        (self =~ /^[>|][-+\d]*\s/i) or
-        (self[-1..-1] =~ /\s/) or
-        (self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/) or
-        (self =~ /[,\[\]\{\}\r\t]|:\s|\s#/) or
-        (self =~ /\A([-:?!#&*'"]|<<|%.+:.)/)
-        )
-        z.emit("\"#{escaped_for_zaml}\"")
-      when self =~ /\n/
-        if self[-1..-1] == "\n" then z.emit('|+') else z.emit('|-') end
-        z.nested { split("\n",-1).each { |line| z.nl; z.emit(line.chomp("\n")) } }
-      else
-        z.emit(self)
-    end
+    z.first_time_only(self) {
+      num = '[-+]?(0x)?\d+\.?\d*'
+      case
+        when self == ''
+          z.emit('""')
+        # when self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/
+        #   z.emit("!binary |\n")
+        #   z.emit([self].pack("m*"))
+        when (
+          (self =~ /\A(true|false|yes|no|on|null|off|#{num}(:#{num})*|!|=|~)$/i) or
+          (self =~ /\A\n* /) or
+          (self =~ /[\s:]$/) or
+          (self =~ /^[>|][-+\d]*\s/i) or
+          (self[-1..-1] =~ /\s/) or
+          (self =~ /[\x00-\x08\x0B\x0C\x0E-\x1F\x80-\xFF]/) or
+          (self =~ /[,\[\]\{\}\r\t]|:\s|\s#/) or
+          (self =~ /\A([-:?!#&*'"]|<<|%.+:.)/)
+          )
+          z.emit("\"#{escaped_for_zaml}\"")
+        when self =~ /\n/
+          if self[-1..-1] == "\n" then z.emit('|+') else z.emit('|-') end
+          z.nested { split("\n",-1).each { |line| z.nl; z.emit(line.chomp("\n")) } }
+        else
+          z.emit(self)
+      end
+    }
   end
 end