puppet 0.22.4 → 0.23.0

data/lib/puppet/metatype/providers.rb

@@ -61,15 +61,12 @@ class Puppet::Type
             # we've set up our naming stuff correctly everywhere.
 
             # Mark found objects as present
-            obj.is = [:ensure, :present]
             hash.each { |param, value|
                 if property = obj.property(param)
-                    property.is = value
                 elsif val = obj[param]
                     obj[param] = val
                 else
                     # There is a value on disk, but it should go away
-                    obj.is = [param, value]
                     obj[param] = :absent
                 end
             }
@@ -82,33 +79,13 @@ class Puppet::Type
             # because it sets the should value, not the is value.
             hash.delete(namevar)
             hash.each { |param, value|
-                obj.is = [param, value]
+                obj[param] = value unless obj.add_property_parameter(param)
             }
         end
 
         return obj
     end
 
-    # Create a list method that just calls our providers.
-    def self.mkprovider_list
-        unless respond_to?(:list)
-            meta_def(:list) do
-                suitableprovider.find_all { |p| p.respond_to?(:list) }.collect { |prov|
-                    prov.list.each { |h| h[:provider] = prov.name }
-                }.flatten.collect do |hash|
-                    if hash.is_a?(Hash)
-                        hash2obj(hash)
-                    elsif hash.is_a?(self)
-                        hash
-                    else
-                        raise Puppet::DevError, "Provider %s returned object of type %s in list" %
-                            [prov.name, hash.class]
-                    end
-                end
-            end
-        end
-    end
-
     # Retrieve a provider by name.
     def self.provider(name)
         name = Puppet::Util.symbolize(name)
@@ -153,7 +130,7 @@ class Puppet::Type
             Puppet::Type::Provider
         end
 
-        options[:model] ||= self
+        options[:resource_type] ||= self
 
         self.providify
 
@@ -174,9 +151,7 @@ class Puppet::Type
     # are providers.
     def self.providify
         return if @paramhash.has_key? :provider
-        model = self
 
-        mkprovider_list()
         newparam(:provider) do
             desc "The specific backend for #{self.name.to_s} to use. You will
                 seldom need to specify this -- Puppet will usually discover the
@@ -198,20 +173,24 @@ class Puppet::Type
             end
 
             defaultto {
-                @parent.class.defaultprovider.name
+                @resource.class.defaultprovider.name
             }
 
-            validate do |value|
-                value = value[0] if value.is_a? Array
-                if provider = @parent.class.provider(value)
+            validate do |provider_class|
+                provider_class = provider_class[0] if provider_class.is_a? Array
+                if provider_class.is_a?(Puppet::Provider)
+                    provider_class = provider_class.class.name
+                end
+
+                if provider = @resource.class.provider(provider_class)
                     unless provider.suitable?
                         raise ArgumentError,
                             "Provider '%s' is not functional on this platform" %
-                            [value]
+                            [provider_class]
                     end
                 else
                     raise ArgumentError, "Invalid %s provider '%s'" %
-                        [@parent.class.name, value]
+                        [@resource.class.name, provider_class]
                 end
             end
 
@@ -220,8 +199,13 @@ class Puppet::Type
                 if provider.is_a? String
                     provider = provider.intern
                 end
-                @parent.provider = provider
-                provider
+                @resource.provider = provider
+
+                if provider.is_a?(Puppet::Provider)
+                    provider.class.name
+                else
+                    provider
+                end
             end
         end.parenttype = self
     end
@@ -248,13 +232,16 @@ class Puppet::Type
     end
 
     def provider=(name)
-        if klass = self.class.provider(name)
+        if name.is_a?(Puppet::Provider)
+            @provider = name
+            @provider.resource = self
+        elsif klass = self.class.provider(name)
             @provider = klass.new(self)
         else
-            raise UnknownProviderError, "Could not find %s provider of %s" %
+            raise ArgumentError, "Could not find %s provider of %s" %
                 [name, self.class.name]
         end
     end
 end
 
-# $Id: providers.rb 2327 2007-03-19 20:24:08Z luke $
+# $Id: providers.rb 2552 2007-06-05 01:17:00Z luke $

data/lib/puppet/network/client/ca.rb

@@ -16,7 +16,7 @@ class Puppet::Network::Client::CA < Puppet::Network::Client
     # This client is really only able to request certificates for the
     # current host.  It uses the Puppet.config settings to figure everything out.
     def request_cert
-        Puppet.config.use(:puppet, :certificates)
+        Puppet.config.use(:main, :ssl)
 
         if cert = read_cert
             return cert
@@ -34,8 +34,6 @@ class Puppet::Network::Client::CA < Puppet::Network::Client
         if cert.nil? or cert == ""
             return nil
         end
-        Puppet.config.write(:hostcert) do |f| f.print cert end
-        Puppet.config.write(:localcacert) do |f| f.print cacert end
 
         begin
             @cert = OpenSSL::X509::Certificate.new(cert)
