Merge branch 'master' into master_no_global_resources

Conflicts:

	lib/puppet/node/catalog.rb
	lib/puppet/type/pfile.rb
	lib/puppet/type/pfilebucket.rb
	lib/puppet/util/filetype.rb
	spec/unit/node/catalog.rb
	spec/unit/other/transbucket.rb
	spec/unit/ral/provider/mount/parsed.rb
	spec/unit/ral/types/file.rb
	spec/unit/ral/types/interface.rb
	spec/unit/ral/types/mount.rb
	spec/unit/ral/types/package.rb
	spec/unit/ral/types/schedule.rb
	spec/unit/ral/types/service.rb
	test/language/compile.rb
	test/language/lexer.rb
	test/language/snippets.rb
	test/lib/puppettest.rb
	test/ral/types/basic.rb
	test/ral/types/cron.rb
	test/ral/types/exec.rb
	test/ral/types/file.rb
	test/ral/types/file/target.rb
	test/ral/types/filebucket.rb
	test/ral/types/fileignoresource.rb
	test/ral/types/filesources.rb
	test/ral/types/group.rb
	test/ral/types/host.rb
	test/ral/types/parameter.rb
	test/ral/types/sshkey.rb
	test/ral/types/tidy.rb
	test/ral/types/user.rb
	test/ral/types/yumrepo.rb

13 files changed, 104 insertions, 139 deletions

diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb
index c16bef32f..cb1fdc57d 100755
--- a/lib/puppet/network/authstore.rb
+++ b/lib/puppet/network/authstore.rb
@@ -235,7 +235,8 @@ module Puppet
 
             # Convert the name to a common pattern.
             def munge_name(name)
-                name.downcase.split(".").reverse
+                # LAK:NOTE http://snurl.com/21zf8  [groups_google_com]
+                x = name.downcase.split(".").reverse
             end
 
             # Parse our input pattern and figure out what kind of allowal
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
index 283436e95..478883959 100644
--- a/lib/puppet/network/client.rb
+++ b/lib/puppet/network/client.rb
@@ -7,6 +7,8 @@ require 'puppet/util/subclass_loader'
 require 'puppet/util/methodhelper'
 require 'puppet/sslcertificates/support'
 
+require 'puppet/network/handler'
+
 require 'net/http'
 
 # Some versions of ruby don't have this method defined, which basically causes
@@ -94,10 +96,9 @@ class Puppet::Network::Client
             self.read_cert
 
             # We have to start the HTTP connection manually before we start
-            # sending it requests or keep-alive won't work.
-            if @driver.respond_to? :start
-                @driver.start
-            end
+            # sending it requests or keep-alive won't work.  Note that with #1010,
+            # we don't currently actually want keep-alive.
+            @driver.start if @driver.respond_to? :start and Puppet::Network::HttpPool.keep_alive?
 
             @local = false
         elsif hash.include?(driverparam)
@@ -107,8 +108,7 @@ class Puppet::Network::Client
             end
             @local = true
         else
-            raise Puppet::Network::ClientError, "%s must be passed a Server or %s" %
-                [self.class, driverparam]
+            raise Puppet::Network::ClientError, "%s must be passed a Server or %s" % [self.class, driverparam]
         end
     end
 
diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb
index a920afec6..4c7fa5f5b 100644
--- a/lib/puppet/network/client/master.rb
+++ b/lib/puppet/network/client/master.rb
@@ -26,28 +26,32 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         
         down = Puppet[:downcasefacts]
 
-        facts = {}
-        Facter.each { |name,fact|
+        facts = Facter.to_hash.inject({}) do |newhash, array|
+            name, fact = array
             if down
-                facts[name] = fact.to_s.downcase
+                newhash[name] = fact.to_s.downcase
             else
-                facts[name] = fact.to_s
+                newhash[name] = fact.to_s
             end
-        }
+            newhash
+        end
 
         # Add our client version to the list of facts, so people can use it
         # in their manifests
         facts["clientversion"] = Puppet.version.to_s
 
         # And add our environment as a fact.
-        facts["environment"] = Puppet[:environment]
-
+        unless facts.include?("environment")
+            facts["environment"] = Puppet[:environment]
+        end
+ 
         facts
     end
 
     # Return the list of dynamic facts as an array of symbols
     def self.dynamic_facts
