puppet 0.18.4 → 0.22.4

data/lib/puppet/{client → network/client}/proxy.rb

@@ -1,9 +1,9 @@
 # unlike the other client classes (again, this design sucks) this class
 # is basically just a proxy class -- it calls its methods on the driver
 # and that's about it
-class Puppet::Client::ProxyClient < Puppet::Client
+class Puppet::Network::Client::ProxyClient < Puppet::Network::Client
     def self.mkmethods
-        interface = @handler.interface
+        interface = self.handler.interface
         namespace = interface.prefix
 
 
@@ -25,4 +25,4 @@ class Puppet::Client::ProxyClient < Puppet::Client
     end
 end
 
-# $Id: proxy.rb 1145 2006-04-28 04:08:38Z luke $
+# $Id: proxy.rb 2259 2007-03-06 19:03:05Z luke $

data/lib/puppet/{client/reporter.rb → network/client/report.rb}

@@ -1,12 +1,9 @@
-class Puppet::Client::Reporter < Puppet::Client
-    @drivername = :Report
-
-    # set up the appropriate interface methods
-    @handler = Puppet::Server::Report
+class Puppet::Network::Client::Report < Puppet::Network::Client
+    @handler = Puppet::Network::Handler.handler(:report)
 
     def initialize(hash = {})
         if hash.include?(:Report)
-            hash[:Report] = Puppet::Server::Report.new()
+            hash[:Report] = self.class.handler.new
         end
 
         super(hash)
@@ -31,4 +28,4 @@ class Puppet::Client::Reporter < Puppet::Client
     end
 end
 
-# $Id: reporter.rb 1422 2006-07-22 03:32:56Z luke $
+# $Id: report.rb 2259 2007-03-06 19:03:05Z luke $

data/lib/puppet/{client/pelement.rb → network/client/resource.rb}

@@ -1,17 +1,14 @@
-class Puppet::Client::PElement < Puppet::Client
-    @drivername = :PElementServer
-
-    @handler = Puppet::Server::PElement
-
+# The client for interacting with remote Puppet agents to query and modify
+# remote system state.
+class Puppet::Network::Client::Resource < Puppet::Network::Client
     def apply(bucket)
-
         case bucket
         when Puppet::TransObject
             tmp = Puppet::TransBucket.new
             tmp.push bucket
             bucket = tmp
             bucket.name = Facter["hostname"].value
-            bucket.type = "pelement"
+            bucket.type = "resource"
         when Puppet::TransBucket
             # nothing
         else
@@ -28,7 +25,7 @@ class Puppet::Client::PElement < Puppet::Client
     end
 
     def describe(type, name, retrieve = false, ignore = false)
-        Puppet.info "Describing %s[%s]" % [type, name]
+        Puppet.info "Describing %s[%s]" % [type.to_s.capitalize, name]
         text = @driver.describe(type, name, retrieve, ignore, "yaml")
 
         object = nil
@@ -41,16 +38,6 @@ class Puppet::Client::PElement < Puppet::Client
         return object
     end
 
-    def initialize(hash = {})
-        if hash.include?(:PElementServer)
-            unless hash[:PElementServer].is_a?(Puppet::Server::PElement)
-                raise Puppet::DevError, "Must pass an actual PElement server object"
-            end
-        end
-
-        super(hash)
-    end
-
     def list(type, ignore = false, base = false)
         bucket = @driver.list(type, ignore, base, "yaml")
 
@@ -62,4 +49,4 @@ class Puppet::Client::PElement < Puppet::Client
     end
 end
 
-# $Id: pelement.rb 1145 2006-04-28 04:08:38Z luke $
+# $Id: resource.rb 2259 2007-03-06 19:03:05Z luke $

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

@@ -0,0 +1,13 @@
+class Puppet::Network::Client::Runner < Puppet::Network::Client::ProxyClient
+    self.mkmethods
+
+    def initialize(hash = {})
+        if hash.include?(:Runner)
+            hash[:Runner] = self.class.handler.new()
+        end
+
+        super(hash)
+    end
+end
+
+# $Id: runner.rb 2259 2007-03-06 19:03:05Z luke $

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

