puppet 0.22.4 → 0.23.0

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

@@ -8,6 +8,9 @@ class Puppet::Network::Handler # :nodoc:
     # to the client.  Alternatively, accept an md5 sum and return the
     # associated content.
     class FileBucket < Handler
+        desc "The interface to Puppet's FileBucket system.  Can be used to store
+        files in and retrieve files from a filebucket."
+
         @interface = XMLRPC::Service::Interface.new("puppetbucket") { |iface|
             iface.add_method("string addfile(string, string)")
             iface.add_method("string getfile(string)")
@@ -177,4 +180,4 @@ class Puppet::Network::Handler # :nodoc:
     end
 end
 
-# $Id: filebucket.rb 2348 2007-03-24 21:16:20Z luke $
+# $Id: filebucket.rb 2479 2007-05-07 22:29:44Z luke $

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

@@ -3,10 +3,14 @@ require 'puppet/network/authstore'
 require 'webrick/httpstatus'
 require 'cgi'
 require 'delegate'
+require 'sync'
 
 class Puppet::Network::Handler
+    AuthStoreError = Puppet::AuthStoreError
     class FileServerError < Puppet::Error; end
     class FileServer < Handler
+        desc "The interface to Puppet's fileserving abilities."
+
         attr_accessor :local
 
         CHECKPARAMS = [:mode, :type, :owner, :group, :checksum]
@@ -40,20 +44,18 @@ class Puppet::Network::Handler
             end
 
             obj = nil
-            unless obj = mount.check(path, links)
+            unless obj = mount.getfileobject(path, links)
                 return ""
             end
 
+            currentvalues = mount.check(obj)
+    
             desc = []
             CHECKPARAMS.each { |check|
-                if property = obj.property(check)
-                    unless property.is
-                        mount.debug "Manually retrieving info for %s" % check
-                        property.retrieve
-                    end
-                    desc << property.is
+                if value = currentvalues[check]
+                    desc << value
                 else
-                    if check == "checksum" and obj.property(:type).is == "file"
+                    if check == "checksum" and currentvalues[:type] == "file"
                         mount.notice "File %s does not have data for %s" %
                             [obj.name, check]
                     end
@@ -96,6 +98,7 @@ class Puppet::Network::Handler
                         self.mount(dir, name)
                     end
                 }
+                self.mount(nil, MODULES)
             else
                 @passedconfig = false
                 readconfig(false) # don't check the file the first time.
@@ -420,31 +423,62 @@ class Puppet::Network::Handler
         class Mount < Puppet::Network::AuthStore
             attr_reader :name
 
+            @@syncs = {}
+
+            @@files = {}
+
             Puppet::Util.logmethods(self, true)
 
-            # Run 'retrieve' on a file.  This gets the actual parameters, so
-            # we can pass them to the client.
-            def check(dir, links)
+            def getfileobject(dir, links)
                 unless FileTest.exists?(dir)
                     self.notice "File source %s does not exist" % dir
                     return nil
                 end
 
-                obj = fileobj(dir, links)
-
-                # FIXME we should really have a timeout here -- we don't
-                # want to actually check on every connection, maybe no more
-                # than every 60 seconds or something.  It'd be nice if we
-                # could use the builtin scheduling to do this.
-
+                return fileobj(dir, links)
+            end
+             
+            # Run 'retrieve' on a file.  This gets the actual parameters, so
+            # we can pass them to the client.
+            def check(obj)
                 # Retrieval is enough here, because we don't want to cache
                 # any information in the state file, and we don't want to generate
                 # any state changes or anything.  We don't even need to sync
                 # the checksum, because we're always going to hit the disk
                 # directly.
-                obj.retrieve
 
-                return obj
+                # We're now caching file data, using the LoadedFile to check the
+                # disk no more frequently than the :filetimeout.
+                path = obj[:path]
+                sync = sync(path)
+                unless data = @@files[path]
+                    data = {}
+                    sync.synchronize(Sync::EX) do
+                        @@files[path] = data
+                        data[:loaded_obj] = Puppet::Util::LoadedFile.new(path)
+                        Puppet.notice "Initializing values for %s" % path
+                        data[:values] = properties(obj)
+                        return data[:values]
+                    end
+                end
+
+                changed = nil
+                sync.synchronize(Sync::SH) do
+                    changed = data[:loaded_obj].changed?
+                end
+
+                if changed
+                    sync.synchronize(Sync::EX) do
+                        Puppet.notice "Getting values for %s" % path
+                        data[:values] = properties(obj)
+                        return data[:values]
+                    end
+                else
+                    sync.synchronize(Sync::SH) do
+                        Puppet.info "Using cached values for %s" % path
+                        return data[:values]
+                    end
+                end
             end
 
             # Create a map for a specific client.
@@ -576,6 +610,11 @@ class Puppet::Network::Handler
                 @path = path
             end
 
+            # Return the current values for the object.
+            def properties(obj)
+                obj.retrieve.inject({}) { |props, ary| props[ary[0].name] = ary[1]; props }
+            end
+
             # Retrieve a specific directory relative to a mount point.
             # If they pass in a client, then expand as necessary.
             def subdir(dir = nil, client = nil)
@@ -590,6 +629,11 @@ class Puppet::Network::Handler
                 dirname
             end
 
+            def sync(path)
+                @@syncs[path] ||= Sync.new
+                @@syncs[path]
+            end
+
             def to_s
                 "mount[#{@name}]"
             end
@@ -616,4 +660,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: fileserver.rb 2434 2007-04-30 15:57:57Z luke $
+# $Id: fileserver.rb 2629 2007-06-19 22:18:55Z luke $

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

@@ -8,6 +8,9 @@ require 'yaml'
 class Puppet::Network::Handler
     class MasterError < Puppet::Error; end
     class Master < Handler
+        desc "Puppet's configuration interface.  Used for all interactions related to
+        generating client configurations."
+
         include Puppet::Util
 
         attr_accessor :ast, :local
@@ -68,7 +71,7 @@ class Puppet::Network::Handler
 
                 host = Puppet::Rails::Host.find_or_create_by_name(client)
                 host.last_freshcheck = Time.now
-                if clientip and (! host.ip or host.ip == "")
+                if clientip and (! host.ip or host.ip == "" or host.ip == "NULL")
                     host.ip = clientip
                 end
                 host.save
@@ -200,7 +203,7 @@ class Puppet::Network::Handler
                 when "marshal":
                     str = Marshal::dump(retobjects)
                 when "yaml":
-                    str = YAML.dump(retobjects)
+                    str = retobjects.to_yaml(:UseBlock => true)
                 else
                     raise XMLRPC::FaultException.new(
                         1, "Unavailable config format %s" % format
@@ -220,4 +223,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: master.rb 2334 2007-03-19 23:04:32Z luke $
+# $Id: master.rb 2616 2007-06-18 21:03:18Z luke $

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

@@ -1,7 +1,12 @@
+require 'puppet/util/instance_loader'
+
 # A simple server for triggering a new run on a Puppet client.
 class Puppet::Network::Handler
     class Report < Handler
+        desc "Accepts a Puppet transaction report and processes it."
+
         extend Puppet::Util::ClassGen
+        extend Puppet::Util::InstanceLoader
 
         module ReportBase
             include Puppet::Util::Docs
@@ -20,8 +25,8 @@ class Puppet::Network::Handler
             iface.add_method("string report(array)")
         }
 
-        @reports = {}
-        @reportloader = Puppet::Util::Autoload.new(self, "puppet/reports")
+        # Set up autoloading and retrieving of reports.
+        autoload :report, 'puppet/reports'
 
         class << self
             attr_reader :hooks
@@ -31,7 +36,7 @@ class Puppet::Network::Handler
         def self.newreport(name, options = {}, &block)
             name = symbolize(name)
 
-            mod = genmodule(name, :extend => ReportBase, :hash => @reports, :block => block)
+            mod = genmodule(name, :extend => ReportBase, :hash => instance_hash(:report), :block => block)
 
             if options[:useyaml]
                 mod.useyaml = true
@@ -42,31 +47,12 @@ class Puppet::Network::Handler
             end
         end
 
-        # Load a report.
-        def self.report(name)
-            name = name.intern if name.is_a? String
-            unless @reports.include? name
-                if @reportloader.load(name)
-                    unless @reports.include? name
-                        Puppet.warning(
-                            "Loaded report file for %s but report was not defined" %
-                            name
-                        )
-                        return nil
-                    end
-                else
-                    return nil
-                end
-            end
-            @reports[symbolize(name)]
-        end
-
         # Collect the docs for all of our reports.
         def self.reportdocs
             docs = ""
 
             # Use this method so they all get loaded
-            reports.sort { |a,b| a.to_s <=> b.to_s }.each do |name|
+            loaded_instances(:report).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
                 mod = self.report(name)
                 docs += "%s\n%s\n" % [name, "-" * name.to_s.length]
 
@@ -78,8 +64,8 @@ class Puppet::Network::Handler
 
         # List each of the reports.
         def self.reports
-            @reportloader.loadall
-            @reports.keys
+            instance_loader(:report).loadall
+            loaded_instances(:report)
         end
 
         def initialize(*args)
@@ -155,4 +141,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: report.rb 2406 2007-04-23 06:16:10Z luke $
+# $Id: report.rb 2517 2007-05-15 19:22:36Z luke $

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

@@ -4,6 +4,16 @@ require 'puppet/network/handler'
 # Serve Puppet elements.  Useful for querying, copying, and, um, other stuff.
 class Puppet::Network::Handler
     class Resource < Handler
+        desc "An interface for interacting with client-based resources that can
+        be used for querying or managing remote machines without using Puppet's
+        central server tools.
+        
+        The ``describe`` and ``list`` methods return TransBuckets containing
+        TransObject instances (``describe`` returns a single TransBucket),
+        and the ``apply`` method accepts a TransBucket of TransObjects and
+        applies them locally.
+        "
+
         attr_accessor :local
 
         @interface = XMLRPC::Service::Interface.new("resource") { |iface|
@@ -12,6 +22,8 @@ class Puppet::Network::Handler
             iface.add_method("string list(string, array, string)")
         }
 
+        side :client
+
         # Apply a TransBucket as a transaction.
         def apply(bucket, format = "yaml", client = nil, clientip = nil)
             unless @local
@@ -133,7 +145,7 @@ class Puppet::Network::Handler
             bucket = Puppet::TransBucket.new
             bucket.type = typeklass.name
 
-            typeklass.list.each do |obj|
+            typeklass.instances.each do |obj|
                 next if ignore.include? obj.name
 
                 #object = Puppet::TransObject.new(obj.name, typeklass.name)
@@ -187,4 +199,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: resource.rb 2433 2007-04-30 15:43:50Z luke $
+# $Id: resource.rb 2551 2007-06-04 20:37:14Z luke $

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

@@ -2,10 +2,14 @@ class Puppet::Network::Handler
     class MissingMasterError < RuntimeError; end # Cannot find the master client
     # A simple server for triggering a new run on a Puppet client.
     class Runner < Handler
+        desc "An interface for triggering client configuration runs."
+
         @interface = XMLRPC::Service::Interface.new("puppetrunner") { |iface|
             iface.add_method("string run(string, string)")
         }
 
+        side :client
+
         # Run the client configuration right now, optionally specifying
         # tags and whether to ignore schedules
         def run(tags = nil, ignoreschedules = false, fg = true, client = nil, clientip = nil)
@@ -58,4 +62,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: runner.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: runner.rb 2479 2007-05-07 22:29:44Z luke $

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

@@ -1,5 +1,9 @@
 class Puppet::Network::Handler
     class Status < Handler
+        desc "A simple interface for testing Puppet connectivity."
+
+        side :client
+
         @interface = XMLRPC::Service::Interface.new("status") { |iface|
             iface.add_method("int status()")
         }
@@ -10,4 +14,4 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id: status.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: status.rb 2479 2007-05-07 22:29:44Z luke $

data/lib/puppet/network/server/mongrel.rb

@@ -47,8 +47,8 @@ require 'resolv'
 # handler = XmlRpcHandler.new
 # handler.xmlrpc_server.add_handler("my.add") { |a, b| a.to_i + b.to_i }
 # </pre>
-class Puppet::Network::Server
-    class MongrelHandler < Mongrel::HttpHandler
+module Puppet::Network
+    class Server::Mongrel < ::Mongrel::HttpHandler
         attr_reader :xmlrpc_server
 
         def initialize(handlers)
@@ -114,7 +114,7 @@ class Puppet::Network::Server
         def client_info(request)
             params = request.params
             ip = params["REMOTE_ADDR"]
-            if dn = params["HTTP_X_CLIENT_DN"]
+            if dn = params[Puppet[:ssl_client_header]]
                 client = dn.sub("/CN=", '')
                 valid = true
             else
@@ -135,4 +135,4 @@ class Puppet::Network::Server
     end
 end
 
-# $Id: mongrel.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: mongrel.rb 2558 2007-06-11 18:07:34Z luke $

data/lib/puppet/network/server/webrick.rb

@@ -2,6 +2,7 @@ require 'puppet'
 require 'puppet/daemon'
 require 'webrick'
 require 'webrick/https'
+require 'fcntl'
 
 require 'puppet/sslcertificates/support'
 require 'puppet/network/xmlrpc/webrick_servlet'
@@ -47,14 +48,19 @@ module Puppet
 
                 # yuck; separate http logs
                 file = nil
-                Puppet.config.use(:puppet, :certificates, Puppet.name)
+                Puppet.config.use(:main, :ssl, Puppet[:name])
                 if Puppet[:name] == "puppetmasterd"
                     file = Puppet[:masterhttplog]
                 else
                     file = Puppet[:httplog]
                 end
 
-                args << file
+                # open the log manually to prevent file descriptor leak
+                file_io = open(file, "a+")
+                file_io.sync
+                file_io.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+
+                args << file_io
                 if Puppet[:debug]
                     args << WEBrick::Log::DEBUG
                 end
@@ -87,6 +93,11 @@ module Puppet
 
                 super(hash)
 
+                # make sure children don't inherit the sockets
+                listeners.each { |sock|
+                    sock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+                }
+
                 Puppet.info "Listening on port %s" % hash[:Port]
 
                 # this creates a new servlet for every connection,
@@ -150,4 +161,4 @@ module Puppet
     end
 end
 
-# $Id: webrick.rb 2259 2007-03-06 19:03:05Z luke $
+# $Id: webrick.rb 2553 2007-06-05 18:12:42Z luke $

data/lib/puppet/parameter.rb

@@ -240,6 +240,8 @@ class Puppet::Parameter < Puppet::Element
     # ParamHandler class.
     proxymethods("required?", "isnamevar?")
 
+    attr_accessor :resource
+    # LAK 2007-05-09: Keep the @parent around for backward compatibility.
     attr_accessor :parent
     attr_reader :shadow
 
@@ -257,12 +259,12 @@ class Puppet::Parameter < Puppet::Element
 
         error = type.new(args.join(" "))
 
-        if defined? @parent and @parent and @parent.line
-            error.line = @parent.line
+        if defined? @resource and @resource and @resource.line
+            error.line = @resource.line
         end
 
-        if defined? @parent and @parent and @parent.file
-            error.file = @parent.file
+        if defined? @resource and @resource and @resource.file
+            error.file = @resource.file
         end
 
         raise error
@@ -271,13 +273,16 @@ class Puppet::Parameter < Puppet::Element
     # Basic parameter initialization.
     def initialize(options = {})
         options = symbolize_options(options)
-        if parent = options[:parent]
-            self.parent = parent
-            options.delete(:parent)
+        if resource = options[:resource]
+            self.resource = resource
+            options.delete(:resource)
         else
-            raise Puppet::DevError, "No parent set for %s" % self.class.name
+            raise Puppet::DevError, "No resource set for %s" % self.class.name
         end
 
+        # LAK 2007-05-09: Keep the @parent around for backward compatibility.
+        #@parent = @resource
+
         if ! self.metaparam? and klass = Puppet::Type.metaparamclass(self.class.name)
             setup_shadow(klass)
         end
@@ -285,15 +290,15 @@ class Puppet::Parameter < Puppet::Element
         set_options(options)
     end
 
-    # Log a message using the parent's log level.
+    # Log a message using the resource's log level.
     def log(msg)
-        unless @parent[:loglevel]
-            p @parent
+        unless @resource[:loglevel]
+            p @resource
             self.devfail "Parent %s has no loglevel" %
-                @parent.name
+                @resource.name
         end
         Puppet::Util::Log.create(
-            :level => @parent[:loglevel],
+            :level => @resource[:loglevel],
             :message => msg,
             :source => self
         )
@@ -317,7 +322,7 @@ class Puppet::Parameter < Puppet::Element
         unless defined? @noop
             @noop = false
         end
-        tmp = @noop || self.parent.noop || Puppet[:noop] || false
+        tmp = @noop || self.resource.noop || Puppet[:noop] || false
         #debug "noop is %s" % tmp
         return tmp
     end
@@ -325,8 +330,8 @@ class Puppet::Parameter < Puppet::Element
     # return the full path to us, for logging and rollback; not currently
     # used
     def pathbuilder
-        if defined? @parent and @parent
-            return [@parent.pathbuilder, self.name]
+        if defined? @resource and @resource
+            return [@resource.pathbuilder, self.name]
         else
             return [self.name]
         end
@@ -397,7 +402,7 @@ class Puppet::Parameter < Puppet::Element
     end
 
     def remove
-        @parent = nil
+        @resource = nil
         @shadow = nil
     end
 
@@ -414,7 +419,7 @@ class Puppet::Parameter < Puppet::Element
             if self.should
                 return self.should
             else
-                return self.is
+                return self.retrieve
             end
         else
             if defined? @value
@@ -446,17 +451,17 @@ class Puppet::Parameter < Puppet::Element
 
     def inspect
         s = "Parameter(%s = %s" % [self.name, self.value || "nil"]
-        if defined? @parent
-            s += ", @parent = %s)" % @parent
+        if defined? @resource
+            s += ", @resource = %s)" % @resource
         else
             s += ")"
         end
     end
 
-    # Retrieve the parent's provider.  Some types don't have providers, in which
-    # case we return the parent object itself.
+    # Retrieve the resource's provider.  Some types don't have providers, in which
+    # case we return the resource object itself.
     def provider
-        @parent.provider || @parent
+        @resource.provider || @resource
     end
 
     # If there's a shadowing metaparam, instantiate it now.
@@ -464,7 +469,7 @@ class Puppet::Parameter < Puppet::Element
     # same name as a metaparameter, and the metaparam will only be
     # stored as a shadow.
     def setup_shadow(klass)
-        @shadow = klass.new(:parent => self.parent)
+        @shadow = klass.new(:resource => self.resource)
     end
 
     def to_s
@@ -472,4 +477,4 @@ class Puppet::Parameter < Puppet::Element
     end
 end
 
-# $Id: parameter.rb 2414 2007-04-25 20:59:00Z luke $
+# $Id: parameter.rb 2503 2007-05-10 21:46:59Z luke $