-        Puppet.settings[:dynamicfacts].split(/\s*,\s*/).collect { |fact| fact.downcase }
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        x = Puppet.settings[:dynamicfacts].split(/\s*,\s*/).collect { |fact| fact.downcase }
     end
 
     # Cache the config
@@ -316,7 +320,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
             :group => Process.gid,
             :purge => true,
             :force => true,
-            :backup => false
+            :backup => false,
+            :noop => false
         }
 
         if args[:ignore]
@@ -327,9 +332,6 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         
         Puppet.info "Retrieving #{args[:name]}s"
 
-        noop = Puppet[:noop]
-        Puppet[:noop] = false
-
         files = []
         begin
             Timeout::timeout(self.timeout) do
@@ -351,14 +353,6 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
         downconfig.clear
 
         return files
-    ensure
-        # I can't imagine why this is necessary, but apparently at last one person has had problems with noop
-        # being nil here.
-        if noop.nil?
-            Puppet[:noop] = false
-        else
-            Puppet[:noop] = noop
-        end
     end
 
     # Retrieve facts from the central server.
@@ -431,7 +425,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client
     end
 
     def self.loadfacts
-        Puppet[:factpath].split(":").each do |dir|
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        x = Puppet[:factpath].split(":").each do |dir|
             loaddir(dir, "fact")
         end
     end
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index 3ee4721f3..183979429 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -5,6 +5,9 @@ require 'cgi'
 require 'delegate'
 require 'sync'
 
+require 'puppet/file_serving'
+require 'puppet/file_serving/metadata'
+
 class Puppet::Network::Handler
     AuthStoreError = Puppet::AuthStoreError
     class FileServerError < Puppet::Error; end
@@ -59,40 +62,27 @@ class Puppet::Network::Handler
 
         # Describe a given file.  This returns all of the manageable aspects
         # of that file.
-        def describe(url, links = :ignore, client = nil, clientip = nil)
+        def describe(url, links = :follow, client = nil, clientip = nil)
             links = links.intern if links.is_a? String
 
-            if links == :manage
-                raise Puppet::Network::Handler::FileServerError, "Cannot currently copy links"
-            end
-
             mount, path = convert(url, client, clientip)
 
-            if client
-                mount.debug "Describing %s for %s" % [url, client]
-            end
+            mount.debug("Describing %s for %s" % [url, client]) if client
 
-            obj = nil
-            unless obj = mount.getfileobject(path, links, client)
+            # use the mount to resolve the path for us.
+            metadata = Puppet::FileServing::Metadata.new(url, :path => mount.file_path(path, client), :links => links)
+
+            return "" unless metadata.exist?
+
+            begin
+                metadata.collect_attributes
+            rescue => detail
+                puts detail.backtrace if Puppet[:trace]
+                Puppet.err detail
                 return ""
             end
 
-            currentvalues = mount.check(obj)
-    
-            desc = []
-            CHECKPARAMS.each { |check|
-                if value = currentvalues[check]
-                    desc << value
-                else
-                    if check == "checksum" and currentvalues[:type] == "file"
-                        mount.notice "File %s does not have data for %s" %
-                            [obj.name, check]
-                    end
-                    desc << nil
-                end
-            }
-
-            return desc.join("\t")
+            return metadata.attributes_with_tabs
         end
 
         # Create a new fileserving module.
@@ -140,26 +130,18 @@ class Puppet::Network::Handler
         def list(url, links = :ignore, recurse = false, ignore = false, client = nil, clientip = nil)
             mount, path = convert(url, client, clientip)
 
-            if client
-                mount.debug "Listing %s for %s" % [url, client]
-            end
+            mount.debug "Listing %s for %s" % [url, client] if client
 
-            obj = nil
-            unless mount.path_exists?(path, client)
-                return ""
-            end
+            return "" unless mount.path_exists?(path, client)
 
             desc = mount.list(path, recurse, ignore, client)
 
             if desc.length == 0
-                mount.notice "Got no information on //%s/%s" %
-                    [mount, path]
+                mount.notice "Got no information on //%s/%s" % [mount, path]
                 return ""
             end
-            
-            desc.collect { |sub|
-                sub.join("\t")
-            }.join("\n")
+
+            desc.collect { |sub| sub.join("\t") }.join("\n")
         end
         
         def local?
@@ -213,12 +195,7 @@ class Puppet::Network::Handler
                 return ""
             end
 
