puppet 0.9.2 → 0.13.0

data/lib/puppet/parser/scope.rb

@@ -8,7 +8,9 @@ module Puppet
         class Scope
             include Enumerable
             attr_accessor :parent, :level, :interp
-            attr_accessor :name, :type, :topscope, :base
+            attr_accessor :name, :type, :topscope, :base, :keyword, :autoname
+
+            attr_accessor :top
 
             # This is probably not all that good of an idea, but...
             # This way a parent can share its tables with all of its children.
@@ -149,6 +151,14 @@ module Puppet
                 @level == 1
             end
 
+            # Return a list of all of the defined classes.
+            def classlist
+                unless defined? @classtable
+                    raise Puppet::DevError, "Scope did not receive class table"
+                end
+                return @classtable.keys
+            end
+
             # Yield each child scope in turn
             def each
                 @children.reject { |child|
@@ -187,16 +197,24 @@ module Puppet
                 # cache the results, but it's not worth it at this stage.
 
                 # Note that we evaluate the node code with its containing
-                # scope, not with the top scope.
-                code.safeevaluate(scope, facts)
+                # scope, not with the top scope.  We also retrieve the created
+                # nodescope so that we can get any classes set within it
+                nodescope = code.safeevaluate(scope, facts)
 
                 # We don't need to worry about removing the Node code because
                 # it will be removed during translation.
 
-                # And now return the whole thing
-                #return self.to_trans
+                # convert the whole thing
                 objects = self.to_trans
 
+                # Add any evaluated classes to our top-level object
+                unless nodescope.classlist.empty?
+                    objects.classes = nodescope.classlist
+                end
+
+                if objects.is_a?(Puppet::TransBucket)
+                    objects.top = true
+                end
                 # I should do something to add the node as an object with tags
                 # but that will possibly end up with far too many tags.
                 #self.logtags
@@ -248,7 +266,15 @@ module Puppet
                     end
                 }
 
-                return self.to_trans
+                objects = self.to_trans
+                objects.top = true
+
+                # Add our class list
+                unless self.classlist.empty?
+                    objects.classes = self.classlist
+                end
+
+                return objects
             end
 
             # Initialize our new scope.  Defaults to having no parent and to
@@ -352,7 +378,6 @@ module Puppet
                         "Could not retrieve %s table at level %s" %
                             [type,self.level]
                     )
-                    error.stack = caller
                     raise error
                 end
 
@@ -404,32 +429,32 @@ module Puppet
 
             # Look up a node by name
             def lookupnode(name)
-                Puppet.debug "Looking up type %s" % name
+                #Puppet.debug "Looking up type %s" % name
                 value = self.lookup("type",name)
                 if value == :undefined
                     return nil
                 else
-                    Puppet.debug "Found type %s" % name
+                    #Puppet.debug "Found node %s" % name
                     return value
                 end
             end
 
             # Look up a defined type.
             def lookuptype(name)
-                Puppet.debug "Looking up type %s" % name
+                #Puppet.debug "Looking up type %s" % name
                 value = self.lookup("type",name)
                 if value == :undefined
                     return nil
                 else
-                    Puppet.debug "Found type %s" % name
+                    #Puppet.debug "Found type %s" % name
                     return value
                 end
             end
 
             # Look up an object by name and type.
             def lookupobject(name,type)