@@ -47,10 +45,15 @@ class Puppet::Network::Client::CA < Puppet::Network::Client
         end
 
         unless @cert.check_private_key(key)
-            raise InvalidCertificate, "Certificate does not match private key"
+            raise InvalidCertificate, "Certificate does not match private key.  Try 'puppetca --clean %s' on the server." % Facter.value(:fqdn)
         end
+
+        # Only write the cert out if it passes validating.
+        Puppet.config.write(:hostcert) do |f| f.print cert end
+        Puppet.config.write(:localcacert) do |f| f.print cacert end
+
         return @cert
     end
 end
 
-# $Id: ca.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: ca.rb 2611 2007-06-18 19:33:15Z luke $

data/lib/puppet/network/client/master.rb

@@ -41,6 +41,11 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         facts
     end
 
+    # Return the list of dynamic facts as an array of symbols
+    def self.dynamic_facts
+        Puppet.config[:dynamicfacts].split(/\s*,\s*/).collect { |fact| fact.downcase }
+    end
+
     # This method actually applies the configuration.
     def apply(tags = nil, ignoreschedules = false)
         unless defined? @objects
@@ -74,7 +79,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
             Puppet::Util::Storage.store
         end
         
-        if Puppet[:report]
+        if Puppet[:report] or Puppet[:summarize]
             report(transaction)
         end
 
@@ -103,7 +108,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     end
 
     def clear
-        @objects.remove(true)
+        @objects.remove(true) if @objects
         Puppet::Type.allclear
         mkdefault_objects
         @objects = nil
@@ -238,7 +243,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     
     # Just so we can specify that we are "the" instance.
     def initialize(*args)
-        Puppet.config.use(:puppet, :sslcertificates, :puppetd)
+        Puppet.config.use(:main, :ssl, :puppetd)
         super
 
         # This might be nil
@@ -288,6 +293,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     # The code that actually runs the configuration.  
     def run(tags = nil, ignoreschedules = false)
         got_lock = false
+        splay
         Puppet::Util.sync(:puppetrun).synchronize(Sync::EX) do
             if !lockfile.lock
                 Puppet.notice "Lock file %s exists; skipping configuration run" %
@@ -319,6 +325,7 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     ensure
         # Just make sure we remove the lock file if we set it.
         lockfile.unlock if got_lock and lockfile.locked?
+        clear()
     end
 
     def running?
@@ -483,11 +490,11 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     end
     
     def self.timeout
-        @timeout = Puppet[:configtimeout]
-        case @timeout
+        timeout = Puppet[:configtimeout]
+        case timeout
         when String:
-            if @timeout =~ /^\d+$/
-                @timeout = Integer(@timeout)
+            if timeout =~ /^\d+$/
+                timeout = Integer(timeout)
             else
                 raise ArgumentError, "Configuration timeout must be an integer"
             end
@@ -495,18 +502,33 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         else
             raise ArgumentError, "Configuration timeout must be an integer"
         end
+
+        return timeout
     end
     
     # Send off the transaction report.
     def report(transaction)
         begin
             report = transaction.generate_report()
-            if Puppet[:rrdgraph] == true
-                report.graph()
-            end
-            reportclient().report(report)
         rescue => detail
-            Puppet.err "Reporting failed: %s" % detail
+            Puppet.err "Could not generate report: %s" % detail
+            return
+        end
+
+        if Puppet[:rrdgraph] == true
+            report.graph()
+        end
+
+        if Puppet[:summarize]
+            puts report.summary
+        end
+        
+        if Puppet[:report]
+            begin
+                reportclient().report(report)
+            rescue => detail
+                Puppet.err "Reporting failed: %s" % detail
+            end
         end
     end
 
@@ -521,13 +543,17 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     end
 
     loadfacts()
-    
-    private
 
     # Have the facts changed since we last compiled?
     def facts_changed?(facts)
-        oldfacts = Puppet::Util::Storage.cache(:configuration)[:facts]
-        newfacts = facts
+        oldfacts = (Puppet::Util::Storage.cache(:configuration)[:facts] || {}).dup
+        newfacts = facts.dup
+        self.class.dynamic_facts.each do |fact|
+            [oldfacts, newfacts].each do |facthash|
+                facthash.delete(fact) if facthash.include?(fact)
+            end
+        end
+
         if oldfacts == newfacts
             return false
         else
@@ -639,6 +665,22 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
 
         @lockfile
     end
+
+    # Sleep when splay is enabled; else just return.
+    def splay
+        return unless Puppet[:splay]
+
+        limit = Integer(Puppet[:splaylimit])
+
+        # Pick a splay time and then cache it.
+        unless time = Puppet::Util::Storage.cache(:configuration)[:splay_time]
+            time = rand(limit)
+            Puppet::Util::Storage.cache(:configuration)[:splay_time] = time
+        end
+
+        Puppet.info "Sleeping for %s seconds (splay is enabled)" % time
+        sleep(time)
+    end
 end
 
