puppet 0.16.0 → 0.18.4

data/lib/puppet/server/authconfig.rb

@@ -34,6 +34,8 @@ class AuthConfig < Puppet::ParsedFile
         namespace   = namespace.intern
         method      = method.intern
 
+        read()
+
         if @rights.include?(name)
             return @rights[name].allowed?(host, ip)
         elsif @rights.include?(namespace)
@@ -51,10 +53,15 @@ class AuthConfig < Puppet::ParsedFile
 
     def initialize(file = nil, parsenow = true)
         @file ||= Puppet[:authconfig]
+
+        unless @file
+            raise Puppet::DevError, "No authconfig file defined"
+        end
         return unless self.exists?
-        super(file)
+        super(@file)
         @rights = Rights.new
-        @configstamp = @configtimeout = @configstatted = nil
+        @configstamp = @configstatted = nil
+        @configtimeout = 60
 
         if parsenow
             read()
@@ -73,10 +80,14 @@ class AuthConfig < Puppet::ParsedFile
 
                     if tmp == @configstamp
                         return
+                    else
+                        Puppet.notice "%s vs %s" % [tmp, @configstamp]
                     end
                 else
                     return
                 end
+            else    
+                Puppet.notice "%s and %s" % [@configtimeout, @configstatted]
             end
         end
 
@@ -163,4 +174,4 @@ end
 end
 end
 
-# $Id: authconfig.rb 1129 2006-04-21 19:14:59Z luke $
+# $Id: authconfig.rb 1148 2006-04-28 19:46:04Z luke $

data/lib/puppet/server/authstore.rb

@@ -210,7 +210,7 @@ class Server
             when /^([a-zA-Z][-\w]*\.)+[-\w]+$/: # a full hostname
                 type = :hostname
                 value = pattern.split(".").reverse
-            when /^\*\.([a-zA-Z][-\w]*\.)+[-\w]+$/: # this doesn't match TLDs
+            when /^\*(\.([a-zA-Z][-\w]*)){1,}$/:
                 type = :domain
                 value = pattern.split(".").reverse
             else
@@ -223,4 +223,4 @@ class Server
 end
 end
 #
-# $Id: authstore.rb 1129 2006-04-21 19:14:59Z luke $
+# $Id: authstore.rb 1248 2006-06-08 21:46:07Z luke $

data/lib/puppet/server/ca.rb

@@ -16,28 +16,36 @@ class Server
             iface.add_method("array getcert(csr)")
         }
 
+        def autosign
+            if defined? @autosign
+                @autosign
+            else
+                Puppet[:autosign]
+            end
+        end
+
         # FIXME autosign? should probably accept both hostnames and IP addresses
         def autosign?(hostname)
             # simple values are easy
-            if @autosign == true or @autosign == false
-                return @autosign
+            if autosign == true or autosign == false
+                return autosign
             end
 
             # we only otherwise know how to handle files
-            unless @autosign =~ /^\//
+            unless autosign =~ /^\//
                 raise Puppet::Error, "Invalid autosign value %s" %
-                    @autosign.inspect
+                    autosign.inspect
             end
 
-            unless FileTest.exists?(@autosign)
+            unless FileTest.exists?(autosign)
                 unless defined? @@warnedonautosign
                     @@warnedonautosign = true
-                    Puppet.info "Autosign is enabled but %s is missing" % @autosign
+                    Puppet.info "Autosign is enabled but %s is missing" % autosign
                 end
                 return false
             end
             auth = Puppet::Server::AuthStore.new