@@ -0,0 +1,5 @@
+class Puppet::Network::Client::Status < Puppet::Network::Client::ProxyClient
+    self.mkmethods
+end
+
+# $Id: status.rb 2259 2007-03-06 19:03:05Z luke $

data/lib/puppet/network/client_request.rb

@@ -0,0 +1,32 @@
+module Puppet::Network # :nodoc:
+    # A struct-like class for passing around a client request.  It's mostly
+    # just used for validation and authorization.
+    class ClientRequest
+        attr_accessor :name, :ip, :authenticated, :handler, :method
+
+        def authenticated?
+            self.authenticated
+        end
+
+        # A common way of talking about the full call.  Individual servers
+        # are responsible for setting the values correctly, but this common
+        # format makes it possible to check rights.
+        def call
+            unless handler and method
+                raise ArgumentError, "Request is not set up; cannot build call"
+            end
+
+            [handler, method].join(".")
+        end
+
+        def initialize(name, ip, authenticated)
+            @name, @ip, @authenticated = name, ip, authenticated
+        end
+
+        def to_s
+            "%s(%s)" % [self.name, self.ip]
+        end
+    end
+end
+
+# $Id: client_request.rb 2259 2007-03-06 19:03:05Z luke $

data/lib/puppet/network/handler.rb

@@ -0,0 +1,33 @@
+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
+        # This is so that the handlers can subclass just 'Handler', rather
+        # then having to specify the full class path.
+        Handler = self
+        attr_accessor :server
+
+        extend Puppet::Util::SubclassLoader
+        extend Puppet::Util
+
+        handle_subclasses :handler, "puppet/network/handler"
+
+        # Return the xmlrpc interface.
+        def self.interface
+            if defined? @interface
+                return @interface
+            else
+                raise Puppet::DevError, "Handler %s has no defined interface" %
+                    self
+            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 $

data/lib/puppet/{server → network/handler}/ca.rb

@@ -6,9 +6,7 @@ require 'xmlrpc/server'
 # Much of this was taken from QuickCert:
 #   http://segment7.net/projects/ruby/QuickCert/
 
-module Puppet
-class Server
-    class CAError < Puppet::Error; end
+class Puppet::Network::Handler
     class CA < Handler
         attr_reader :ca
 
@@ -44,9 +42,11 @@ class Server
                 end
                 return false
             end
-            auth = Puppet::Server::AuthStore.new
+            auth = Puppet::Network::AuthStore.new
             File.open(autosign) { |f|
                 f.each { |line|
+                    next if line =~ /^\s*#/
+                    next if line =~ /^\s*$/
                     auth.allow(line.chomp)
                 }
             }
@@ -148,6 +148,5 @@ class Server
         end
     end
 end
-end
 
-# $Id: ca.rb 1414 2006-07-21 15:20:44Z luke $
+# $Id: ca.rb 2259 2007-03-06 19:03:05Z luke $

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

