puppet 0.24.9 → 0.25.0

data/lib/puppet/indirector/certificate/ca.rb

@@ -0,0 +1,9 @@
+require 'puppet/indirector/ssl_file'
+require 'puppet/ssl/certificate'
+
+class Puppet::SSL::Certificate::Ca < Puppet::Indirector::SslFile
+    desc "Manage the CA collection of signed SSL certificates on disk."
+
+    store_in :signeddir
+    store_ca_at :cacert
+end

data/lib/puppet/indirector/certificate/file.rb

@@ -0,0 +1,9 @@
+require 'puppet/indirector/ssl_file'
+require 'puppet/ssl/certificate'
+
+class Puppet::SSL::Certificate::File < Puppet::Indirector::SslFile
+    desc "Manage SSL certificates on disk."
+
+    store_in :certdir
+    store_ca_at :localcacert
+end

data/lib/puppet/indirector/certificate/rest.rb

@@ -0,0 +1,9 @@
+require 'puppet/ssl/certificate'
+require 'puppet/indirector/rest'
+
+class Puppet::SSL::Certificate::Rest < Puppet::Indirector::REST
+    desc "Find and save certificates over HTTP via REST."
+
+    use_server_setting(:ca_server)
+    use_port_setting(:ca_port)
+end

data/lib/puppet/indirector/certificate_request/ca.rb

@@ -0,0 +1,14 @@
+require 'puppet/indirector/ssl_file'
+require 'puppet/ssl/certificate_request'
+
+class Puppet::SSL::CertificateRequest::Ca < Puppet::Indirector::SslFile
+    desc "Manage the CA collection of certificate requests on disk."
+
+    store_in :csrdir
+
+    def save(request)
+        result = super
+        Puppet.notice "%s has a waiting certificate request" % request.key
+        result
+    end
+end

data/lib/puppet/indirector/certificate_request/file.rb

@@ -0,0 +1,8 @@
+require 'puppet/indirector/ssl_file'
+require 'puppet/ssl/certificate_request'
+
+class Puppet::SSL::CertificateRequest::File < Puppet::Indirector::SslFile
+    desc "Manage the collection of certificate requests on disk."
+
+    store_in :requestdir
+end

data/lib/puppet/indirector/certificate_request/rest.rb

@@ -0,0 +1,9 @@
+require 'puppet/ssl/certificate_request'
+require 'puppet/indirector/rest'
+
+class Puppet::SSL::CertificateRequest::Rest < Puppet::Indirector::REST
+    desc "Find and save certificate requests over HTTP via REST."
+
+    use_server_setting(:ca_server)
+    use_port_setting(:ca_port)
+end

data/lib/puppet/indirector/certificate_revocation_list/ca.rb

@@ -0,0 +1,8 @@
+require 'puppet/indirector/ssl_file'
+require 'puppet/ssl/certificate_revocation_list'
+
+class Puppet::SSL::CertificateRevocationList::Ca < Puppet::Indirector::SslFile
+    desc "Manage the CA collection of certificate requests on disk."
+
+    store_at :cacrl
+end

data/lib/puppet/indirector/certificate_revocation_list/file.rb

@@ -0,0 +1,8 @@
+require 'puppet/indirector/ssl_file'
+require 'puppet/ssl/certificate_revocation_list'
+
+class Puppet::SSL::CertificateRevocationList::File < Puppet::Indirector::SslFile
+    desc "Manage the global certificate revocation list."
+
+    store_at :hostcrl
+end

data/lib/puppet/indirector/certificate_revocation_list/rest.rb

@@ -0,0 +1,9 @@
+require 'puppet/ssl/certificate_revocation_list'
+require 'puppet/indirector/rest'
+
+class Puppet::SSL::CertificateRevocationList::Rest < Puppet::Indirector::REST
+    desc "Find and save certificate revocation lists over HTTP via REST."
+
+    use_server_setting(:ca_server)
+    use_port_setting(:ca_port)
+end

data/lib/puppet/indirector/direct_file_server.rb

