puppet 0.24.9 → 0.25.0

data/lib/puppet/network/server.rb

@@ -1,67 +1,169 @@
 require 'puppet/network/http'
+require 'puppet/util/pidlock'
 
 class Puppet::Network::Server
-	attr_reader :server_type, :protocols, :address, :port
+    attr_reader :server_type, :protocols, :address, :port
+
+    # Put the daemon into the background.
+    def daemonize
+        if pid = fork()
+            Process.detach(pid)
+            exit(0)
+        end
+
+        # Get rid of console logging
+        Puppet::Util::Log.close(:console)
+
+        Process.setsid
+        Dir.chdir("/")
+        begin
+            $stdin.reopen "/dev/null"
+            $stdout.reopen "/dev/null", "a"
+            $stderr.reopen $stdout
+            Puppet::Util::Log.reopen
+        rescue => detail
+            File.open("/tmp/daemonout", "w") { |f|
+                f.puts "Could not start %s: %s" % [Puppet[:name], detail]
+            }
+            raise "Could not start %s: %s" % [Puppet[:name], detail]
+        end
+    end
+
+    # Create a pidfile for our daemon, so we can be stopped and others
+    # don't try to start.
+    def create_pidfile
+        Puppet::Util.sync(Puppet[:name]).synchronize(Sync::EX) do
+            unless Puppet::Util::Pidlock.new(pidfile).lock
+                raise "Could not create PID file: %s" % [pidfile]
+            end
+        end
+    end
+
+    # Remove the pid file for our daemon.
+    def remove_pidfile
+        Puppet::Util.sync(Puppet[:name]).synchronize(Sync::EX) do
+            locker = Puppet::Util::Pidlock.new(pidfile)
+            if locker.locked?
+                locker.unlock or Puppet.err "Could not remove PID file %s" % [pidfile]
+            end
+        end
+    end
+
+    # Provide the path to our pidfile.
+    def pidfile
+        Puppet[:pidfile]
+    end
 
     def initialize(args = {})
+        valid_args = [:handlers, :xmlrpc_handlers, :port]
+        bad_args = args.keys.find_all { |p| ! valid_args.include?(p) }.collect { |p| p.to_s }.join(",")
+        raise ArgumentError, "Invalid argument(s) %s" % bad_args unless bad_args == ""
         @server_type = Puppet[:servertype] or raise "No servertype configuration found."  # e.g.,  WEBrick, Mongrel, etc.
         http_server_class || raise(ArgumentError, "Could not determine HTTP Server class for server type [#{@server_type}]")
-        @address = args[:address] || Puppet[:bindaddress] || 
-            raise(ArgumentError, "Must specify :address or configure Puppet :bindaddress.")
-        @port = args[:port] || Puppet[:masterport] ||
-            raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
-        @protocols = [ :rest ]
+
+        @port = args[:port] || Puppet[:masterport] || raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
+        @address = determine_bind_address()
+
+        @protocols = [ :rest, :xmlrpc ]
         @listening = false
         @routes = {}
+        @xmlrpc_routes = {}
         self.register(args[:handlers]) if args[:handlers]
+        self.register_xmlrpc(args[:xmlrpc_handlers]) if args[:xmlrpc_handlers]
+
+        # Make sure we have all of the directories we need to function.
+        Puppet.settings.use(:main, :ssl, Puppet[:name])
     end
 
+    # Register handlers for REST networking, based on the Indirector.
     def register(*indirections)
-  	    raise ArgumentError, "Indirection names are required." if indirections.empty?
-  	    indirections.flatten.each { |i| @routes[i.to_sym] = true }
+        raise ArgumentError, "Indirection names are required." if indirections.empty?
+        indirections.flatten.each do |name|
+            Puppet::Indirector::Indirection.model(name) || raise(ArgumentError, "Cannot locate indirection '#{name}'.")
+            @routes[name.to_sym] = true
+        end
     end
-  
+
+    # Unregister Indirector handlers.
     def unregister(*indirections)