-            str = nil
-            if links == :manage
-                raise Puppet::Error, "Cannot copy links yet."
-            else
-                str = mount.read_file(path, client)
-            end
+            str = mount.read_file(path, client)
 
             if @local
                 return str
@@ -452,55 +429,6 @@ class Puppet::Network::Handler
 
             Puppet::Util.logmethods(self, true)
 
-            def getfileobject(dir, links, client = nil)
-                unless path_exists?(dir, client)
-                    self.debug "File source %s does not exist" % dir
-                    return nil
-                end
-
-                return fileobj(dir, links, client)
-            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.
-
-                # 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)
-                        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
-                        data[:values] = properties(obj)
-                        return data[:values]
-                    end
-                else
-                    sync.synchronize(Sync::SH) do
-                        return data[:values]
-                    end
-                end
-            end
-
             # Create a map for a specific client.
             def clientmap(client)
                 {
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 8d84fe8b8..dabfaca50 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -82,6 +82,8 @@ class Puppet::Network::Handler
             if Puppet[:node_name] == 'cert'
                 if name
                     client = name
+                    facts["fqdn"] = client
+                    facts["hostname"], facts["domain"] = client.split('.', 2)
                 end
                 if ip
                     clientip = ip
diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb
index 8ddeed9f6..b92b77ea5 100755
--- a/lib/puppet/network/handler/report.rb
+++ b/lib/puppet/network/handler/report.rb
@@ -79,7 +79,8 @@ class Puppet::Network::Handler
 
         # Handle the parsing of the reports attribute.
         def reports
-            Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/)
+            # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+            x = Puppet[:reports].gsub(/(^\s+)|(\s+$)/, '').split(/\s*,\s*/)
         end
     end
 end
diff --git a/lib/puppet/network/http/mongrel/rest.rb b/lib/puppet/network/http/mongrel/rest.rb
index db63613ab..6c24e360c 100644
--- a/lib/puppet/network/http/mongrel/rest.rb
+++ b/lib/puppet/network/http/mongrel/rest.rb
@@ -14,11 +14,13 @@ class Puppet::Network::HTTP::MongrelREST < Puppet::Network::HTTP::Handler
     end
     
     def path(request)
-        '/' + request.params[Mongrel::Const::REQUEST_PATH].split('/')[1]
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        x = '/' + request.params[Mongrel::Const::REQUEST_PATH].split('/')[1]
     end
     
     def request_key(request)
-        request.params[Mongrel::Const::REQUEST_PATH].split('/')[2]        
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        x = request.params[Mongrel::Const::REQUEST_PATH].split('/')[2]        
     end
     
     def body(request)
diff --git a/lib/puppet/network/http/webrick/rest.rb b/lib/puppet/network/http/webrick/rest.rb
index dd0c84d61..8cda079e2 100644
--- a/lib/puppet/network/http/webrick/rest.rb
+++ b/lib/puppet/network/http/webrick/rest.rb
@@ -19,11 +19,13 @@ class Puppet::Network::HTTP::WEBrickREST < Puppet::Network::HTTP::Handler
     end
     
     def path(request)
-        '/' + request.path.split('/')[1]
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        x = '/' + request.path.split('/')[1]
     end
     
     def request_key(request)
-        request.path.split('/')[2]
+        # LAK:NOTE See http://snurl.com/21zf8  [groups_google_com] 
+        x = request.path.split('/')[2]
     end
     
     def body(request)
@@ -38,4 +40,4 @@ class Puppet::Network::HTTP::WEBrickREST < Puppet::Network::HTTP::Handler
         response.status = status
         response.body = result
     end
-end
\ No newline at end of file
+end
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
index 99f09a90c..9d37f2eeb 100644
--- a/lib/puppet/network/http_pool.rb
+++ b/lib/puppet/network/http_pool.rb
@@ -1,8 +1,20 @@
 require 'puppet/sslcertificates/support'
 require 'net/https'
 
+module Puppet::Network
+end
+
 # Manage Net::HTTP instances for keep-alive.
 module Puppet::Network::HttpPool
+    # 2008/03/23
+    # LAK:WARNING: Enabling this has a high propability of
+    # causing corrupt files and who knows what else.  See #1010.
+    HTTP_KEEP_ALIVE = false
+
+    def self.keep_alive?
+        HTTP_KEEP_ALIVE
+    end
+
     # This handles reading in the key and such-like.
     extend Puppet::SSLCertificates::Support
     @http_cache = {}