-                Puppet.debug "Looking up object %s of type %s in level %s" %
-                    [name, type, @level]
+                #Puppet.debug "Looking up object %s of type %s in level %s" %
+                #    [name, type, @level]
                 sub = proc { |table|
                     if table.include?(type)
                         if table[type].include?(name)
@@ -449,13 +474,12 @@ module Puppet
 
             # Look up a variable.  The simplest value search we do.
             def lookupvar(name)
-                Puppet.debug "Looking up variable %s" % name
+                #Puppet.debug "Looking up variable %s" % name
                 value = self.lookup("variable", name)
                 if value == :undefined
                     error = Puppet::ParseError.new(
                         "Undefined variable '%s'" % name
                     )
-                    error.stack = caller
                     raise error
                 else
                     #Puppet.debug "Value of '%s' is '%s'" % [name,value]
@@ -465,7 +489,7 @@ module Puppet
 
             # Create a new scope.
             def newscope
-                Puppet.debug "Creating new scope, level %s" % [self.level + 1]
+                #Puppet.debug "Creating new scope, level %s" % [self.level + 1]
                 return Puppet::Parser::Scope.new(self)
             end
 
@@ -490,15 +514,14 @@ module Puppet
                 end
 
                 params.each { |ary|
-                    Puppet.debug "Default for %s is %s => %s" %
-                        [type,ary[0].inspect,ary[1].inspect]
+                    #Puppet.debug "Default for %s is %s => %s" %
+                    #    [type,ary[0].inspect,ary[1].inspect]
                     if @@declarative
                         if table.include?(ary[0])
                             error = Puppet::ParseError.new(
                                 "Default already defined for %s { %s }" %
                                     [type,ary[0]]
                             )
-                            error.stack = caller
                             raise error
                         end
                     else
@@ -534,7 +557,7 @@ module Puppet
                     end
                 end
                 #Puppet.debug("result is '%s'" % newstring)
-                return newstring
+                return newstring.gsub(/\\t/, "\t").gsub(/\\n/, "\n").gsub(/\\s/, "\s")
             end
 
             # This method will fail if the named object is already defined anywhere
@@ -593,14 +616,10 @@ module Puppet
             # in scopes above, but will not allow variables in the current scope
             # to be reassigned if we're declarative (which is the default).
             def setvar(name,value)
-                Puppet.debug "Setting %s to '%s' at level %s" %
-                    [name.inspect,value,self.level]
+                #Puppet.debug "Setting %s to '%s' at level %s" %
+                #    [name.inspect,value,self.level]
                 if @@declarative and @symtable.include?(name)
-                    error = Puppet::ParseError.new(
-                        "Cannot reassign variable %s" % name
-                    )
-                    error.stack = caller
-                    raise error
+                    raise Puppet::ParseError, "Cannot reassign variable %s" % name
                 else
                     if @symtable.include?(name)
                         Puppet.warning "Reassigning %s to %s" % [name,value]
@@ -691,12 +710,9 @@ module Puppet
                         @topscope.addtags(child)
                         results.push(child)
                     else
-                        error = Puppet::DevError.new(
+                        raise Puppet::DevError,
                             "Puppet::Parse::Scope cannot handle objects of type %s" %
                                 child.class
-                        )
-                        error.stack = caller
-                        raise error
                     end
                 }
 
@@ -714,17 +730,18 @@ module Puppet
 
                     # it'd be nice not to have to do this...
                     results.each { |result|
-                        #Puppet.debug "Result type is %s" % result.class
+                        #Puppet.warning "Result type is %s" % result.class
                         bucket.push(result)
                     }
                     if defined? @type
                         bucket.type = @type
                     else
-                        error = Puppet::ParseError.new(
+                        raise Puppet::ParseError,
                             "No type for scope %s" % @name
-                        )
-                        error.stack = caller
-                        raise error
+                    end
+
+                    if defined? @keyword
+                        bucket.keyword = @keyword
                     end
                     #Puppet.debug(
                     #    "TransBucket with name %s and type %s in scope %s" %
@@ -744,7 +761,7 @@ module Puppet
                     #    [bucket.name,self.object_id]
                     return bucket
                 else
-                    Puppet.debug "nameless scope; just returning a list"
+                    #Puppet.debug "nameless scope; just returning a list"
                     return results
                 end
             end
@@ -752,4 +769,4 @@ module Puppet
     end
 end
 
-# $Id: scope.rb 746 2005-11-17 21:03:19Z luke $
+# $Id: scope.rb 871 2006-02-07 05:58:00Z luke $

data/lib/puppet/server.rb

@@ -28,14 +28,12 @@ module Puppet
             include Puppet::Daemon
 
             def initialize(hash = {})
+                Puppet.info "Starting server for Puppet version %s" % Puppet.version
                 daemonize = nil
                 if hash.include?(:Daemonize)
                     daemonize = hash[:Daemonize]
                 end
 
-                if daemonize
-                    self.daemonize
-                end
                 # FIXME we should have some kind of access control here, using
                 # :RequestHandler
                 hash[:Port] ||= Puppet[:masterport]
@@ -97,62 +95,63 @@ module Puppet
                 self.mount("/RPC2", Puppet::Server::Servlet, @handlers)
             end
         end
-    end
-
-    class Server
-        # the base class for the different handlers
-        class Handler
-            attr_accessor :server
-            @subclasses = []
 
-            def self.each
-                @subclasses.each { |c| yield c }
-            end
+        class Server
+            # the base class for the different handlers
+            class Handler
+                attr_accessor :server
+                @subclasses = []
 
-            def self.handler(name)
-                @subclasses.find { |h|
-                    h.name == name
-                }
-            end
+                def self.each
+                    @subclasses.each { |c| yield c }
+                end
 
-            def self.inherited(sub)
-                @subclasses << sub
-            end
+                def self.handler(name)
+                    @subclasses.find { |h|
+                        h.name == name
+                    }
+                end
 
-            def self.interface
-                if defined? @interface
-                    return @interface
-                else
-                    raise Puppet::DevError, "Handler %s has no defined interface" %
-                        self
+                def self.inherited(sub)
+                    @subclasses << sub
                 end
-            end
 
-            def self.name
-                unless defined? @name
-                    @name = self.to_s.sub(/.+::/, '').intern
+                def self.interface
+                    if defined? @interface
+                        return @interface
+                    else
+                        raise Puppet::DevError, "Handler %s has no defined interface" %
+                            self
+                    end
                 end
 
-                return @name
-            end
+                def self.name
+                    unless defined? @name
+                        @name = self.to_s.sub(/.+::/, '').intern
+                    end
 
-            def initialize(hash = {})
+                    return @name
+                end
+
+                def initialize(hash = {})
+                end
             end
-        end
 
-        class ServerStatus < Handler
+            
+            class ServerStatus < Handler
 
-            @interface = XMLRPC::Service::Interface.new("status") { |iface|
-                iface.add_method("int status()")
-            }
+                @interface = XMLRPC::Service::Interface.new("status") { |iface|
+                    iface.add_method("int status()")
+                }
 
-            @name = :Status
+                @name = :Status
 
-            def status(status = nil, client = nil, clientip = nil)
-                return 1
+                def status(status = nil, client = nil, clientip = nil)
+                    return 1
+                end
             end
-        end
 
+        end
     end
 
     #---------------------------------------------------------------
@@ -167,4 +166,4 @@ require 'puppet/server/filebucket'
 require 'puppet/server/logger'
 require 'puppet/client'
 
-# $Id: server.rb 732 2005-10-28 05:39:59Z luke $
+# $Id: server.rb 873 2006-02-07 23:12:33Z luke $

data/lib/puppet/server/authstore.rb

@@ -1,10 +1,5 @@
-#!/usr/bin/ruby -w
-
-#--------------------
 # standard module for determining whether a given hostname or IP has access to
 # the requested resource
-#
-# $Id: authstore.rb 742 2005-11-16 17:12:11Z luke $
 
 require 'ipaddr'
 
@@ -68,7 +63,7 @@ class Server
                 }
             }
 