@@ -3,25 +3,21 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppet/file_serving/terminus_helper'
-require 'puppet/util/uri_helper'
 require 'puppet/indirector/terminus'
 
 class Puppet::Indirector::DirectFileServer < Puppet::Indirector::Terminus
 
-    include Puppet::Util::URIHelper
     include Puppet::FileServing::TerminusHelper
 
     def find(request)
-        uri = key2uri(request.key)
-        return nil unless FileTest.exists?(uri.path)
-        instance = model.new(request.key, :path => uri.path)
+        return nil unless FileTest.exists?(request.key)
+        instance = model.new(request.key)
         instance.links = request.options[:links] if request.options[:links]
         return instance
     end
 
     def search(request)
-        uri = key2uri(request.key)
-        return nil unless FileTest.exists?(uri.path)
-        path2instances(request, uri.path)
+        return nil unless FileTest.exists?(request.key)
+        path2instances(request, request.key)
     end
 end

data/lib/puppet/indirector/exec.rb

@@ -39,14 +39,10 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
         begin
             output = execute(external_command)
         rescue Puppet::ExecutionFailure => detail
-            if $?.exitstatus == 1
-                return nil
-            else
-                Puppet.err "Could not retrieve external node information for %s: %s" % [name, detail]
-            end
+            Puppet.err "Failed to find %s via exec: %s" % [name, detail]
             return nil
         end
-        
+
         if output =~ /\A\s*\Z/ # all whitespace
             Puppet.debug "Empty response for %s from exec %s terminus" % [name, self.name]
             return nil

data/lib/puppet/indirector/facts/active_record.rb

@@ -0,0 +1,36 @@
+require 'puppet/rails/fact_name'
+require 'puppet/rails/fact_value'
+require 'puppet/rails/host'
+require 'puppet/indirector/active_record'
+
+class Puppet::Node::Facts::ActiveRecord < Puppet::Indirector::ActiveRecord
+    use_ar_model Puppet::Rails::Host
+
+    # Find the Rails host and pull its facts as a Facts instance.
+    def find(request)
+        return nil unless host = ar_model.find_by_name(request.key, :include => {:fact_values => :fact_name})
+
+        facts = Puppet::Node::Facts.new(host.name)
+        facts.values = host.get_facts_hash.inject({}) do |hash, ary|
+            # Convert all single-member arrays into plain values.
+            param = ary[0]
+            values = ary[1].collect { |v| v.value }
+            values = values[0] if values.length == 1
+            hash[param] = values
+            hash
+        end
+
+        facts
+    end
+
+    # Save the values from a Facts instance as the facts on a Rails Host instance.
+    def save(request)
+        facts = request.instance
+
+        host = ar_model.find_by_name(facts.name) || ar_model.create(:name => facts.name)
+
+        host.merge_facts(facts.values)
+
+        host.save
+    end
+end

data/lib/puppet/indirector/facts/facter.rb

@@ -6,44 +6,46 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
         between Puppet and Facter.  It's only `somewhat` abstract because it always
         returns the local host's facts, regardless of what you attempt to find."
 
-    def self.loaddir(dir, type)
-        return unless FileTest.directory?(dir)
-
-        Dir.entries(dir).find_all { |e| e =~ /\.rb$/ }.each do |file|
-            fqfile = ::File.join(dir, file)
-            begin
-                Puppet.info "Loading %s %s" % 
-                    [type, ::File.basename(file.sub(".rb",''))]
-                Timeout::timeout(self.timeout) do
-                    load fqfile
-                end
-            rescue => detail
-                Puppet.warning "Could not load %s %s: %s" % [type, fqfile, detail]
-            end
-        end
-    end
 
-    def self.loadfacts
+    def self.load_fact_plugins
         # Add any per-module fact directories to the factpath
         module_fact_dirs = Puppet[:modulepath].split(":").collect do |d|
             Dir.glob("%s/*/plugins/facter" % d)
         end.flatten
         dirs = module_fact_dirs + Puppet[:factpath].split(":")
         x = dirs.each do |dir|
