puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/lib/puppet/util/psych_support.rb

@@ -7,12 +7,8 @@
 # that is given a hash with attribute to value mappings.
 #
 module Puppet::Util::PsychSupport
-  # This method is called from the Psych Yaml deserializer.
-  # The serializer calls this instead of doing the initialization itself using
-  # `instance_variable_set`. The Status class requires this because it serializes its TagSet
-  # as an `Array` in order to optimize the size of the serialized result.
-  # When this array is later deserialized it must be reincarnated as a TagSet. The standard
-  # Psych way of doing this via poking values into instance variables cannot do this.
+  # This method is called from the Psych Yaml deserializer when it encounters a tag
+  # in the form !ruby/object:<class name>.
   #
   def init_with(psych_coder)
     # The PsychCoder has a hashmap of instance variable name (sans the @ symbol) to values
@@ -28,11 +24,7 @@ module Puppet::Util::PsychSupport
   # objects we manage have asymmetrical serialization and deserialization.
   #
   def encode_with(psych_encoder)
-    tag = Psych.dump_tags[self.class]
-    unless tag
-      klass = self.class == Object ? nil : self.class.name
-      tag   = ['!ruby/object', klass].compact.join(':')
-    end
+    tag = Psych.dump_tags[self.class] || "!ruby/object:#{self.class.name}"
     psych_encoder.represent_map(tag, to_data_hash)
   end
 end

data/lib/puppet/util/rdoc.rb

@@ -41,20 +41,20 @@ module Puppet::Util::RDoc
 
   # launch an output to console manifest doc
   def manifestdoc(files)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 
   # Outputs to the console the documentation
   # of a manifest
   def output(file, ast)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 
   def output_astnode_doc(ast)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 
   def output_resource_doc(code)
-    raise "RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638"
+    raise _("RDOC SUPPORT FOR MANIFEST HAS BEEN REMOVED - See PUP-3638")
   end
 end

data/lib/puppet/util/reference.rb

@@ -12,6 +12,11 @@ class Puppet::Util::Reference
 
   instance_load(:reference, 'puppet/reference')
 
+  def self.footer
+    #TRANSLATORS message accompanied by date of generation
+    "\n\n----------------\n\n*" + _("This page autogenerated on ") + "#{Time.now}*\n"
+  end
+
   def self.modes
     %w{pdf text}
   end
@@ -27,15 +32,15 @@ class Puppet::Util::Reference
     depth = 4
     # Use the minimum depth
     sections.each do |name|
-      section = reference(name) or raise "Could not find section #{name}"
+      section = reference(name) or raise _("Could not find section %{name}") % { name: name }
       depth = section.depth if section.depth < depth
     end
   end
 
   def self.pdf(text)
-    puts "creating pdf"
+    puts _("creating pdf")
     rst2latex = which('rst2latex') || which('rst2latex.py') ||
-      raise("Could not find rst2latex")
+      raise(_("Could not find rst2latex"))
 
     cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
     Puppet::Util.replace_file("/tmp/puppetdoc.txt") {|f| f.puts text }