@@ -53,12 +65,14 @@ module Puppet::Network::HttpPool
 
         # Return our cached instance if we've got a cache, as long as we're not
         # resetting the instance.
-        return @http_cache[key] if ! reset and @http_cache[key]
+        if keep_alive?
+            return @http_cache[key] if ! reset and @http_cache[key]
 
-        # Clean up old connections if we have them.
-        if http = @http_cache[key]
-            @http_cache.delete(key)
-            http.finish if http.started?
+            # Clean up old connections if we have them.
+            if http = @http_cache[key]
+                @http_cache.delete(key)
+                http.finish if http.started?
+            end
         end
 
         args = [host, port]
@@ -85,7 +99,7 @@ module Puppet::Network::HttpPool
 
         cert_setup(http)
 
-        @http_cache[key] = http
+        @http_cache[key] = http if keep_alive?
 
         return http
     end
diff --git a/lib/puppet/network/http_server/mongrel.rb b/lib/puppet/network/http_server/mongrel.rb
index d6e21b189..6b2325d29 100644
--- a/lib/puppet/network/http_server/mongrel.rb
+++ b/lib/puppet/network/http_server/mongrel.rb
@@ -33,6 +33,7 @@ require 'xmlrpc/server'
 require 'puppet/network/xmlrpc/server'
 require 'puppet/network/http_server'
 require 'puppet/network/client_request'
+require 'puppet/network/handler'
 require 'puppet/daemon'
 
 require 'resolv'
@@ -127,7 +128,12 @@ module Puppet::Network
                 client = dn_matchdata[1].to_str
                 valid = (params[Puppet[:ssl_client_verify_header]] == 'SUCCESS')
             else
-                client = Resolv.getname(ip)
+                begin
+                    client = Resolv.getname(ip)
+                rescue => detail
+                    Puppet.err "Could not resolve %s: %s" % [ip, detail]
+                    client = "unknown"
+                end
                 valid = false
             end
 
diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb
index 3c9f72e17..568b4e798 100644
--- a/lib/puppet/network/http_server/webrick.rb
+++ b/lib/puppet/network/http_server/webrick.rb
@@ -8,6 +8,7 @@ require 'puppet/sslcertificates/support'
 require 'puppet/network/xmlrpc/webrick_servlet'
 require 'puppet/network/http_server'
 require 'puppet/network/client'
+require 'puppet/network/handler'
 
 module Puppet
     class ServerError < RuntimeError; end
@@ -22,12 +23,12 @@ module Puppet
             # with them, with flags appropriate for checking client 
             # certificates for revocation
             def x509store
-                if Puppet[:cacrl] == 'none'
+                if Puppet[:cacrl] == 'false'
                     # No CRL, no store needed
                     return nil
                 end
                 unless File.exist?(Puppet[:cacrl])
-                    raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'none' to disable CRL usage"
+                    raise Puppet::Error, "Could not find CRL; set 'cacrl' to 'false' to disable CRL usage"
                 end
                 crl = OpenSSL::X509::CRL.new(File.read(Puppet[:cacrl]))
                 store = OpenSSL::X509::Store.new
@@ -133,7 +134,7 @@ module Puppet
 
                 handlers.collect { |handler, args|
                     hclass = nil
-                    unless hclass = Handler.handler(handler)
+                    unless hclass = Puppet::Network::Handler.handler(handler)
                         raise ServerError, "Invalid handler %s" % handler
                     end
                     hclass.new(args)
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index 50e3bd686..f2c8dc18c 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -1,3 +1,5 @@
+require 'puppet/network/http'
+
 class Puppet::Network::Server
 	attr_reader :server_type, :protocols, :address, :port
 
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index 27bb3dc5e..f6a5e8db6 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -90,6 +90,13 @@ module Puppet::Network
             @clients[handler] || self.mkclient(handler)
         end
 
+        def http
+            unless @http
+                @http = Puppet::Network::HttpPool.http_instance(@host, @port, true)
+            end
+            @http
+        end
+
         def initialize(hash = {})
             hash[:Path] ||= "/RPC2"
             hash[:Server] ||= Puppet[:server]
@@ -125,7 +132,11 @@ module Puppet::Network
         end
         
         def start
-            @http.start unless @http.started?
+            begin
+                @http.start unless @http.started?
+            rescue => detail
+                Puppet.err "Could not connect to server: %s" % detail
+            end
         end
 
         def local