-          raise "Cannot unregister indirections while server is listening." if listening?
-          indirections = @routes.keys if indirections.empty?
+        raise "Cannot unregister indirections while server is listening." if listening?
+        indirections = @routes.keys if indirections.empty?
+
+        indirections.flatten.each do |i|
+            raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym]
+        end
+
+        indirections.flatten.each do |i|
+            @routes.delete(i.to_sym)
+        end
+    end
 
-          indirections.flatten.each do |i|
-    	        raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym]
-          end
-        
-          indirections.flatten.each do |i|
-    	        @routes.delete(i.to_sym)
-    	    end
+    # Register xmlrpc handlers for backward compatibility.
+    def register_xmlrpc(*namespaces)
+        raise ArgumentError, "XMLRPC namespaces are required." if namespaces.empty?
+        namespaces.flatten.each do |name|
+            Puppet::Network::Handler.handler(name) || raise(ArgumentError, "Cannot locate XMLRPC handler for namespace '#{name}'.")
+            @xmlrpc_routes[name.to_sym] = true
+        end
+    end
+
+    # Unregister xmlrpc handlers.
+    def unregister_xmlrpc(*namespaces)
+        raise "Cannot unregister xmlrpc handlers while server is listening." if listening?
+        namespaces = @xmlrpc_routes.keys if namespaces.empty?
+
+        namespaces.flatten.each do |i|
+            raise(ArgumentError, "XMLRPC handler '%s' is unknown." % i) unless @xmlrpc_routes[i.to_sym]
+        end
+
+        namespaces.flatten.each do |i|
+            @xmlrpc_routes.delete(i.to_sym)
+        end
     end
 
     def listening?
-  	    @listening
+        @listening
     end
-  
+
     def listen
-  	    raise "Cannot listen -- already listening." if listening?
-  	    @listening = true
-  	    http_server.listen(:address => address, :port => port, :handlers => @routes.keys, :protocols => protocols)
+        raise "Cannot listen -- already listening." if listening?
+        @listening = true
+        http_server.listen(:address => address, :port => port, :handlers => @routes.keys, :xmlrpc_handlers => @xmlrpc_routes.keys, :protocols => protocols)
     end
-  
+
     def unlisten
-  	    raise "Cannot unlisten -- not currently listening." unless listening?
-  	    http_server.unlisten   
-  	    @listening = false
+        raise "Cannot unlisten -- not currently listening." unless listening?
+        http_server.unlisten
+        @listening = false
     end
-    
+
     def http_server_class
         http_server_class_by_type(@server_type)
     end
 
+    def start
+        create_pidfile
+        listen
+    end
+
+    def stop
+        unlisten
+        remove_pidfile
+    end
+
   private
-  
+
     def http_server
         @http_server ||= http_server_class.new
     end
-    
+
     def http_server_class_by_type(kind)
         Puppet::Network::HTTP.server_class_by_type(kind)
     end
-end
 
+    def determine_bind_address
+        tmp = Puppet[:bindaddress]
+        return tmp if tmp != ""
+        return server_type.to_s == "webrick" ? "0.0.0.0" : "127.0.0.1"
+    end
+end

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

@@ -82,7 +82,7 @@ module Puppet::Network
                 if detail.message.include?(str)
                     Puppet.warning "Certificate validation failed; consider using the certname configuration option"
                 end
-            end 
+            end
             raise XMLRPCClientError, "Certificates were not trusted: %s" % detail
         end
 
@@ -90,7 +90,7 @@ module Puppet::Network
             if detail.message.to_s =~ /^Wrong size\. Was \d+, should be \d+$/
                 Puppet.warning "XMLRPC returned wrong size.  Retrying."
                 return :retry
-            end    
+            end
             Puppet.err "Could not call %s.%s: %s" % [namespace, method, detail.inspect]
             error = XMLRPCClientError.new(detail.to_s)
             error.set_backtrace detail.backtrace
@@ -107,7 +107,7 @@ module Puppet::Network
                 if detail.message.include?(str)
                     Puppet.warning "Certificate validation failed; consider using the certname configuration option"
                 end