@@ -45,7 +50,7 @@ class Puppet::Util::Reference
     Puppet::FileSystem.unlink('/tmp/puppetdoc.tex') rescue nil
     output = %x{#{cmd}}
     unless $CHILD_STATUS == 0
-      $stderr.puts "rst2latex failed"
+      $stderr.puts _("rst2latex failed")
       $stderr.puts output
       exit(1)
     end
@@ -85,7 +90,7 @@ class Puppet::Util::Reference
     meta_def(:generate, &block)
 
     # Now handle the defaults
-    @title ||= "#{@name.to_s.capitalize} Reference"
+    @title ||= _("%{name} Reference") % { name: @name.to_s.capitalize }
     @page ||= @title.gsub(/\s+/, '')
     @depth ||= 2
     @header ||= ""
@@ -107,13 +112,15 @@ class Puppet::Util::Reference
   def to_markdown(withcontents = true)
     # First the header
     text = markdown_header(@title, 1)
-
-    text << _("\n\n**This page is autogenerated; any changes will get overwritten**\n\n")
+    #TRANSLATORS message accompanied by date of generation
+    text << _("\n\n**This page is autogenerated; any changes will get overwritten** *(last generated on ") + "#{Time.now.to_s})*\n\n"
 
     text << @header
 
     text << generate
 
+    text << self.class.footer if withcontents
+
     text
   end
 end

data/lib/puppet/util/resource_template.rb

@@ -44,7 +44,7 @@ class Puppet::Util::ResourceTemplate
   end
 
   def initialize(file, resource)
-    raise ArgumentError, "Template #{file} does not exist" unless Puppet::FileSystem.exist?(file)
+    raise ArgumentError, _("Template %{file} does not exist") % { file: file } unless Puppet::FileSystem.exist?(file)
     @file = file
     @resource = resource
   end

data/lib/puppet/util/retry_action.rb

@@ -28,10 +28,10 @@ module Puppet::Util::RetryAction
       yield
     rescue *retry_exceptions => e
       if failures >= retries
-        raise RetryException::RetriesExceeded, "#{retries} exceeded", e.backtrace
+        raise RetryException::RetriesExceeded, _("%{retries} exceeded") % { retries: retries }, e.backtrace
       end
 
-      Puppet.info("Caught exception #{e.class}:#{e} retrying")
+      Puppet.info(_("Caught exception %{klass}:%{error} retrying") % { klass: e.class, error: e })
 
       failures += 1
 

data/lib/puppet/util/selinux.rb

@@ -62,16 +62,22 @@ module Puppet::Util::SELinux
     if context.nil? or context == "unlabeled"
       return nil
     end
-    unless context =~ /^([^\s:]+):([^\s:]+):([^\s:]+)(?::([\sa-zA-Z0-9:,._-]+))?$/
-      raise Puppet::Error, "Invalid context to parse: #{context}"
+    components = /^([^\s:]+):([^\s:]+):([^\s:]+)(?::([\sa-zA-Z0-9:,._-]+))?$/.match(context)
+    unless components
+      raise Puppet::Error, _("Invalid context to parse: %{context}") % { context: context }
+    end
+    case component
+    when :seluser
+      components[1]
+    when :selrole
+      components[2]
+    when :seltype
+      components[3]
+    when :selrange
+      components[4]
+    else
+      raise Puppet::Error, _("Invalid SELinux parameter type")
     end
-    ret = {
-      :seluser => $1,
-      :selrole => $2,
-      :seltype => $3,
-      :selrange => $4,
-    }
-    ret[component]
   end
 
   # This updates the actual SELinux label on the file.  You can update
@@ -91,7 +97,7 @@ module Puppet::Util::SELinux
         # We can't set partial context components when no context exists
         # unless/until we can find a way to make Puppet call this method
         # once for all selinux file label attributes.
-        Puppet.warning "Can't set SELinux context on file unless the file already has some kind of context"
+        Puppet.warning _("Can't set SELinux context on file unless the file already has some kind of context")
         return nil
       end
       context = context.split(':')
@@ -105,7 +111,7 @@ module Puppet::Util::SELinux
         when :selrange
           context[3] = value
         else
-          raise ArgumentError, "set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange"
+          raise ArgumentError, _("set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange")
       end
       context = context.join(':')
     else
@@ -116,7 +122,7 @@ module Puppet::Util::SELinux
     if retval == 0
       return true
     else
-      Puppet.warning "Failed to set SELinux context #{context} on #{file}"
+      Puppet.warning _("Failed to set SELinux context %{context} on %{file}") % { context: context, file: file }
       return false
     end
   end
@@ -137,6 +143,42 @@ module Puppet::Util::SELinux
     nil
   end
 
+  ##
+  # selinux_category_to_label is an internal method that converts all
+  # selinux categories to their internal representation, avoiding
+  # potential issues when mcstransd is not functional.
+  #
+  # It is not marked private because it is needed by File's
+  # selcontext.rb, but it is not intended for use outside of Puppet's
+  # code.
+  #
+  # @param category [String] An selinux category, such as "s0" or "SystemLow"
+  #
+  # @return [String] the numeric category name, such as "s0"
+  def selinux_category_to_label(category)
+    # We don't cache this, but there's already a ton of duplicate work
+    # in the selinux handling code.
+
+    path = Selinux.selinux_translations_path
+    begin
+      File.open(path).each do |line|
+        line.strip!
+        next if line.empty?
+        next if line[0] == "#" # skip comments
+        line.gsub!(/[[:space:]]+/m, '')
+        mapping = line.split("=", 2)
+        if category == mapping[1]
+          return mapping[0]
+        end
+      end
+    rescue SystemCallError => ex
+      log_exception(ex)
+      raise Puppet::Error, _("Could not open SELinux category translation file %{path}.") % { context: context }
+    end
+
+    category
+  end
+
   ########################################################################
   # Internal helper methods from here on in, kids.  Don't fiddle.
   private

data/lib/puppet/util/splayer.rb

@@ -11,7 +11,7 @@ module Puppet::Util::Splayer
     return if splayed?
 
     time = rand(Puppet[:splaylimit] + 1)
-    Puppet.info "Sleeping for #{time} seconds (splay is enabled)"
+    Puppet.info _("Sleeping for %{time} seconds (splay is enabled)") % { time: time }
     sleep(time)
     @splayed = true
   end

data/lib/puppet/util/storage.rb

@@ -50,25 +50,25 @@ class Puppet::Util::Storage
       return
     end
     unless File.file?(filename)
-      Puppet.warning("Checksumfile #{filename} is not a file, ignoring")
+      Puppet.warning(_("Checksumfile %{filename} is not a file, ignoring") % { filename: filename })
       return
     end
     Puppet::Util.benchmark(:debug, "Loaded state") do
       begin
         @@state = Puppet::Util::Yaml.load_file(filename)
       rescue Puppet::Util::Yaml::YamlLoadError => detail
-        Puppet.err "Checksumfile #{filename} is corrupt (#{detail}); replacing"
+        Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
 
         begin
           File.rename(filename, filename + ".bad")
         rescue
-          raise Puppet::Error, "Could not rename corrupt #{filename}; remove manually", detail.backtrace
+          raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
         end
       end
     end
 
     unless @@state.is_a?(Hash)
-      Puppet.err "State got corrupted"
+      Puppet.err _("State got corrupted")
       self.init
     end
   end
@@ -80,7 +80,7 @@ class Puppet::Util::Storage
   def self.store
     Puppet.debug "Storing state"
 
-    Puppet.info "Creating state file #{Puppet[:statefile]}" unless Puppet::FileSystem.exist?(Puppet[:statefile])
+    Puppet.info _("Creating state file %{file}") % { file: Puppet[:statefile] } unless Puppet::FileSystem.exist?(Puppet[:statefile])
 
     Puppet::Util.benchmark(:debug, "Stored state") do
       Puppet::Util::Yaml.dump(@@state, Puppet[:statefile])

data/lib/puppet/util/suidmanager.rb

@@ -99,7 +99,7 @@ module Puppet::Util::SUIDManager
   # 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
+    raise Puppet::Error, _("No such group %{group}") % { group: group } unless gid
 
     return if Process.egid == gid
 
@@ -115,7 +115,7 @@ module Puppet::Util::SUIDManager
   # 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
+    raise Puppet::Error, _("No such user %{user}") % { user: user } unless uid
 
     return if Process.euid == uid
 
@@ -142,10 +142,10 @@ module Puppet::Util::SUIDManager
   # Make sure the passed argument is a number.
   def convert_xid(type, id)
     map = {:gid => :group, :uid => :user}
-    raise ArgumentError, "Invalid id type #{type}" unless map.include?(type)
+    raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
     ret = Puppet::Util.send(type, id)
     if ret == nil
-      raise Puppet::Error, "Invalid #{map[type]}: #{id}"
+      raise Puppet::Error, _("Invalid %{klass}: %{id}") % { klass: map[type], id: id }
     end
     ret
   end

data/lib/puppet/util/symbolic_file_mode.rb

@@ -34,14 +34,14 @@ module SymbolicFileMode
 
   def symbolic_mode_to_int(modification, to_mode = 0, is_a_directory = false)
     if modification.nil? or modification == '' then
-      raise Puppet::Error, "An empty mode string is illegal"
+      raise Puppet::Error, _("An empty mode string is illegal")
     end
     if modification =~ /^[0-7]+$/ then return modification.to_i(8) end
     if modification =~ /^\d+$/ then
-      raise Puppet::Error, "Numeric modes must be in octal, not decimal!"
+      raise Puppet::Error, _("Numeric modes must be in octal, not decimal!")
     end
 
-    fail "non-numeric current mode (#{to_mode.inspect})" unless to_mode.is_a?(Numeric)
+    fail _("non-numeric current mode (%{mode})") % { mode: to_mode.inspect } unless to_mode.is_a?(Numeric)
 
     original_mode = {
       's' => (to_mode & 07000) >> 9,
@@ -61,7 +61,7 @@ module SymbolicFileMode
     modification.split(/\s*,\s*/).each do |part|
       begin
         _, to, dsl = /^([ugoa]*)([-+=].*)$/.match(part).to_a
-        if dsl.nil? then raise Puppet::Error, 'Missing action' end
+        if dsl.nil? then raise Puppet::Error, _('Missing action') end
         to = "a" unless to and to.length > 0
 
         # We want a snapshot of the mode before we start messing with it to
@@ -76,7 +76,7 @@ module SymbolicFileMode
 
           action = '!'
           actions = {
-            '!' => lambda {|_,_| raise Puppet::Error, 'Missing operation (-, =, or +)' },
+            '!' => lambda {|_,_| raise Puppet::Error, _('Missing operation (-, =, or +)') },
             '=' => lambda {|m,v| m | v },
             '+' => lambda {|m,v| m | v },
             '-' => lambda {|m,v| m & ~v },
@@ -98,7 +98,7 @@ module SymbolicFileMode
             when 'X' then
               # Only meaningful in combination with "set" actions.
               if action != '+' then
-                raise Puppet::Error, "X only works with the '+' operator"
+                raise Puppet::Error, _("X only works with the '+' operator")
               end
 
               # As per the BSD manual page, set if this is a directory, or if
@@ -109,11 +109,11 @@ module SymbolicFileMode
               end
 
             when /[st]/ then
-              bit = SymbolicSpecialToBit[op][who] or fail "internal error"
+              bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
               final_mode['s'] = actions[action].call(final_mode['s'], bit)
 
             else
-              raise Puppet::Error, 'Unknown operation'
+              raise Puppet::Error, _('Unknown operation')
             end
           end
 
@@ -128,7 +128,7 @@ module SymbolicFileMode
           rest = ''
         end
 
-        raise Puppet::Error, "#{e}#{rest} in symbolic mode #{modification.inspect}", e.backtrace
+        raise Puppet::Error, _("%{error}%{rest} in symbolic mode %{modification}") % { error: e, rest: rest, modification: modification.inspect }, e.backtrace
       end
     end
 

data/lib/puppet/util/tag_set.rb

@@ -16,14 +16,11 @@ class Puppet::Util::TagSet < Set
     self.new(data)
   end
 
+  # TODO: A method named #to_data_hash should not return an array
   def to_data_hash
     to_a
   end
 
-  def to_pson(*args)
-    to_data_hash.to_pson
-  end
-
   def join(*args)
     to_a.join(*args)
   end

data/lib/puppet/util/tagging.rb

@@ -1,7 +1,7 @@
 require 'puppet/util/tag_set'
 
 module Puppet::Util::Tagging
-  ValidTagRegex = /\A[0-9A-Za-z_][0-9A-Za-z_:.-]*\Z/
+  ValidTagRegex = /\A[[:alnum:]_][[:alnum:]_:.-]*\Z/
 
   # Add a tag to the current tag set.
   # When a tag set is used for a scope, these tags will be added to all of
@@ -24,7 +24,7 @@ module Puppet::Util::Tagging
           end
         else
           @tags.delete(name)
-          fail(Puppet::ParseError, "Invalid tag '#{name}'")
+          fail(Puppet::ParseError, _("Invalid tag '%{name}'") % { name: name })
         end
       end
     end

data/lib/puppet/util/windows.rb

@@ -10,6 +10,7 @@ module Puppet::Util::Windows
   module SID
     class Principal; end
   end
+  class EventLog; end
 
   if Puppet::Util::Platform.windows?
     # these reference platform specific gems
@@ -29,5 +30,6 @@ module Puppet::Util::Windows
     require 'puppet/util/windows/security_descriptor'
     require 'puppet/util/windows/adsi'
     require 'puppet/util/windows/registry'
+    require 'puppet/util/windows/eventlog'
   end
 end

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

@@ -66,7 +66,7 @@ module Puppet::Util::Windows::ADSI
       return sid_uri(sid) if sid.kind_of?(Puppet::Util::Windows::SID::Principal)
 
       begin
-        sid = Puppet::Util::Windows::SID.name_to_principal(sid)
+        sid = Puppet::Util::Windows::SID.name_to_sid_object(sid)
         sid_uri(sid)
       rescue Puppet::Util::Windows::Error, Puppet::Error
         nil
@@ -114,7 +114,7 @@ module Puppet::Util::Windows::ADSI
         Puppet::Util::Windows::SID.sid_to_name('S-1-5-32').upcase,
         # localized version of NT AUTHORITY (can't use S-1-5)
         # for instance AUTORITE NT on French Windows
-        Puppet::Util::Windows::SID.name_to_principal('SYSTEM').domain.upcase
+        Puppet::Util::Windows::SID.name_to_sid_object('SYSTEM').domain.upcase
       ]
     end
 
@@ -139,12 +139,10 @@ module Puppet::Util::Windows::ADSI
       return account, domain
     end
 
-    # returns Puppet::Util::Windows::SID::Principal[]
-    # may contain objects that represent unresolvable SIDs
     def get_sids(adsi_child_collection)
       sids = []
       adsi_child_collection.each do |m|
-        sids << Puppet::Util::Windows::SID.ads_to_principal(m)
+        sids << Puppet::Util::Windows::SID.octet_string_to_sid_object(m.objectSID)
       end
 
       sids
@@ -154,7 +152,7 @@ module Puppet::Util::Windows::ADSI
       return {} if names.nil? || names.empty?
 
       sids = names.map do |name|
-        sid = Puppet::Util::Windows::SID.name_to_principal(name)
+        sid = Puppet::Util::Windows::SID.name_to_sid_object(name)
         raise Puppet::Error.new( _("Could not resolve name: %{name}") % { name: name } ) if !sid
         [sid.sid, sid]
       end
@@ -185,7 +183,7 @@ module Puppet::Util::Windows::ADSI
     end
 
     def sid
-      @sid ||= Puppet::Util::Windows::SID.octet_string_to_principal(native_user.objectSID)
+      @sid ||= Puppet::Util::Windows::SID.octet_string_to_sid_object(native_user.objectSID)
     end
 
     def uri
@@ -338,12 +336,12 @@ module Puppet::Util::Windows::ADSI
     end
 
     def self.current_user_sid
-      Puppet::Util::Windows::SID.name_to_principal(current_user_name)
+      Puppet::Util::Windows::SID.name_to_sid_object(current_user_name)
     end
 
     def self.exists?(name_or_sid)
       well_known = false
-      if (sid = Puppet::Util::Windows::SID.name_to_principal(name_or_sid))
+      if (sid = Puppet::Util::Windows::SID.name_to_sid_object(name_or_sid))
         return true if sid.account_type == :SidTypeUser
 
         # 'well known group' is special as it can be a group like Everyone OR a user like SYSTEM
@@ -433,7 +431,7 @@ module Puppet::Util::Windows::ADSI
     end
 
     def sid
-      @sid ||= Puppet::Util::Windows::SID.octet_string_to_principal(native_group.objectSID)
+      @sid ||= Puppet::Util::Windows::SID.octet_string_to_sid_object(native_group.objectSID)
     end
 
     def commit
@@ -465,13 +463,18 @@ module Puppet::Util::Windows::ADSI
       end
     end
 
-    # returns Puppet::Util::Windows::SID::Principal[]
-    # may contain objects that represent unresolvable SIDs
-    # qualified account names are returned by calling #domain_account
     def members
+      # WIN32OLE objects aren't enumerable, so no map
+      members = []
+      # Setting WIN32OLE.codepage in the microsoft_windows feature ensures
+      # values are returned as UTF-8
+      native_group.Members.each {|m| members << m.Name}
+      members
+    end
+
+    def member_sids
       self.class.get_sids(native_group.Members)
     end
-    alias member_sids members
 
     def set_members(desired_members, inclusive = true)
       return if desired_members.nil?
@@ -505,7 +508,7 @@ module Puppet::Util::Windows::ADSI
 
     def self.exists?(name_or_sid)
       well_known = false
-      if (sid = Puppet::Util::Windows::SID.name_to_principal(name_or_sid))
+      if (sid = Puppet::Util::Windows::SID.name_to_sid_object(name_or_sid))
         return true if sid.account_type == :SidTypeGroup
 
         # 'well known group' is special as it can be a group like Everyone OR a user like SYSTEM
@@ -530,7 +533,7 @@ module Puppet::Util::Windows::ADSI
     end
 
     def self.each(&block)
-      wql = Puppet::Util::Windows::ADSI.execquery( 'select name from win32_group where localaccount = "TRUE"' )
+      wql = Puppet::Util::Windows::ADSI.execquery('select name from win32_group where localaccount = "TRUE"')
 
       groups = []
       wql.each do |g|