@@ -0,0 +1,180 @@
+require 'fileutils'
+require 'digest/md5'
+require 'puppet/external/base64'
+
+class Puppet::Network::Handler # :nodoc:
+    class BucketError < RuntimeError; end
+    # Accept files and store them by md5 sum, returning the md5 sum back
+    # to the client.  Alternatively, accept an md5 sum and return the
+    # associated content.
+    class FileBucket < Handler
+        @interface = XMLRPC::Service::Interface.new("puppetbucket") { |iface|
+            iface.add_method("string addfile(string, string)")
+            iface.add_method("string getfile(string)")
+        }
+
+        Puppet::Util.logmethods(self, true)
+        attr_reader :name, :path
+
+        # this doesn't work for relative paths
+        def self.oldpaths(base,md5)
+            return [
+                File.join(base, md5),
+                File.join(base, md5, "contents"),
+                File.join(base, md5, "paths")
+            ]
+        end
+
+        # this doesn't work for relative paths
+        def self.paths(base,md5)
+            dir = File.join(md5[0..7].split(""))
+            basedir = File.join(base, dir, md5)
+            return [
+                basedir,
+                File.join(basedir, "contents"),
+                File.join(basedir, "paths")
+            ]
+        end
+
+        # Should we check each file as it comes in to make sure the md5
+        # sums match?  Defaults to false.
+        def conflict_check?
+            @confictchk
+        end
+
+        def initialize(hash)
+            if hash.include?(:ConflictCheck)
+                @conflictchk = hash[:ConflictCheck]
+                hash.delete(:ConflictCheck)
+            else
+                @conflictchk = false
+            end
+
+            if hash.include?(:Path)
+                @path = hash[:Path]
+                hash.delete(:Path)
+            else
+                if defined? Puppet
+                    @path = Puppet[:bucketdir]
+                else
+                    @path = File.expand_path("~/.filebucket")
+                end
+            end
+
+            Puppet.config.use(:filebucket)
+
+            @name = "Filebucket[#{@path}]"
+        end
+
+        # Accept a file from a client and store it by md5 sum, returning
+        # the sum.
+        def addfile(contents, path, client = nil, clientip = nil)
+            if client
+                contents = Base64.decode64(contents)
+            end
+            md5 = Digest::MD5.hexdigest(contents)
+
+            bpath, bfile, pathpath = FileBucket.paths(@path,md5)
+
+            # If the file already exists, just return the md5 sum.
+            if FileTest.exists?(bfile)
+                # If verification is enabled, then make sure the text matches.
+                if conflict_check?
+                    verify(contents, md5, bfile)
+                end
+                return md5
+            end
+
+            # Make the directories if necessary.
+            unless FileTest.directory?(bpath)
+                Puppet::Util.withumask(0007) do
+                    FileUtils.mkdir_p(bpath)
+                end
+            end
+
+            # Write the file to disk.
+            msg = "Adding %s(%s)" % [path, md5]
+            msg += " from #{client}" if client
+            self.info msg
+
+            # ...then just create the file
+            Puppet::Util.withumask(0007) do
+                File.open(bfile, File::WRONLY|File::CREAT, 0440) { |of|
+                    of.print contents
+                }
+            end
+
+            # Write the path to the paths file.
+            add_path(path, pathpath)
+
+            return md5
+        end
+
+        # Return the contents associated with a given md5 sum.
+        def getfile(md5, client = nil, clientip = nil)
+            bpath, bfile, bpaths = FileBucket.paths(@path,md5)
+
+            unless FileTest.exists?(bfile)
+                # Try the old flat style.
+                bpath, bfile, bpaths = FileBucket.oldpaths(@path,md5)
+                unless FileTest.exists?(bfile)
+                    return false
+                end
+            end
+
+            contents = nil
+            File.open(bfile) { |of|
+                contents = of.read
+            }
+            
+            if client
+                return Base64.encode64(contents)
+            else
+                return contents
+            end
+        end
+
+        def paths(md5)
+            self.class(@path, md5)
+        end
+
+        def to_s
+            self.name
+        end
+
+        private
+
+        # Add our path to the paths file if necessary.
+        def add_path(path, file)
+            if FileTest.exists?(file)
+                File.open(file) { |of|
+                    return if of.readlines.collect { |l| l.chomp }.include?(path)
+                }
+            end
+
+            # if it's a new file, or if our path isn't in the file yet, add it
+            File.open(file, File::WRONLY|File::CREAT|File::APPEND) { |of|
+                of.puts path
+            }
+        end
+
+        # If conflict_check is enabled, verify that the passed text is
+        # the same as the text in our file.
+        def verify(content, md5, bfile)
+            curfile = File.read(bfile)
+
+            # If the contents don't match, then we've found a conflict.
+            # Unlikely, but quite bad.
+            if curfile != contents
+                raise(BucketError,
+                    "Got passed new contents for sum %s" % md5, caller)
+            else
+                msg = "Got duplicate %s(%s)" % [path, md5]
+                msg += " from #{client}" if client
+                self.info msg
+            end
+        end
+    end
+end
+
+# $Id: filebucket.rb 2348 2007-03-24 21:16:20Z luke $