-            self.info "Defaulting to false for %s" % name
+            self.info "defaulting to no access for %s" % name
             # default to false
             return false
         end
@@ -225,3 +220,5 @@ class Server
     end
 end
 end
+#
+# $Id: authstore.rb 826 2006-01-14 00:20:14Z luke $

data/lib/puppet/server/ca.rb

@@ -26,11 +26,14 @@ class Server
             # we only otherwise know how to handle files
             unless @autosign =~ /^\//
                 raise Puppet::Error, "Invalid autosign value %s" %
-                    @autosign
+                    @autosign.inspect
             end
 
             unless FileTest.exists?(@autosign)
-                Puppet.info "Autosign is enabled but %s is missing" % @autosign
+                unless defined? @@warnedonautosign
+                    @@warnedonautosign = true
+                    Puppet.info "Autosign is enabled but %s is missing" % @autosign
+                end
                 return false
             end
             auth = Puppet::Server::AuthStore.new

data/lib/puppet/server/filebucket.rb

@@ -1,9 +1,5 @@
-#!/usr/bin/ruby -w
-
 #--------------------
 # accept and serve files
-#
-# $Id: filebucket.rb 635 2005-09-07 18:13:36Z luke $
 
 
 require 'webrick'
@@ -145,3 +141,5 @@ class Server
     end
 end
 end