-            loaddir(dir, "fact")
+            load_facts_in_dir(dir)
+        end
+    end
+
+    def self.load_facts_in_dir(dir)
+        return unless FileTest.directory?(dir)
+
+        Dir.chdir(dir) do
+            Dir.glob("*.rb").each do |file|
+                fqfile = ::File.join(dir, file)
+                begin
+                    Puppet.info "Loading facts in %s" % [::File.basename(file.sub(".rb",''))]
+                    Timeout::timeout(self.timeout) do
+                        load file
+                    end
+                rescue => detail
+                    Puppet.warning "Could not load fact file %s: %s" % [fqfile, detail]
+                end
+            end
         end
     end
 
     def self.timeout
         timeout = Puppet[:configtimeout]
         case timeout
-        when String:
+        when String
             if timeout =~ /^\d+$/
                 timeout = Integer(timeout)
             else
                 raise ArgumentError, "Configuration timeout must be an integer"
             end
-        when Integer: # nothing
+        when Integer # nothing
         else
             raise ArgumentError, "Configuration timeout must be an integer"
         end
@@ -53,7 +55,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
 
     def initialize(*args)
         super
-        self.class.loadfacts
+        self.class.load_fact_plugins
     end
 
     def destroy(facts)
@@ -62,7 +64,13 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
 
     # Look a host's facts up in Facter.
     def find(request)
-        Puppet::Node::Facts.new(request.key, Facter.to_hash)
+        result = Puppet::Node::Facts.new(request.key, Facter.to_hash)
+
+        result.add_local_facts
+        result.stringify
+        result.downcase_if_necessary
+
+        result
     end
 
     def save(facts)

data/lib/puppet/indirector/facts/rest.rb

@@ -0,0 +1,6 @@
+require 'puppet/node/facts'
+require 'puppet/indirector/rest'
+
+class Puppet::Node::Facts::Rest < Puppet::Indirector::REST
+    desc "Find and save facts about nodes over HTTP via REST."
+end

data/lib/puppet/indirector/file.rb

@@ -11,6 +11,7 @@ class Puppet::Indirector::File < Puppet::Indirector::Terminus
         end
         raise Puppet::Error.new("File %s does not exist; cannot destroy" % [request.key]) unless File.exist?(path)
 
+        Puppet.notice "Removing file %s %s at '%s'" % [model, request.key, path]
         begin
             File.unlink(path)
         rescue => detail

data/lib/puppet/indirector/file_content/rest.rb

@@ -3,7 +3,6 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppet/file_serving/content'
-require 'puppet/util/uri_helper'
 require 'puppet/indirector/file_content'
 require 'puppet/indirector/rest'
 

data/lib/puppet/indirector/file_metadata/file.rb

@@ -11,7 +11,7 @@ class Puppet::Indirector::FileMetadata::File < Puppet::Indirector::DirectFileSer
 
     def find(request)
         return unless data = super
-        data.collect_attributes
+        data.collect
 
         return data
     end
@@ -19,7 +19,7 @@ class Puppet::Indirector::FileMetadata::File < Puppet::Indirector::DirectFileSer
     def search(request)
         return unless result = super
 
-        result.each { |instance| instance.collect_attributes }
+        result.each { |instance| instance.collect }
 
         return result
     end

data/lib/puppet/indirector/file_metadata/rest.rb

@@ -3,7 +3,6 @@
 #  Copyright (c) 2007. All rights reserved.
 
 require 'puppet/file_serving/metadata'
-require 'puppet/util/uri_helper'
 require 'puppet/indirector/file_metadata'
 require 'puppet/indirector/rest'
 

data/lib/puppet/indirector/file_server.rb

@@ -2,7 +2,6 @@
 #  Created by Luke Kanies on 2007-10-19.
 #  Copyright (c) 2007. All rights reserved.
 
-require 'puppet/util/uri_helper'
 require 'puppet/file_serving/configuration'
 require 'puppet/file_serving/fileset'
 require 'puppet/file_serving/terminus_helper'
@@ -10,32 +9,55 @@ require 'puppet/indirector/terminus'
 
 # Look files up using the file server.
 class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