-            File.open(@autosign) { |f|
+            File.open(autosign) { |f|
                 f.each { |line|
                     auth.allow(line.chomp)
                 }
@@ -49,7 +57,10 @@ class Server
 
         def initialize(hash = {})
             Puppet.config.use(:puppet, :certificates, :ca)
-            @autosign = hash[:autosign] || Puppet[:autosign]
+            if hash.include? :autosign
+                @autosign = hash[:autosign]
+            end
+
             @ca = Puppet::SSLCertificates::CA.new(hash)
         end
 
@@ -101,13 +112,14 @@ class Server
                     # the csr and return the results
                     Puppet.info "Signing certificate for %s" % hostname
                     cert, cacert = @ca.sign(csr)
-                    Puppet.info "Cert: %s; Cacert: %s" % [cert.class, cacert.class]
+                    #Puppet.info "Cert: %s; Cacert: %s" % [cert.class, cacert.class]
                     return [cert.to_pem, cacert.to_pem]
                 else # just write out the csr for later signing
                     if @ca.getclientcsr(hostname)
                         Puppet.info "Not replacing existing request from %s" % hostname
                     else
-                        Puppet.info "Storing certificate request for %s" % hostname
+                        Puppet.notice "Host %s has a waiting certificate request" %
+                            hostname
                         @ca.storeclientcsr(csr)
                     end
                     return ["", ""]
@@ -138,4 +150,4 @@ class Server
 end
 end
 
-# $Id: ca.rb 1053 2006-04-02 23:39:02Z luke $
+# $Id: ca.rb 1414 2006-07-21 15:20:44Z luke $

data/lib/puppet/server/filebucket.rb

@@ -16,7 +16,7 @@ class Server
         Puppet.config.setdefaults("filebucket",
             :bucketdir => {
                 :default => "$vardir/bucket",
-                :mode => 0770,
+                :mode => 0750,
                 :owner => "$user",
                 :group => "$group",
                 :desc => "Where FileBucket files are stored."
@@ -28,7 +28,7 @@ class Server
         }
 
         Puppet::Util.logmethods(self, true)
-        attr_reader :name
+        attr_reader :name, :path
 
         # this doesn't work for relative paths
         def FileBucket.paths(base,md5)
@@ -48,19 +48,19 @@ class Server
             end
 
             if hash.include?(:Path)
-                @bucket = hash[:Path]
+                @path = hash[:Path]
                 hash.delete(:Path)
             else
                 if defined? Puppet
-                    @bucket = Puppet[:bucketdir]
+                    @path = Puppet[:bucketdir]
                 else
-                    @bucket = File.expand_path("~/.filebucket")
+                    @path = File.expand_path("~/.filebucket")
                 end
             end
 
             Puppet.config.use(:filebucket)
 
-            @name = "filebucket[#{Puppet[:bucketdir]}]"
+            @name = "filebucket[#{@path}]"
         end
 
         # accept a file from a client
@@ -68,7 +68,7 @@ class Server
             contents = Base64.decode64(string)
             md5 = Digest::MD5.hexdigest(contents)
 
-            bpath, bfile, pathpath = FileBucket.paths(@bucket,md5)
+            bpath, bfile, pathpath = FileBucket.paths(@path,md5)
 
             # if it's a new directory...
             if Puppet.recmkdir(bpath)
@@ -109,7 +109,7 @@ class Server
             addpath = false
             if FileTest.exists?(pathpath)
                 File.open(pathpath) { |of|
-                    paths = of.readlines
+                    paths = of.readlines.collect { |l| l.chomp }
                 }
 
                 # unless our path is already there...
@@ -131,7 +131,7 @@ class Server
         end
 
         def getfile(md5, client = nil, clientip = nil)
-            bpath, bfile, bpaths = FileBucket.paths(@bucket,md5)
+            bpath, bfile, bpaths = FileBucket.paths(@path,md5)
 
             unless FileTest.exists?(bfile)
                 return false
@@ -152,4 +152,4 @@ class Server
 end
 end
 #
-# $Id: filebucket.rb 1113 2006-04-17 16:15:33Z luke $
+# $Id: filebucket.rb 1392 2006-07-11 20:58:25Z luke $

data/lib/puppet/server/fileserver.rb

@@ -60,11 +60,6 @@ class Server
                 return ""
             end
 
-            #if links == :ignore and obj[:type] == "link"
-            #    mount.info "Ignoring link %s" % obj.name
-            #    return ""
-            #end
-
             desc = []
             CHECKPARAMS.each { |check|
                 if state = obj.state(check)
@@ -278,7 +273,7 @@ class Server
                 Puppet.err "FileServer error: Cannot read %s; cannot serve" % @config
                 #raise Puppet::Error, "Cannot read %s" % @config
             rescue Errno::ENOENT => detail
-                Puppet.err "FileServer error: '%s' does not exit; cannot serve" %
+                Puppet.err "FileServer error: '%s' does not exist; cannot serve" %
                     @config
                 #raise Puppet::Error, "%s does not exit" % @config
             #rescue FileServerError => detail
@@ -423,8 +418,9 @@ class Server
                 path = nil
             else
                 # Remove any double slashes that might have occurred
-                path.gsub!(/\/\//, "/")
+                path = URI.unescape(path.gsub(/\/\//, "/"))
             end
+
             return mount, path
         end
 
@@ -562,4 +558,4 @@ class Server
 end
 end
 
-# $Id: fileserver.rb 989 2006-03-06 21:19:34Z luke $
+# $Id: fileserver.rb 1315 2006-06-27 05:15:51Z luke $

data/lib/puppet/server/master.rb

@@ -25,16 +25,15 @@ class Server
             facts["serverversion"] = Puppet.version.to_s
 
             # And then add the server name and IP
-            facts["servername"] = Facter["hostname"].value
-            facts["serverip"] = Facter["ipaddress"].value
-        end
-
-        def filetimeout
-            @interpreter.filetimeout
-        end
-
-        def filetimeout=(int)
-            @interpreter.filetimeout = int
+            {"servername" => "hostname",
+                "serverip" => "ipaddress"
+            }.each do |var, fact|
+                if obj = Facter[fact]
+                    facts[var] = obj.value
+                else
+                    Puppet.warning "Could not retrieve fact %s" % fact
+                end
+            end
         end
 
         # Tell a client whether there's a fresh config for it
@@ -70,8 +69,6 @@ class Server
                 @ca = nil
             end
 
-            args[:ParseCheck] = hash[:FileTimeout] || 15
-
             Puppet.debug("Creating interpreter")
 
             if hash.include?(:UseNodes)
@@ -135,17 +132,17 @@ class Server
             # This is hackish, but there's no "silence" option for benchmarks
             # right now
             if @local
-                begin
+                #begin
                     retobjects = @interpreter.run(client, facts)
-                rescue Puppet::Error => detail
-                    Puppet.err detail
-                    raise XMLRPC::FaultException.new(
-                        1, detail.to_s
-                    )
-                rescue => detail
-                    Puppet.err detail.to_s
-                    return ""
-                end
+                #rescue Puppet::Error => detail
+                #    Puppet.err detail
+                #    raise XMLRPC::FaultException.new(
+                #        1, detail.to_s
+                #    )
+                #rescue => detail
+                #    Puppet.err detail.to_s
+                #    return ""
+                #end
             else
                 benchmark(:notice, "Compiled configuration for %s" % client) do
                     begin

data/lib/puppet/server/pelement.rb

@@ -19,8 +19,7 @@ class Server::PElement < Server::Handler
             begin
                 case format
                 when "yaml":
-                    tmp = YAML::load(CGI.unescape(bucket))
-                    bucket = tmp
+                    bucket = YAML::load(Base64.decode64(bucket))
                 else
                     raise Puppet::Error, "Unsupported format '%s'" % format
                 end
@@ -50,6 +49,7 @@ class Server::PElement < Server::Handler
     # Describe a given object.  This returns the 'is' values for every state
     # available on the object type.
     def describe(type, name, retrieve = nil, ignore = [], format = "yaml", client = nil, clientip = nil)
+        Puppet.info "Describing %s[%s]" % [type, name]
         @local = true unless client
         typeklass = nil
         unless typeklass = Puppet.type(type)
@@ -59,6 +59,7 @@ class Server::PElement < Server::Handler
         obj = nil
 
         retrieve ||= :all
+        ignore ||= []
 
         if obj = typeklass[name]
             obj[:check] = retrieve
@@ -71,6 +72,12 @@ class Server::PElement < Server::Handler
             end
         end
 
+        unless obj
+            raise XMLRPC::FaultException.new(
+                1, "Could not create %s[%s]" % [type, name]
+            )
+        end
+
         trans = obj.to_trans
 
         # Now get rid of any attributes they specifically don't want
@@ -87,20 +94,18 @@ class Server::PElement < Server::Handler
             end
         end
 
-        if @local
-            return trans
-        else
-            str = nil
+        unless @local
             case format
             when "yaml":
-                str = CGI.escape(YAML::dump(trans))
+                trans = Base64.encode64(YAML::dump(trans))
             else
                 raise XMLRPC::FaultException.new(
                     1, "Unavailable config format %s" % format
                 )
             end
-            return CGI.escape(str)
         end
+
+        return trans
     end
 
     # Create a new fileserving module.
@@ -113,13 +118,15 @@ class Server::PElement < Server::Handler
     end
 
     # List all of the elements of a given type.
-    def list(type, ignore = [], base = nil, client = nil, clientip = nil)
+    def list(type, ignore = [], base = nil, format = "yaml", client = nil, clientip = nil)
         @local = true unless client
         typeklass = nil
         unless typeklass = Puppet.type(type)
             raise Puppet::Error, "Puppet type %s is unsupported" % type
         end
 
+        # They can pass in false
+        ignore ||= []
         ignore = [ignore] unless ignore.is_a? Array
         bucket = TransBucket.new
         bucket.type = typeklass.name
@@ -131,20 +138,25 @@ class Server::PElement < Server::Handler
             bucket << object
         end
 
-        if @local
-            return bucket
-        else
-            str = nil
+        unless @local
             case format
             when "yaml":
-                str = YAML.dump(bucket)
+                begin
+                bucket = Base64.encode64(YAML::dump(bucket))
+                rescue => detail
+                    Puppet.err detail
+                    raise XMLRPC::FaultException.new(
+                        1, detail.to_s
+                    )
+                end
             else
                 raise XMLRPC::FaultException.new(
                     1, "Unavailable config format %s" % format
                 )
             end
-            return CGI.escape(str)
         end
+
+        return bucket
     end
 
     private
@@ -173,4 +185,4 @@ class Server::PElement < Server::Handler
 end
 end
 
-# $Id: pelement.rb 1129 2006-04-21 19:14:59Z luke $
+# $Id: pelement.rb 1145 2006-04-28 04:08:38Z luke $

data/lib/puppet/server/report.rb

@@ -0,0 +1,184 @@
+module Puppet
+class Server
+    # A simple server for triggering a new run on a Puppet client.
+    class Report < Handler
+        @interface = XMLRPC::Service::Interface.new("puppetreports") { |iface|
+            iface.add_method("string report(array)")
+        }
+
+        Puppet.setdefaults(:reporting,
+            :reportdirectory => {:default => "$vardir/reports",
+                    :mode => 0750,
+                    :owner => "$user",
+                    :group => "$group",
+                    :desc => "The directory in which to store reports received from the
+                client.  Each client gets a separate subdirectory."},
+            :reports => ["none",
+                "The list of reports to generate.  All reports are looked for
+                in puppet/reports/<name>.rb, and multiple report names should be
+                comma-separated (whitespace is okay)."
+            ]
+        )
+
+        @reports = {}
+
+        class << self
+            attr_reader :hooks
+        end
+
+        def self.reportmethod(report)
+            "report_" + report.to_s
+        end
+
+        # Add a hook for processing reports.
+        def self.newreport(name, &block)
+            name = name.intern if name.is_a? String
+            method = reportmethod(name)
+
+            # We want to define a method so that reports can use 'return'.
+            define_method(method, &block)
+
+            @reports[name] = method
+        end
+
+        # Load a report.
+        def self.report(name)
+            name = name.intern if name.is_a? String
+            unless @reports.include? reportmethod(name)
+                begin
+                    require "puppet/reports/#{name.to_s}"
+                    unless @reports.include? name
+                        Puppet.warning(
+                            "Loaded report file for %s but report was not defined" %
+                            name
+                        )
+                        return nil
+                    end
+                rescue LoadError => detail
+                    if Puppet[:debug]
+                        puts detail.backtrace
+                    end
+                    Puppet.warning "Could not load report %s: %s" %
+                        [name, detail]
+                    return nil
+                end
+            end
+
+            @reports[name]
+        end
+
+        def initialize(*args)
+            super
+            Puppet.config.use(:reporting)
+            Puppet.config.use(:metrics)
+        end
+
+        # Dynamically create the report methods as necessary.
+        def method_missing(name, *args)
+            if name.to_s =~ /^report_(.+)$/
+                if self.class.report($1)
+                    send(name, *args)
+                else
+                    super
+                end
+            else
+                super
+            end
+        end
+
+        # Accept a report from a client.
+        def report(report, client = nil, clientip = nil)
+            # We need the client name for storing files.
+            client ||= Facter["hostname"].value
+
+            # Unescape the report
+            unless @local
+                report = CGI.unescape(report)
+            end
+
+            process(report)
+
+            # We don't want any tracking back in the fs.  Unlikely, but there
+            # you go.
+            client.gsub("..",".")
+
+            dir = File.join(Puppet[:reportdirectory], client)
+
+            unless FileTest.exists?(dir)
+                mkclientdir(client, dir)
+            end
+
+            # Now store the report.
+            now = Time.now.gmtime
+            name = %w{year month day hour min}.collect do |method|
+                # Make sure we're at least two digits everywhere
+                "%02d" % now.send(method).to_s
+            end.join("") + ".yaml"
+
+            file = File.join(dir, name)
+
+            begin
+                File.open(file, "w", 0640) do |f|
+                    f.puts report
+                end
+            rescue => detail
+                if Puppet[:debug]
+                    puts detail.backtrace
+                end
+                Puppet.warning "Could not write report for %s at %s: %s" %
+                    [client, file, detail]
+            end
+
+
+            # Our report is in YAML
+            return file
+        end
+
+        private
+
+        def mkclientdir(client, dir)
+            Puppet.config.setdefaults("reportclient-#{client}",
+                "clientdir-#{client}" => { :default => dir,
+                    :mode => 0750,
+                    :owner => "$user",
+                    :group => "$group"
+                }
+            )
+
+            Puppet.config.use("reportclient-#{client}")
+        end
+
+        # Process the report using all of the existing hooks.
+        def process(report)
+            return if Puppet[:reports] == "none"
+
+            # First convert the report to real objects
+            begin
+                report = YAML.load(report)
+            rescue => detail
+                Puppet.warning "Could not load report: %s" % detail
+                return
+            end
+
+            Puppet[:reports].split(/\s*,\s*/).each do |name|
+                method = self.class.reportmethod(name)
+
+                Puppet.info "Processing report %s" % name
+                begin
+                    send(method, report)
+                rescue NoMethodError => detail
+                    Puppet.warning "No report named '%s'" % name
+                rescue => detail
+                    if Puppet[:debug]
+                        puts detail.backtrace
+                    end
+                    Puppet.err "Report %s failed: %s" %
+                        [name, detail]
+                end
+            end
+        end
+    end
+end
+end
+
+# $Id: report.rb 1390 2006-07-11 20:22:27Z luke $