data/lib/puppet/{server → network/handler}/fileserver.rb

@@ -1,75 +1,59 @@
 require 'puppet'
+require 'puppet/network/authstore'
 require 'webrick/httpstatus'
 require 'cgi'
+require 'delegate'
 
-module Puppet
-class FileServerError < Puppet::Error; end
-class Server
+class Puppet::Network::Handler
+    class FileServerError < Puppet::Error; end
     class FileServer < Handler
         attr_accessor :local
 
-        Puppet.setdefaults("fileserver",
-            :fileserverconfig => ["$confdir/fileserver.conf",
-                "Where the fileserver configuration is stored."])
-
-        #CHECKPARAMS = %w{checksum type mode owner group}
         CHECKPARAMS = [:mode, :type, :owner, :group, :checksum]
 
+        # Special filserver module for puppet's module system
+        MODULES = "modules"
+
         @interface = XMLRPC::Service::Interface.new("fileserver") { |iface|
             iface.add_method("string describe(string, string)")
             iface.add_method("string list(string, string, boolean, array)")
             iface.add_method("string retrieve(string, string)")
         }
 
-        def authcheck(file, mount, client, clientip)
-            unless mount.allowed?(client, clientip)
-                mount.warning "%s cannot access %s" %
-                    [client, file]
-                raise Puppet::Server::AuthorizationError, "Cannot access %s" % mount
-            end
+        def self.params
+            CHECKPARAMS.dup
         end
 
         # Describe a given file.  This returns all of the manageable aspects
         # of that file.
-        def describe(file, links = :ignore, client = nil, clientip = nil)
-            readconfig
-
+        def describe(url, links = :ignore, client = nil, clientip = nil)
             links = links.intern if links.is_a? String
 
             if links == :manage
-                raise Puppet::FileServerError, "Cannot currently copy links"
+                raise Puppet::Network::Handler::FileServerError, "Cannot currently copy links"
             end
 
-            mount, path = splitpath(file)
-
-            authcheck(file, mount, client, clientip)
+            mount, path = convert(url, client, clientip)
 
             if client
-                mount.debug "Describing %s for %s" % [file, client]
-            end
-
-            sdir = nil
-            unless sdir = subdir(mount, path)
-                mount.notice "Could not find subdirectory %s" %
-                    "//%s/%s" % [mount, path]
-                return ""
+                mount.debug "Describing %s for %s" % [url, client]
             end
 
             obj = nil
-            unless obj = mount.check(sdir, links)
+            unless obj = mount.check(path, links)
                 return ""
             end
 
             desc = []
             CHECKPARAMS.each { |check|
-                if state = obj.state(check)
-                    unless state.is
+                if property = obj.property(check)
+                    unless property.is
                         mount.debug "Manually retrieving info for %s" % check
-                        state.retrieve
+                        property.retrieve
                     end
-                    desc << state.is
+                    desc << property.is
                 else
-                    if check == "checksum" and obj.state(:type).is == "file"
+                    if check == "checksum" and obj.property(:type).is == "file"
                         mount.notice "File %s does not have data for %s" %
                             [obj.name, check]
                     end
@@ -80,16 +64,6 @@ class Server
             return desc.join("\t")
         end
 
-        # Deal with ignore parameters.
-        def handleignore(children, path, ignore)            
-            ignore.each { |ignore|                
-                Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match|
-                    children.delete(File.basename(match))
-                }                
-            }
-            return children
-        end  
-
         # Create a new fileserving module.
         def initialize(hash = {})
             @mounts = {}
@@ -104,14 +78,12 @@ class Server
             if hash[:Config] == false
                 @noreadconfig = true
             else
-                @config = hash[:Config] || Puppet[:fileserverconfig]
+                @config = Puppet::Util::LoadedFile.new(
+                    hash[:Config] || Puppet[:fileserverconfig]
+                )
                 @noreadconfig = false
             end
 