+#
+# $Id: filebucket.rb 755 2005-11-23 19:18:34Z luke $

data/lib/puppet/server/fileserver.rb

@@ -8,7 +8,9 @@ class Server
     class FileServer < Handler
         attr_accessor :local
 
-        Puppet.setdefault(:fileserverconfig, [:puppetconf, "fileserver.conf"])
+        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]
@@ -19,6 +21,14 @@ class Server
             iface.add_method("string retrieve(string)")
         }
 
+        def authcheck(file, mount, client, clientip)
+            unless mount.allowed?(client, clientip)
+                Puppet.warning "%s cannot access %s in %s" %
+                    [client, mount, file]
+                raise Puppet::Server::AuthorizationError, "Cannot access %s" % mount
+            end
+        end
+
         # Run 'retrieve' on a file.  This gets the actual parameters, so
         # we can pass them to the client.
         def check(dir)
@@ -28,8 +38,8 @@ class Server
             end
 
             obj = nil
-            unless obj = Puppet::Type::PFile[dir]
-                obj = Puppet::Type::PFile.create(
+            unless obj = Puppet.type(:file)[dir]
+                obj = Puppet.type(:file).create(
                     :name => dir,
                     :check => CHECKPARAMS
                 )
@@ -49,8 +59,10 @@ class Server
             readconfig
             mount, path = splitpath(file)
 
-            unless mount.allowed?(client, clientip)
-                raise Puppet::Server::AuthorizationError, "Cannot access %s" % mount
+            authcheck(file, mount, client, clientip)
+
+            if client
+                Puppet.debug "Describing %s for %s" % [file, client]
             end
 
             sdir = nil
@@ -140,8 +152,10 @@ class Server
             readconfig
             mount, path = splitpath(dir)
 
-            unless mount.allowed?(client, clientip)
-                raise Puppet::Server::AuthorizationError, "Cannot access %s" % mount
+            authcheck(dir, mount, client, clientip)
+
+            if client
+                Puppet.debug "Listing %s for %s" % [dir, client]
             end
 
             subdir = nil
@@ -245,7 +259,7 @@ class Server
                             when "allow":
                                 value.split(/\s*,\s*/).each { |val|
                                     begin
-                                        mount.info "Allowing %s access" % val
+                                        mount.info "allowing %s access" % val
                                         mount.allow(val)
                                     rescue AuthStoreError => detail
                                         raise FileServerError, "%s at line %s of %s" %
@@ -255,7 +269,7 @@ class Server
                             when "deny":
                                 value.split(/\s*,\s*/).each { |val|
                                     begin
-                                        mount.info "Denying %s access" % val
+                                        mount.info "denying %s access" % val
                                         mount.deny(val)
                                     rescue AuthStoreError => detail
                                         raise FileServerError, "%s at line %s of %s" %
@@ -301,8 +315,10 @@ class Server
             readconfig
             mount, path = splitpath(file)
 
-            unless mount.allowed?(client, clientip)
-                raise Puppet::Server::AuthorizationError, "Cannot access %s" % mount
+            authcheck(file, mount, client, clientip)
+
+            if client
+                Puppet.info "Sending %s to %s" % [file, client]
             end
 
             fpath = nil
@@ -474,4 +490,4 @@ class Server
 end
 end
 
-# $Id: fileserver.rb 742 2005-11-16 17:12:11Z luke $
+# $Id: fileserver.rb 873 2006-02-07 23:12:33Z luke $