Merging r1468 from the implementations branch with r1438 from when the branch was first created.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1469 980ebf18-57e1-0310-9a29-db15c13687c0

Author: luke

examples/root/etc/init.d/sleeper

@@ -7,7 +7,7 @@ path=`echo $script | sed 's/etc..*/bin/'`
 
 PATH=$PATH:$path
 
-ps=`facter ps | cut -d ' ' -f3-`
+ps=`facter ps`
 
 if [ -z "$ps" ]; then
     ps="ps -ef"

lib/puppet/autoload.rb

@@ -0,0 +1,101 @@
+# I have no idea what's going on here, but...
+unless defined? MissingSourceFile
+    class MissingSourceFile < RuntimeError
+    end
+end
+# Autoload paths, either based on names or all at once.
+class Puppet::Autoload
+    include Puppet::Util
+
+    @autoloaders = {}
+
+    attr_accessor :object, :path, :objwarn, :wrap
+
+
+    class << self
+        attr_reader :autoloaders
+        private :autoloaders
+    end
+    Puppet::Util.classproxy self, :autoloaders, "[]", "[]=", :clear
+
+    attr_reader :loaded
+    private :loaded
+
+    Puppet::Util.proxy self, :loaded, :clear
+
+    def initialize(obj, path, options = {})
+        @path = path.to_s
+        @object = obj
+
+        self.class[obj] = self
+
+        options.each do |opt, value|
+            opt = opt.intern if opt.is_a? String
+            begin
+                self.send(opt.to_s + "=", value)
+            rescue NoMethodError
+                raise ArgumentError, "%s is not a valid option" % opt
+            end
+        end
+
+        unless defined? @wrap
+            @wrap = true
+        end
+
+        @loaded = {}
+    end
+
+    def load(name)
+        name = symbolize(name)
+
+        path = File.join(@path, name.to_s + ".rb")
+
+        begin
+            Kernel.load path, @wrap
+            @loaded[name] = true
+            return true
+        rescue MissingSourceFile
+            return false
+        rescue LoadError => detail
+            # I have no idea what's going on here, but different versions
+            # of ruby are raising different errors on missing files.
+            unless detail.to_s =~ /^no such file/i
+                warn "Could not autoload %s: %s" % [name, detail]
+            end
+            return false
+        end
+    end
+
+    def loaded?(name)
+        name = symbolize(name)
+        @loaded[name]
+    end
+
+    def loadall
+        # Load every instance of everything we can find.
+        $:.each do |dir|
+            fdir = File.join(dir, @path)
+            if FileTest.exists?(fdir) and FileTest.directory?(fdir)
+                Dir.glob("#{fdir}/*.rb").each do |file|
+                    # Load here, rather than require, so that facts
+                    # can be reloaded.  This has some short-comings, I
+                    # believe, but it works as long as real classes
+                    # aren't used.
+                    name = File.basename(file).sub(".rb", '').intern
+                    next if @loaded.include? name
+                    begin
+                        Kernel.load file, @wrap
+                        @loaded[name] = true
+                    rescue => detail
+                        #if Puppet[:debug]
+                        #    puts detail.backtrace
+                        #end
+                        warn "Could not autoload %s: %s" % [file.inspect, detail]
+                    end
+                end
+            end
+        end
+    end
+end
+
+# $Id$

lib/puppet/client.rb

@@ -26,9 +26,15 @@ class << self
 
         def initcerts
             unless self.readcert
-                unless self.requestcert
-                    return nil
-                end
+                #if self.is_a? Puppet::Client::CA
+                    unless self.requestcert
+                        return nil
+                    end
+                #else
+                #    return nil
+                #end
+                #unless self.requestcert
+                #end
             end
 
             # unless we have a driver, we're a local client and we can't add
@@ -95,6 +101,15 @@ def initialize(hash)
             end
         end
 
+        # Are we a local client?
+        def local?
+            if defined? @local and @local
+                true
+            else
+                false
+            end
+        end
+
         # A wrapper method to run and then store the last run time
         def runnow
             if self.stopping

lib/puppet/client/master.rb

@@ -508,7 +508,7 @@ def getplugins
                     File.basename(object[:path]).sub(".rb",'')
                 load object[:path]
             rescue => detail