-# $Id: master.rb 2435 2007-04-30 16:19:37Z luke $
+# $Id: master.rb 2602 2007-06-18 15:35:57Z luke $

data/lib/puppet/network/handler.rb

@@ -1,9 +1,12 @@
+require 'puppet/util/docs'
 require 'puppet/util/subclass_loader'
 
 module Puppet::Network
     # The base class for the different handlers.  The handlers are each responsible
     # for separate xmlrpc namespaces.
     class Handler
+        extend Puppet::Util::Docs
+
         # This is so that the handlers can subclass just 'Handler', rather
         # then having to specify the full class path.
         Handler = self
@@ -24,10 +27,24 @@ module Puppet::Network
             end
         end
 
+        # Set/Determine whether we're a client- or server-side handler.
+        def self.side(side = nil)
+            if side
+                side = side.intern if side.is_a?(String)
+                unless [:client, :server].include?(side)
+                    raise ArgumentError, "Invalid side registration '%s' for %s" % [side, self.name]
+                end
+                @side = side
+            else
+                @side ||= :server
+                return @side
+            end
+        end
+
         # Create an empty init method with the same signature.
         def initialize(hash = {})
         end
     end
 end
 
-# $Id: handler.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: handler.rb 2479 2007-05-07 22:29:44Z luke $

data/lib/puppet/network/handler/ca.rb

@@ -10,6 +10,10 @@ class Puppet::Network::Handler
     class CA < Handler
         attr_reader :ca
 
+        desc "Provides an interface for signing CSRs.  Accepts a CSR and returns
+        the CA certificate and the signed certificate, or returns nil if
+        the cert is not signed."
+
         @interface = XMLRPC::Service::Interface.new("puppetca") { |iface|
             iface.add_method("array getcert(csr)")
         }
@@ -56,7 +60,7 @@ class Puppet::Network::Handler
         end
 
         def initialize(hash = {})
-            Puppet.config.use(:puppet, :certificates, :ca)
+            Puppet.config.use(:main, :ssl, :ca)
             if hash.include? :autosign
                 @autosign = hash[:autosign]
             end
@@ -100,7 +104,9 @@ class Puppet::Network::Handler
             cert, cacert = ca.getclientcert(hostname)
             if cert and cacert
                 Puppet.info "Retrieving existing certificate for %s" % hostname
-                #Puppet.info "Cert: %s; Cacert: %s" % [cert.class, cacert.class]
+                unless csr.public_key.to_s == cert.public_key.to_s
+                    raise Puppet::Error, "Certificate request does not match existing certificate; run 'puppetca --clean %s'." % hostname
+                end
                 return [cert.to_pem, cacert.to_pem]
             elsif @ca
                 if self.autosign?(hostname) or client.nil?
@@ -149,4 +155,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: ca.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: ca.rb 2612 2007-06-18 19:51:17Z luke $

data/lib/puppet/network/handler/facts.rb

@@ -0,0 +1,70 @@
+require 'yaml'
+require 'puppet/util/fact_store'
+
+class Puppet::Network::Handler
+    # Receive logs from remote hosts.
+    class Facts < Handler
+        desc "An interface for storing and retrieving client facts.  Currently only
+        used internally by Puppet."
+
+        @interface = XMLRPC::Service::Interface.new("facts") { |iface|
+            iface.add_method("void set(string, string)")
+            iface.add_method("string get(string)")
+            iface.add_method("integer store_date(string)")
+        }
+
+        def initialize(hash = {})
+            super
+
+            backend = Puppet[:factstore]
+
+            unless klass = Puppet::Util::FactStore.store(backend)
+                raise Puppet::Error, "Could not find fact store %s" % backend
+            end
+
+            @backend = klass.new
+        end
+
+        # Get the facts from our back end.
+        def get(node)
+            if facts = @backend.get(node)
+                return strip_internal(facts)
+            else
+                return nil
+            end
+        end
+
+        # Set the facts in the backend.
+        def set(node, facts)
+            @backend.set(node, add_internal(facts))
+            nil
+        end
+
+        # Retrieve a client's storage date.
+        def store_date(node)
+            if facts = get(node)
+                facts[:_puppet_timestamp].to_i
+            else
+                nil
+            end
+        end
+
+        private
+
+        # Add internal data to the facts for storage.
+        def add_internal(facts)
+            facts = facts.dup
+            facts[:_puppet_timestamp] = Time.now
+            facts
+        end
+
+        # Strip out that internal data.
+        def strip_internal(facts)
+            facts = facts.dup
+            facts.find_all { |name, value| name.to_s =~ /^_puppet_/ }.each { |name, value| facts.delete(name) }
+            facts
+        end
+    end
+end
+
+# $Id: facts.rb 2479 2007-05-07 22:29:44Z luke $