-            @configtimeout = hash[:ConfigTimeout] || 60
-            @configstamp = nil
-            @congigstatted = nil
-
             if hash.include?(:Mount)
                 @passedconfig = true
                 unless hash[:Mount].is_a?(Hash)
@@ -126,35 +98,26 @@ class Server
                 }
             else
                 @passedconfig = false
-                readconfig
+                readconfig(false) # don't check the file the first time.
             end
         end
 
         # List a specific directory's contents.
-        def list(dir, links = :ignore, recurse = false, ignore = false, client = nil, clientip = nil)
-            readconfig
-            mount, path = splitpath(dir)
-
-            authcheck(dir, mount, client, clientip)
+        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" % [dir, client]
-            end
-
-            subdir = nil
-            unless subdir = subdir(mount, path)
-                mount.notice "Could not find subdirectory %s" %
-                    "%s:%s" % [mount, path]
-                return ""
+                mount.debug "Listing %s for %s" % [url, client]
             end
 
             obj = nil
-            unless FileTest.exists?(subdir)
+            unless FileTest.exists?(path)
                 return ""
             end
 
-            rmdir = expand_mount(dir, mount)
-            desc = reclist(mount, rmdir, subdir, recurse, ignore)
+            # We pass two paths here, but reclist internally changes one
+            # of the arguments when called internally.
+            desc = reclist(mount, path, path, recurse, ignore)
 
             if desc.length == 0
                 mount.notice "Got no information on //%s/%s" %
@@ -166,6 +129,10 @@ class Server
                 sub.join("\t")
             }.join("\n")
         end
+        
+        def local?
+            self.local
+        end
 
         # Mount a new directory with a name.
         def mount(path, name)
@@ -179,51 +146,118 @@ class Server
                 end
             end
 
-            if FileTest.directory?(path)
-                if FileTest.readable?(path)
-                    @mounts[name] = Mount.new(name, path)
-                    @mounts[name].info "Mounted %s" % path
-                else
-                    raise FileServerError, "%s is not readable" % path
-                end
+            # Let the mounts do their own error-checking.
+            @mounts[name] = Mount.new(name, path)
+            @mounts[name].info "Mounted %s" % path
+
+            return @mounts[name]
+        end
+
+        # Retrieve a file from the local disk and pass it to the remote
+        # client.
+        def retrieve(url, links = :ignore, client = nil, clientip = nil)
+            links = links.intern if links.is_a? String
+
+            mount, path = convert(url, client, clientip)
+
+            if client
+                mount.info "Sending %s to %s" % [url, client]
+            end
+
+            unless FileTest.exists?(path)
+                return ""
+            end
+
+            links = links.intern if links.is_a? String
+
+            if links == :ignore and FileTest.symlink?(path)
+                return ""
+            end
+
+            str = nil
+            if links == :manage
+                raise Puppet::Error, "Cannot copy links yet."
             else
-                raise FileServerError, "%s is not a directory" % path
+                str = File.read(path)
+            end
+
+            if @local
+                return str
+            else
+                return CGI.escape(str)
+            end
+        end
+
+        def umount(name)
+            @mounts.delete(name) if @mounts.include? name
+        end
+
+        private
+
+        def authcheck(file, mount, client, clientip)
+            # If we're local, don't bother passing in information.
+            if local?
+                client = nil
+                clientip = nil
+            end
+            unless mount.allowed?(client, clientip)
+                mount.warning "%s cannot access %s" %
+                    [client, file]
+                raise Puppet::AuthorizationError, "Cannot access %s" % mount
             end
         end
 
+        def convert(url, client, clientip)
+            readconfig
+
+            url = URI.unescape(url)
+
+            mount, stub = splitpath(url, client)
+
+            authcheck(url, mount, client, clientip)
+
+            path = nil
+            unless path = mount.subdir(stub, client)
+                mount.notice "Could not find subdirectory %s" %
+                    "//%s/%s" % [mount, stub]
+                return ""
+            end
+
+            return mount, path
+        end
+
+        # Deal with ignore parameters.
+        def handleignore(children, path, ignore)            
+            ignore.each { |ignore|                
+                Dir.glob(File.join(path,ignore), File::FNM_DOTMATCH) { |match|
+                    children.delete(File.basename(match))
+                }                
+            }
+            return children
+        end  
+
         # Read the configuration file.