-                Puppet.warning "Could not load %s: %s" %
+                Puppet.warning "Could not reload plugin %s: %s" %
                     [object[:path], detail]
             end
         end

lib/puppet/daemon.rb

@@ -157,24 +157,45 @@ def requestcert
                 }
             end
 
+
             unless defined? @driver
                 Puppet.err "Cannot request a certificate without a defined target"
                 return false
             end
 
-            Puppet.info "Creating a new certificate request for %s" % @fqdn
-            name = OpenSSL::X509::Name.new([["CN", @fqdn]])
+            unless defined? @csr
+                Puppet.info "Creating a new certificate request for %s" % @fqdn
+                name = OpenSSL::X509::Name.new([["CN", @fqdn]])
 
-            @csr = OpenSSL::X509::Request.new
-            @csr.version = 0
-            @csr.subject = name
-            @csr.public_key = @key.public_key
-            @csr.sign(@key, OpenSSL::Digest::MD5.new)
+                @csr = OpenSSL::X509::Request.new
+                @csr.version = 0
+                @csr.subject = name
+                @csr.public_key = @key.public_key
+                @csr.sign(@key, OpenSSL::Digest::MD5.new)
+            end
 
             Puppet.info "Requesting certificate"
 
+            # We can only request a client with a CA client, so we need
+            # to create one if we don't already have one (or if we're not a CA
+            # server).
+            caclient = nil
+            if @driver.is_a? Puppet::Client::CA or @driver.is_a? Puppet::Server::CA
+                caclient = @driver
+            else
+                # Create a CA client with which to request the cert.
+                if @driver.local?
+                    raise Puppet::DevError,
+                        "Incorrect setup for a local CA request"
+                end
+                caclient = Puppet::Client::CA.new(
+                    :Port => @driver.puppet_port,
+                    :Server => @driver.puppet_server
+                )
+            end
+
             begin
-                cert, cacert = @driver.getcert(@csr.to_pem)
+                cert, cacert = caclient.getcert(@csr.to_pem)
             rescue => detail
                 if Puppet[:debug]
                     puts detail.backtrace

lib/puppet/element.rb

@@ -11,6 +11,7 @@ class Puppet::Element
 
     class << self
         attr_accessor :doc, :nodoc
+        include Puppet::Util
     end
 
     # all of our subclasses must respond to each of these methods...
@@ -22,7 +23,7 @@ class << self
     @@interface_methods.each { |method|
         self.send(:define_method,method) {
             raise Puppet::DevError, "%s has not overridden %s" %
-                [self.class,method]
+                [self.class.name,method]
         }
     }
 

lib/puppet/filetype.rb

@@ -145,6 +145,10 @@ def write(text)
         # Handle Linux-style cron tabs.
         newfiletype(:crontab) do
             def initialize(user)
+                self.path = user
+            end
+
+            def path=(user)
                 begin
                     uid = Puppet::Util.uid(user)
                 rescue Puppet::Error => detail
@@ -153,7 +157,7 @@ def initialize(user)
 
                 # We have to have the user name, not the uid, because some
                 # systems *cough*linux*cough* require it that way
-                @path = user
+                @path = uid
             end
 
             # Read a specific @path's cron tab.
@@ -177,7 +181,7 @@ def write(text)
             private
 
             # Only add the -u flag when the @path is different.  Fedora apparently
-            # does not think I should be allowed to set the @path to my
+            # does not think I should be allowed to set the @path to my own user name
             def cmdbase
                 cmd = nil
                 if @path == Process.uid

lib/puppet/networkclient.rb

@@ -30,6 +30,7 @@ class ClientError < RuntimeError; end
         Puppet.err "Could not load client network libs: %s" % $noclientnetworking
     else
         class NetworkClient < XMLRPC::Client
+            attr_accessor :puppet_server, :puppet_port
             @clients = {}
 
             # Create a netclient for each handler
@@ -126,6 +127,9 @@ def initialize(hash)
                 hash[:Server] ||= "localhost"
                 hash[:Port] ||= Puppet[:masterport]
 
+                @puppet_server = hash[:Server]
+                @puppet_port = hash[:Port]
+
                 @puppetserver = hash[:Server]
 
                 super(