-            end 
+            end
             raise XMLRPCClientError, "Certificates were not trusted: %s" % detail
         end
 
@@ -185,7 +185,7 @@ module Puppet::Network
             )
             @http = Puppet::Network::HttpPool.http_instance(@host, @port)
         end
- 
+
         # Get rid of our existing connection, replacing it with a new one.
         # This should only happen if we lose our connection somehow (e.g., an EPIPE)
         # or we've just downloaded certs and we need to create new http instances
@@ -197,7 +197,7 @@ module Puppet::Network
             @http = nil
             self.http # force a new one
         end
-        
+
         def start
             begin
                 @http.start unless @http.started?

data/lib/puppet/network/xmlrpc/webrick_servlet.rb

@@ -42,7 +42,7 @@ module Puppet::Network::XMLRPC
         # we need to pass a ClientRequest object to process() so we can do
         # authorization.  It's the only way to stay thread-safe.
         def service(request, response)
-            if @valid_ip 
+            if @valid_ip
                 raise WEBrick::HTTPStatus::Forbidden unless @valid_ip.any? { |ip| request.peeraddr[3] =~ ip }
             end
 
@@ -51,9 +51,9 @@ module Puppet::Network::XMLRPC
                     "unsupported method `#{request.request_method}'."
             end
 
-            if parse_content_type(request['Content-type']).first != "text/xml" 
+            if parse_content_type(request['Content-type']).first != "text/xml"
                 raise WEBrick::HTTPStatus::BadRequest
-            end 
+            end
 
             length = (request['Content-length'] || 0).to_i
 
@@ -66,14 +66,14 @@ module Puppet::Network::XMLRPC
             end
 
             resp = process(data, client_request(request))
-            if resp.nil? or resp.size <= 0  
+            if resp.nil? or resp.size <= 0
                 raise WEBrick::HTTPStatus::InternalServerError
             end
 
             response.status = 200
             response['Content-Length'] = resp.size
             response['Content-Type']   = "text/xml; charset=utf-8"
-            response.body = resp 
+            response.body = resp
         end
 
         private
@@ -97,7 +97,7 @@ module Puppet::Network::XMLRPC
             if cert = request.client_cert
                 nameary = cert.subject.to_a.find { |ary|
                     ary[0] == "CN"
-                }   
+                }
 
                 if nameary.nil?
                     Puppet.warning "Could not retrieve server name from cert"

data/lib/puppet/node.rb

@@ -37,17 +37,6 @@ class Puppet::Node
         end
         @name = name
 
-        # Provide a default value.
-        if names = options[:names]
-            if names.is_a?(String)
-                @names = [names]
-            else
-                @names = names
-            end
-        else
-            @names = [name]
-        end
-
         if classes = options[:classes]
             if classes.is_a?(String)
                 @classes = [classes]
@@ -67,10 +56,14 @@ class Puppet::Node
 
     # Merge the node facts with parameters from the node source.
     def fact_merge
-        if facts = Puppet::Node::Facts.find(name)
-            merge(facts.values)
-        else
-            Puppet.warning "Could not find facts for %s; you probably have a discrepancy between the node and fact names" % name
+        begin
+            if facts = Puppet::Node::Facts.find(name)
+                merge(facts.values)
+            end
+        rescue => detail
+            error = Puppet::Error.new("Could not retrieve facts for %s: %s" % [name, detail])
+            error.set_backtrace(detail.backtrace)
+            raise error
         end
     end
 
@@ -79,13 +72,23 @@ class Puppet::Node
         params.each do |name, value|
             @parameters[name] = value unless @parameters.include?(name)
         end
+
+        @parameters["environment"] ||= self.environment if self.environment
     end
 
     # Calculate the list of names we might use for looking
     # up our node.  This is only used for AST nodes.
     def names
+        if Puppet.settings[:strict_hostname_checking]
+            return [name]
+        end
+
         names = []
 