-        def readconfig
+        def readconfig(check = true)
             return if @noreadconfig
 
-            if @configstamp and FileTest.exists?(@config)
-                if @configtimeout and @configstatted
-                    if Time.now - @configstatted > @configtimeout
-                        @configstatted = Time.now
-                        tmp = File.stat(@config).ctime
-
-                        if tmp == @configstamp
-                            return
-                        end
-                    else
-                        return
-                    end
-                end
+            if check and ! @config.changed?
+                return
             end
 
             newmounts = {}
             begin
-                File.open(@config) { |f|
+                File.open(@config.file) { |f|
                     mount = nil
                     count = 1
                     f.each { |line|
                         case line
                         when /^\s*#/: next # skip comments
                         when /^\s*$/: next # skip blank lines
-                        when /\[(\w+)\]/:
+                        when /\[([-\w]+)\]/:
                             name = $1
                             if newmounts.include?(name)
                                 raise FileServerError, "%s is already mounted at %s" %
-                                    [newmounts[name], name]
+                                    [newmounts[name], name], count, @config.file
                             end
                             mount = Mount.new(name)
                             newmounts[name] = mount
@@ -232,12 +266,16 @@ class Server
                             value = $2
                             case var
                             when "path":
-                                begin
-                                    mount.path = value
-                                rescue FileServerError => detail
-                                    Puppet.err "Removing mount %s: %s" %
-                                        [mount.name, detail]
-                                    newmounts.delete(mount.name)
+                                if mount.name == MODULES
+                                    Puppet.warning "The '#{MODULES}' module can not have a path. Ignoring attempt to set it"
+                                else
+                                    begin
+                                        mount.path = value
+                                    rescue FileServerError => detail
+                                        Puppet.err "Removing mount %s: %s" %
+                                            [mount.name, detail]
+                                        newmounts.delete(mount.name)
+                                    end
                                 end
                             when "allow":
                                 value.split(/\s*,\s*/).each { |val|
@@ -245,8 +283,8 @@ class Server
                                         mount.info "allowing %s access" % val
                                         mount.allow(val)
                                     rescue AuthStoreError => detail
-                                        raise FileServerError, "%s at line %s of %s" %
-                                            [detail.to_s, count, @config]
+                                        raise FileServerError.new(detail.to_s,
+                                            count, @config.file)
                                     end
                                 }
                             when "deny":
@@ -255,16 +293,17 @@ class Server
                                         mount.info "denying %s access" % val
                                         mount.deny(val)
                                     rescue AuthStoreError => detail
-                                        raise FileServerError, "%s at line %s of %s" %
-                                            [detail.to_s, count, @config]
+                                        raise FileServerError.new(detail.to_s,
+                                            count, @config.file)
                                     end
                                 }
                             else
-                                raise FileServerError,
-                                    "Invalid argument '%s' at line %s" % [var, count]
+                                raise FileServerError.new("Invalid argument '%s'" % var,
+                                    count, @config.file)
                             end
                         else
-                            raise FileServerError, "Invalid line %s: %s" % [count, line]
+                            raise FileServerError.new("Invalid line '%s'" % line.chomp,
+                                count, @config.file)
                         end
                         count += 1
                     }
@@ -280,72 +319,22 @@ class Server
             #    Puppet.err "FileServer error: %s" % detail
             end
 
+            unless newmounts[MODULES]
+                mount = Mount.new(MODULES)
+                mount.allow("*")
+                newmounts[MODULES] = mount
+            end
+
             # Verify each of the mounts are valid.
             # We let the check raise an error, so that it can raise an error
             # pointing to the specific problem.
             newmounts.each { |name, mount|
-                mount.valid?
+                unless mount.valid?
+                    raise FileServerError, "No path specified for mount %s" %
+                        name
+                end
             }
             @mounts = newmounts
-
-            @configstamp = File.stat(@config).ctime
-            @configstatted = Time.now
-        end
-
-        # Retrieve a file from the local disk and pass it to the remote
-        # client.
-        def retrieve(file, links = :ignore, client = nil, clientip = nil)
-            readconfig
-            links = links.intern if links.is_a? String
-            mount, path = splitpath(file)
-
-            authcheck(file, mount, client, clientip)
-
-            if client
-                mount.info "Sending %s to %s" % [file, client]
-            end
-
-            fpath = nil
-            if path
-                fpath = File.join(mount.path, path)
-            else
-                fpath = mount.path
-            end
-
-            unless FileTest.exists?(fpath)
-                return ""
-            end
-
-            links = links.intern if links.is_a? String
-
-            if links == :ignore and FileTest.symlink?(fpath)
-                return ""
-            end
-
-            str = nil
-            if links == :manage
-                raise Puppet::Error, "Cannot copy links yet."
-            else
-                str = File.read(fpath)
-            end
-
-            if @local
-                return str
-            else
-                return CGI.escape(str)
-            end
-        end
-
-        private
-
-        # Convert from the '/mount/path' form to the real path on disk.
-        def expand_mount(name, mount)
-            # Note that the user could have passed a path with multiple /'s
-            # in it, and we are likely to result in multiples, so we have to
-            # get rid of all of them.
-            name.sub(/\/#{mount.name}/, mount.path).gsub(%r{/+}, '/').sub(
-                %r{/$}, ''
-            )
         end
 
         # Recursively list the directory. FIXME This should be using
@@ -390,26 +379,23 @@ class Server
         end
 
         # Split the path into the separate mount point and path.
-        def splitpath(dir)
+        def splitpath(dir, client)
             # the dir is based on one of the mounts
             # so first retrieve the mount path
             mount = nil
             path = nil
-            if dir =~ %r{/(\w+)/?}
-                mount = $1
-                path = dir.sub(%r{/#{mount}/?}, '')
-
-                unless @mounts.include?(mount)
-                    raise FileServerError, "Fileserver module '%s' not mounted" % mount
-                end
+            if dir =~ %r{/([-\w]+)/?}
+                tmp = $1
+                path = dir.sub(%r{/#{tmp}/?}, '')
 
-                unless @mounts[mount].path
-                    raise FileServerError,
-                        "Fileserver error: Mount '%s' does not have a path set" % mount
+                mod = Puppet::Module::find(tmp)
+                if mod
+                    mount = @mounts[MODULES].copy(mod, mod.files)
+                else
+                    unless mount = @mounts[tmp]
+                        raise FileServerError, "Fileserver module '%s' not mounted" % tmp
+                    end
                 end
-
-                # And now replace the name with the actual object.
-                mount = @mounts[mount]
             else
                 raise FileServerError, "Fileserver error: Invalid path '%s'" % dir
             end
@@ -424,20 +410,6 @@ class Server
             return mount, path
         end
 
-        # Retrieve a specific directory relative to a mount point.
-        def subdir(mount, dir)
-            basedir = mount.path
-
-            dirname = nil
-            if dir
-                dirname = File.join(basedir, dir.split("/").join(File::SEPARATOR))
-            else
-                dirname = basedir
-            end
-
-            dirname
-        end
-
         def to_s
             "fileserver"
         end
@@ -445,8 +417,8 @@ class Server
         # A simple class for wrapping mount points.  Instances of this class
         # don't know about the enclosing object; they're mainly just used for
         # authorization.
-        class Mount < AuthStore
-            attr_reader :path, :name
+        class Mount < Puppet::Network::AuthStore
+            attr_reader :name
 
             Puppet::Util.logmethods(self, true)
 
@@ -475,9 +447,50 @@ class Server
                 return obj
             end
 
-            # Create out orbject.  It must have a name.
+            # Create a map for a specific client.
+            def clientmap(client)
+                {
+                    "h" => client.sub(/\..*$/, ""), 
+                    "H" => client,
+                    "d" => client.sub(/[^.]+\./, "") # domain name
+                }
+            end
+
+            # Replace % patterns as appropriate.
+            def expand(path, client = nil)
+                # This map should probably be moved into a method.
+                map = nil
+
+                if client
+                    map = clientmap(client)
+                else
+                    Puppet.notice "No client; expanding '%s' with local host" %
+                        path
+                    # Else, use the local information
+                    map = localmap()
+                end
+                path.gsub(/%(.)/) do |v|
+                    key = $1
+                    if key == "%" 
+                        "%"
+                    else
+                        map[key] || v
+                    end
+                end
+            end
+
+            # Do we have any patterns in our path, yo?
+            def expandable?
+                if defined? @expandable
+                    @expandable
+                else
+                    false
+                end
+            end
+
+            # Create out object.  It must have a name.
             def initialize(name, path = nil)
-                unless name =~ %r{^\w+$}
+                unless name =~ %r{^[-\w]+$}
                     raise FileServerError, "Invalid name format '%s'" % name
                 end
                 @name = name
@@ -488,12 +501,6 @@ class Server
                     @path = nil
                 end
 
-                @comp = Puppet.type(:component).create(
-                    :name => "mount[#{name}]"
-                )
-                #@comp.type = "mount"
-                #@comp.name = name
-
                 super()
             end
 
@@ -510,8 +517,6 @@ class Server
                         :name => path,
                         :check => CHECKPARAMS
                     )
-
-                    @comp.push(obj)
                 end
 
                 if links == :manage
@@ -526,36 +531,89 @@ class Server
                 return obj
             end
 
+            # Cache this manufactured map, since if it's used it's likely
+            # to get used a lot.
+            def localmap
+                unless defined? @@localmap
+                    @@localmap = {
+                        "h" =>  Facter.value("hostname"),
+                        "H" => [Facter.value("hostname"),
+                                Facter.value("domain")].join("."),
+                        "d" =>  Facter.value("domain")
+                    }
+                end
+                @@localmap
+            end
+
+            # Return the path as appropriate, expanding as necessary.
+            def path(client = nil)
+                if expandable?
+                    return expand(@path, client)
+                else
+                    return @path
+                end
+            end
+
             # Set the path.
             def path=(path)
-                unless FileTest.exists?(path)
-                    raise FileServerError, "%s does not exist" % path
+                # FIXME: For now, just don't validate paths with replacement
+                # patterns in them.
+                if path =~ /%./
+                    # Mark that we're expandable.
+                    @expandable = true
+                else
+                    unless FileTest.exists?(path)
+                        raise FileServerError, "%s does not exist" % path
+                    end
+                    unless FileTest.directory?(path)
+                        raise FileServerError, "%s is not a directory" % path
+                    end
+                    unless FileTest.readable?(path)
+                        raise FileServerError, "%s is not readable" % path
+                    end
+                    @expandable = false
                 end
                 @path = path
             end
 
-            def to_s
-                #if @path
-                #    "mount[#{@name}]" + ":" + @path
-                #else
-                #    "mount[#{@name}]"
-                #end
-                "mount[#{@name}]"
+            # 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)
+                basedir = self.path(client)
+
+                dirname = if dir
+                    File.join(basedir, dir.split("/").join(File::SEPARATOR))
+                else
+                    basedir
+                end
+
+                dirname
             end
 
-            def type?(file)
+            def to_s
+                "mount[#{@name}]"
             end
 
             # Verify our configuration is valid.  This should really check to
             # make sure at least someone will be allowed, but, eh.
             def valid?
-                unless @path
-                    raise FileServerError, "No path specified"
+                if name == MODULES
+                    return @path.nil?
+                else
+                    return ! @path.nil?
                 end
             end
+
+            # Return a new mount with the same properties as +self+, except
+            # with a different name and path.
+            def copy(name, path)
+                result = self.clone
+                result.path = path
+                result.instance_variable_set(:@name, name)
+                return result
+            end
         end
     end
 end
-end
 
-# $Id: fileserver.rb 1315 2006-06-27 05:15:51Z luke $
+# $Id: fileserver.rb 2434 2007-04-30 15:57:57Z luke $