-    include Puppet::Util::URIHelper
     include Puppet::FileServing::TerminusHelper
 
     # Is the client authorized to perform this action?
     def authorized?(request)
         return false unless [:find, :search].include?(request.method)
 
-        uri = key2uri(request.key)
+        mount, file_path = configuration.split_path(request)
 
-        configuration.authorized?(uri.path, :node => request.node, :ipaddress => request.ip)
+        # If we're not serving this mount, then access is denied.
+        return false unless mount
+        return mount.allowed?(request.node, request.ip)
     end
 
     # Find our key using the fileserver.
     def find(request)
-        return nil unless path = find_path(request)
-        result =  model.new(request.key, :path => path)
+        mount, relative_path = configuration.split_path(request)
+
+        return nil unless mount
+
+        # The mount checks to see if the file exists, and returns nil
+        # if not.
+        return nil unless path = mount.find(relative_path, request)
+        result = model.new(path)
         result.links = request.options[:links] if request.options[:links]
-        return result
+        result.collect
+        result
     end
 
     # Search for files.  This returns an array rather than a single
     # file.
     def search(request)
-        return nil unless path = find_path(request)
+        mount, relative_path = configuration.split_path(request)
+
+        unless mount and paths = mount.search(relative_path, request)
+            Puppet.info "Could not find filesystem info for file '%s' in environment %s" % [request.key, request.environment]
+            return nil
+        end
+
+        filesets = paths.collect do |path|
+            # Filesets support indirector requests as an options collection
+            Puppet::FileServing::Fileset.new(path, request)
+        end
 
-        path2instances(request, path)
+        Puppet::FileServing::Fileset.merge(*filesets).collect do |file, base_path|
+            inst = model.new(base_path, :relative_path => file)
+            inst.links = request.options[:links] if request.options[:links]
+            inst.collect
+            inst
+        end
     end
 
     private
@@ -44,13 +66,4 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
     def configuration
         Puppet::FileServing::Configuration.create
     end
-
-    # Find our path; used by :find and :search.
-    def find_path(request)
-        uri = key2uri(request.key)
-
-        return nil unless path = configuration.file_path(uri.path, :node => request.node)
-
-        return path
-    end
 end

data/lib/puppet/indirector/indirection.rb

@@ -1,20 +1,17 @@
 require 'puppet/util/docs'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
+require 'puppet/util/cacher'
 
 # The class that connects functional classes with their different collection
 # back-ends.  Each indirection has a set of associated terminus classes,
 # each of which is a subclass of Puppet::Indirector::Terminus.
 class Puppet::Indirector::Indirection
+    include Puppet::Util::Cacher
     include Puppet::Util::Docs
 
     @@indirections = []
 
-    # Clear all cached termini from all indirections.
-    def self.clear_cache
-        @@indirections.each { |ind| ind.clear_cache }
-    end
-
     # Find an indirection by name.  This is provided so that Terminus classes
     # can specifically hook up with the indirections they are associated with.
     def self.instance(name)
@@ -26,14 +23,14 @@ class Puppet::Indirector::Indirection
     def self.instances
         @@indirections.collect { |i| i.name }
     end
-    
+
     # Find an indirected model by name.  This is provided so that Terminus classes
     # can specifically hook up with the indirections they are associated with.
     def self.model(name)
         return nil unless match = @@indirections.find { |i| i.name == name }
         match.model
     end
-    
+
     attr_accessor :name, :model
 
     # Create and return our cache terminus.
@@ -50,17 +47,10 @@ class Puppet::Indirector::Indirection
     attr_reader :cache_class
     # Define a terminus class to be used for caching.
     def cache_class=(class_name)
-        validate_terminus_class(class_name)
+        validate_terminus_class(class_name) if class_name
         @cache_class = class_name
     end
 
-    # Clear our cached list of termini, and reset the cache name
-    # so it's looked up again.
-    # This is only used for testing.
-    def clear_cache
-        @termini.clear
-    end
-
     # This is only used for testing.
     def delete
         @@indirections.delete(self) if @@indirections.include?(self)
@@ -104,7 +94,6 @@ class Puppet::Indirector::Indirection
         @model = model
         @name = name
 