+        if name.include?(".")
+            names += split_name(name)
+        end
+
         # First, get the fqdn
         unless fqdn = parameters["fqdn"]
             if parameters["hostname"] and parameters["domain"]
@@ -98,12 +101,7 @@ class Puppet::Node
         # Now that we (might) have the fqdn, add each piece to the name
         # list to search, in order of longest to shortest.
         if fqdn
-            list = fqdn.split(".")
-            tmp = []
-            list.each_with_index do |short, i|
-                tmp << list[0..i].join(".")
-            end
-            names += tmp.reverse
+            names += split_name(fqdn)
         end
 
         # And make sure the node name is first, since that's the most
@@ -117,4 +115,13 @@ class Puppet::Node
         end
         names.uniq
     end
+
+    def split_name(name)
+        list = name.split(".")
+        tmp = []
+        list.each_with_index do |short, i|
+            tmp << list[0..i].join(".")
+        end
+        tmp.reverse
+    end
 end

data/lib/puppet/node/environment.rb

@@ -1,6 +1,14 @@
+require 'puppet/util/cacher'
+
+# Just define it, so this class has fewer load dependencies.
+class Puppet::Node
+end
+
 # Model the environment that a node can operate in.  This class just
 # provides a simple wrapper for the functionality around environments.
 class Puppet::Node::Environment
+    include Puppet::Util::Cacher
+
     @seen = {}
 
     # Return an existing environment instance, or create a new one.
@@ -18,6 +26,11 @@ class Puppet::Node::Environment
         @seen[symbol] = obj
     end
 
+    # This is only used for testing.
+    def self.clear
+        @seen.clear
+    end
+
     attr_reader :name
 
     # Return an environment-specific setting.
@@ -28,4 +41,39 @@ class Puppet::Node::Environment
     def initialize(name)
         @name = name
     end
+
+    def module(name)
+        mod = Puppet::Module.new(name, self)
+        return nil unless mod.exist?
+        return mod
+    end
+
+    # Cache the modulepath, so that we aren't searching through
+    # all known directories all the time.
+    cached_attr(:modulepath, :ttl => Puppet[:filetimeout]) do
+        dirs = self[:modulepath].split(File::PATH_SEPARATOR)
+        if ENV["PUPPETLIB"]
+            dirs = ENV["PUPPETLIB"].split(File::PATH_SEPARATOR) + dirs
+        end
+        dirs.collect do |dir|
+            if dir !~ /^#{File::SEPARATOR}/
+                File.join(Dir.getwd, dir)
+            else
+                dir
+            end
+        end.find_all do |p|
+            p =~ /^#{File::SEPARATOR}/ && FileTest.directory?(p)
+        end
+    end
+
+    # Return all modules from this environment.
+    # Cache the list, because it can be expensive to create.
+    cached_attr(:modules, :ttl => Puppet[:filetimeout]) do
+        module_names = modulepath.collect { |path| Dir.entries(path) }.flatten.uniq
+        module_names.collect { |path| Puppet::Module.new(path, self) rescue nil }.compact
+    end
+
+    def to_s
+        name.to_s
+    end
 end

data/lib/puppet/node/facts.rb

@@ -21,6 +21,11 @@ class Puppet::Node::Facts
 
     attr_accessor :name, :values
 
+    def add_local_facts
+        values["clientversion"] = Puppet.version.to_s
+        values["environment"] ||= Puppet.settings[:environment]
+    end
+
     def initialize(name, values = {})
         @name = name
         @values = values
@@ -28,6 +33,22 @@ class Puppet::Node::Facts
         add_internal
     end
 
+    def downcase_if_necessary
+        return unless Puppet.settings[:downcasefacts]
+
+        Puppet.warning "DEPRECATION NOTICE: Fact downcasing is deprecated; please disable (20080122)"
+        values.each do |fact, value|
+            values[fact] = value.downcase if value.is_a?(String)
+        end
+    end
+
+    # Convert all fact values into strings.
+    def stringify
+        values.each do |fact, value|
+            values[fact] = value.to_s
+        end
+    end
+
     private
 
     # Add internal data to the facts for storage.