-        @termini = {}
         @cache_class = nil
         @terminus_class = nil
 
@@ -137,8 +126,8 @@ class Puppet::Indirector::Indirection
         unless terminus_name ||= terminus_class
             raise Puppet::DevError, "No terminus specified for %s; cannot redirect" % self.name
         end
-        
-        return @termini[terminus_name] ||= make_terminus(terminus_name)
+
+        return termini[terminus_name] ||= make_terminus(terminus_name)
     end
 
     # This can be used to select the terminus class.
@@ -196,30 +185,41 @@ class Puppet::Indirector::Indirection
         request = request(:find, key, *args)
         terminus = prepare(request)
 
-        # See if our instance is in the cache and up to date.
-        if cache? and cached = cache.find(request)
-            if cached.expired?
-                Puppet.info "Not using expired %s for %s from cache; expired at %s" % [self.name, request.key, cached.expiration]
-            else
-                Puppet.debug "Using cached %s for %s" % [self.name, request.key]
-                return cached
+        begin
+            if result = find_in_cache(request)
+                return result
             end
+        rescue => detail
+            puts detail.backtrace if Puppet[:trace]
+            Puppet.err "Cached %s for %s failed: %s" % [self.name, request.key, detail]
         end
 
         # Otherwise, return the result from the terminus, caching if appropriate.
-        if result = terminus.find(request)
+        if ! request.ignore_terminus? and result = terminus.find(request)
             result.expiration ||= self.expiration
-            if cache?
+            if cache? and request.use_cache?
                 Puppet.info "Caching %s for %s" % [self.name, request.key]
                 cache.save request(:save, result, *args)
             end
 
-            return result
+            return terminus.respond_to?(:filter) ? terminus.filter(result) : result
         end
 
         return nil
     end
 
+    def find_in_cache(request)
+        # See if our instance is in the cache and up to date.
+        return nil unless cache? and ! request.ignore_cache? and cached = cache.find(request)
+        if cached.expired?
+            Puppet.info "Not using expired %s for %s from cache; expired at %s" % [self.name, request.key, cached.expiration]
+            return nil
+        end
+
+        Puppet.debug "Using cached %s for %s" % [self.name, request.key]
+        return cached
+    end
+
     # Remove something via the terminus.
     def destroy(key, *args)
         request = request(:destroy, key, *args)
@@ -255,9 +255,12 @@ class Puppet::Indirector::Indirection
         request = request(:save, instance, *args)
         terminus = prepare(request)
 
+        result = terminus.save(request)
+
         # If caching is enabled, save our document there
         cache.save(request) if cache?
-        terminus.save(request)
+
+        result
     end
 
     private
@@ -273,7 +276,11 @@ class Puppet::Indirector::Indirection
         return unless terminus.respond_to?(:authorized?)
 
         unless terminus.authorized?(request)
-            raise ArgumentError, "Not authorized to call %s on %s with %s" % [request.method, request.key, request.options.inspect]
+            msg = "Not authorized to call %s on %s" % [request.method, request.to_s]
+            unless request.options.empty?
+                msg += " with %s" % request.options.inspect
+            end
+            raise ArgumentError, msg
         end
     end
 
@@ -281,14 +288,17 @@ class Puppet::Indirector::Indirection
     def prepare(request)
         # Pick our terminus.
         if respond_to?(:select_terminus)
-            terminus_name = select_terminus(request)
+            unless terminus_name = select_terminus(request)
+                raise ArgumentError, "Could not determine appropriate terminus for %s" % request
+            end
         else
             terminus_name = terminus_class
         end
 
-        check_authorization(request, terminus(terminus_name))
+        dest_terminus = terminus(terminus_name)
+        check_authorization(request, dest_terminus)
 
-        return terminus(terminus_name)
+        return dest_terminus
     end
 
     # Create a new terminus instance.
@@ -299,4 +309,7 @@ class Puppet::Indirector::Indirection
         end
         return klass.new
     end
+
+    # Cache our terminus instances indefinitely, but make it easy to clean them up.
+    cached_attr(:termini) { Hash.new }
 end