puppet 2.7.1 → 2.7.3

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

@@ -269,6 +269,7 @@ class Puppet::Network::Handler
               value = $2
               case var
               when "path"
+                raise FileServerError.new("No mount specified for argument #{var} #{value}") unless mount
                 if mount.name == MODULES
                   Puppet.warning "The '#{mount.name}' module can not have a path. Ignoring attempt to set it"
                 else
@@ -280,6 +281,7 @@ class Puppet::Network::Handler
                   end
                 end
               when "allow"
+                raise FileServerError.new("No mount specified for argument #{var} #{value}") unless mount
                 value.split(/\s*,\s*/).each { |val|
                   begin
                     mount.info "allowing #{val} access"
@@ -294,6 +296,7 @@ class Puppet::Network::Handler
                   end
                 }
               when "deny"
+                raise FileServerError.new("No mount specified for argument #{var} #{value}") unless mount
                 value.split(/\s*,\s*/).each { |val|
                   begin
                     mount.info "denying #{val} access"

data/lib/puppet/network/http/webrick.rb

@@ -40,7 +40,7 @@ class Puppet::Network::HTTP::WEBrick
       @listening = true
       @thread = Thread.new {
         @server.start { |sock|
-          raise "Client disconnected before connection could be established" unless IO.select([sock],nil,nil,0.1)
+          raise "Client disconnected before connection could be established" unless IO.select([sock],nil,nil,6.2)
           sock.accept
           @server.run(sock)
         }

data/lib/puppet/network/rest_authconfig.rb

@@ -29,10 +29,15 @@ module Puppet
       @main
     end
 
+    def allowed?(request)
+      Puppet.deprecation_warning "allowed? should not be called for REST authorization - use check_authorization instead"
+      check_authorization(request)
+    end
+
     # check wether this request is allowed in our ACL
     # raise an Puppet::Network::AuthorizedError if the request
     # is denied.
-    def allowed?(indirection, method, key, params)
+    def check_authorization(indirection, method, key, params)
       read
 
       # we're splitting the request in part because

data/lib/puppet/network/rest_authorization.rb

@@ -16,7 +16,7 @@ module Puppet::Network
 
     # Verify that our client has access.
     def check_authorization(indirection, method, key, params)
-      authconfig.allowed?(indirection, method, key, params)
+      authconfig.check_authorization(indirection, method, key, params)
     end
   end
 end

data/lib/puppet/parser/compiler.rb

@@ -60,23 +60,20 @@ class Puppet::Parser::Compiler
     # Note that this will fail if the resource is not unique.
     @catalog.add_resource(resource)
 
+    if resource.type.to_s.downcase != "class" && resource[:stage]
+      raise ArgumentError, "Only classes can set 'stage'; normal resources like #{resource} cannot change run stage"
+    end
 
-    # Add our container edge.  If we're a class, then we get treated specially - we can
-    # control the stage that the class is applied in.  Otherwise, we just
-    # get added to our parent container.
+    # Stages should not be inside of classes.  They are always a
+    # top-level container, regardless of where they appear in the
+    # manifest.
     return if resource.type.to_s.downcase == "stage"
 
+    # This adds a resource to the class it lexically appears in in the
+    # manifest.
     if resource.type.to_s.downcase != "class"
-      raise ArgumentError, "Only classes can set 'stage'; normal resources like #{resource} cannot change run stage" if resource[:stage]
       return @catalog.add_edge(scope.resource, resource)
     end
-
-    unless stage = @catalog.resource(:stage, resource[:stage] || (scope && scope.resource && scope.resource[:stage]) || :main)
-      raise ArgumentError, "Could not find stage #{resource[:stage] || :main} specified by #{resource}"
-    end
-
-    resource[:stage] ||= stage.title unless stage.title == :main
-    @catalog.add_edge(stage, resource)
   end
 
   # Do we use nodes found in the code, vs. the external node sources?

data/lib/puppet/parser/functions.rb

@@ -16,11 +16,9 @@ module Puppet::Parser::Functions
 
   def self.autoloader
     unless defined?(@autoloader)
-
-            @autoloader = Puppet::Util::Autoload.new(
+      @autoloader = Puppet::Util::Autoload.new(
         self,
         "puppet/parser/functions",
-
         :wrap => false
       )
     end
@@ -88,7 +86,6 @@ module Puppet::Parser::Functions
     ret = ""
 
     functions.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
-      #ret += "#{name}\n#{hash[:type]}\n"
       ret += "#{name}\n#{"-" * name.to_s.length}\n"
       if hash[:doc]
         ret += Puppet::Util::Docs.scrub(hash[:doc])
@@ -114,11 +111,9 @@ module Puppet::Parser::Functions
   end
 
   # Runs a newfunction to create a function for each of the log levels
-
   Puppet::Util::Log.levels.each do |level|
     newfunction(level, :doc => "Log a message on the server at level #{level.to_s}.") do |vals|
       send(level, vals.join(" "))
     end
   end
-
 end

data/lib/puppet/parser/functions/create_resources.rb

@@ -27,15 +27,16 @@ Takes two parameters:
   args[1].each do |title, params|
     raise ArgumentError, 'params should not contain title' if(params['title'])
     case type_of_resource
-    when :type
-      res = resource.hash2resource(params.merge(:title => title))
-      catalog.add_resource(res)
-    when :define
+    # JJM The only difference between a type and a define is the call to instantiate_resource
+    # for a defined type.
+    when :type, :define
       p_resource = Puppet::Parser::Resource.new(type_name, title, :scope => self, :source => resource)
       params.merge(:name => title).each do |k,v|
         p_resource.set_parameter(k,v)
       end
-      resource.instantiate_resource(self, p_resource)
+      if type_of_resource == :define then
+        resource.instantiate_resource(self, p_resource)
+      end
       compiler.add_resource(self, p_resource)
     when :class
       klass = find_hostclass(title)

data/lib/puppet/parser/functions/regsubst.rb

@@ -1,3 +1,29 @@
+# Copyright (C) 2009 Thomas Bellman
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THOMAS BELLMAN BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of Thomas Bellman shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from Thomas Bellman.
+
 module Puppet::Parser::Functions
 
   newfunction(

data/lib/puppet/parser/functions/shellquote.rb

@@ -1,3 +1,29 @@
+# Copyright (C) 2009 Thomas Bellman
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THOMAS BELLMAN BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of Thomas Bellman shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from Thomas Bellman.
+
 module Puppet::Parser::Functions
 
   Safe = 'a-zA-Z0-9@%_+=:,./-'    # Safe unquoted

data/lib/puppet/parser/functions/sprintf.rb

@@ -1,3 +1,29 @@
+# Copyright (C) 2009 Thomas Bellman
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THOMAS BELLMAN BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of Thomas Bellman shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from Thomas Bellman.
+
 module Puppet::Parser::Functions
 
   newfunction(

data/lib/puppet/parser/grammar.ra

@@ -9,7 +9,7 @@ token LBRACK  RBRACK LBRACE RBRACE SYMBOL FARROW COMMA TRUE
 token FALSE EQUALS APPENDS LESSEQUAL NOTEQUAL DOT COLON LLCOLLECT RRCOLLECT
 token QMARK LPAREN RPAREN ISEQUAL GREATEREQUAL GREATERTHAN LESSTHAN
 token IF ELSE IMPORT DEFINE ELSIF VARIABLE CLASS INHERITS NODE BOOLEAN
-token NAME SEMIC CASE DEFAULT AT LCOLLECT RCOLLECT CLASSNAME CLASSREF
+token NAME SEMIC CASE DEFAULT AT LCOLLECT RCOLLECT CLASSREF
 token NOT OR AND UNDEF PARROW PLUS MINUS TIMES DIV LSHIFT RSHIFT UMINUS
 token MATCH NOMATCH REGEX IN_EDGE OUT_EDGE IN_EDGE_SUB OUT_EDGE_SUB
 token IN
@@ -80,14 +80,14 @@ relationship_side: resource | resourceref | collection
 
 edge: IN_EDGE | OUT_EDGE | IN_EDGE_SUB | OUT_EDGE_SUB
 
-fstatement:   NAME LPAREN funcvalues RPAREN {
+fstatement:   NAME LPAREN expressions RPAREN {
   result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
     :arguments => val[2],
     :ftype => :statement
 }
-| NAME LPAREN funcvalues COMMA RPAREN {
+| NAME LPAREN expressions COMMA RPAREN {
   result = ast AST::Function,
     :name => val[0][:value],
     :line => val[0][:line],
@@ -108,30 +108,27 @@ fstatement:   NAME LPAREN funcvalues RPAREN {
     :ftype => :statement
 }
 
-funcvalues: namestring { result = aryfy(val[0]) }
-  | resourceref        { result = aryfy(val[0]) }
-  | funcvalues COMMA namestring {
-    val[0].push(val[2])
-    result = val[0]
-}
-  | funcvalues COMMA resourceref {
+funcvalues: rvalue { result = aryfy(val[0]) }
+# This rvalue could be an expression
+  | funcvalues COMMA rvalue {
     val[0].push(val[2])
     result = val[0]
 }
 
-# This is *almost* an rvalue, but I couldn't get a full
-# rvalue to work without scads of shift/reduce conflicts.
-namestring:       name
-  | variable
+expressions: expression               { result = aryfy(val[0]) }
+       | expressions comma expression { result = val[0].push(val[2]) }
+
+rvalue:       quotedtext
+  | name
   | type
   | boolean
-  | funcrvalue
   | selector
-  | quotedtext
+  | variable
+  | array
   | hasharrayaccesses
-  | CLASSNAME {
-    result = ast AST::Name, :value => val[0][:value]
-      }
+  | resourceref
+  | funcrvalue
+  | undef
 
 resource:       classname LBRACE resourceinstances endsemi RBRACE {
   @lexer.commentpop
@@ -249,12 +246,12 @@ collstatement:            collexpr
 colljoin:                 AND { result=val[0][:value] }
   | OR  { result=val[0][:value] }
 
-collexpr:                 colllval ISEQUAL simplervalue {
+collexpr:                 colllval ISEQUAL expression {
   result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
   #result = ast AST::CollExpr
   #result.push *val
 }
-  | colllval NOTEQUAL simplervalue {
+  | colllval NOTEQUAL expression {
     result = ast AST::CollExpr, :test1 => val[0], :oper => val[1][:value], :test2 => val[2]
     #result = ast AST::CollExpr
     #result.push *val
@@ -321,11 +318,11 @@ params:   # nothing
     result = val[0]
 }
 
-param:        NAME FARROW rvalue {
+param:        NAME FARROW expression {
   result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2]
 }
 
-addparam:     NAME PARROW rvalue {
+addparam:     NAME PARROW expression {
   result = ast AST::ResourceParam, :param => val[0][:value], :line => val[0][:line], :value => val[2],
     :add => true
 }
@@ -343,31 +340,8 @@ anyparams:   # nothing
     result = val[0]
 }
 
-rvalues: rvalue               { result = aryfy(val[0]) }
-       | rvalues comma rvalue { result = val[0].push(val[2]) }
-
-simplervalue:       quotedtext
-  | name
-  | type
-  | boolean
-  | selector
-  | variable
-
-rvalue:       quotedtext
-  | name
-  | type
-  | boolean
-  | selector
-  | variable
-  | array
-  | hash
-  | hasharrayaccesses
-  | resourceref
-  | funcrvalue
-  | undef
-
 # We currently require arguments in these functions.
-funcrvalue:   NAME LPAREN funcvalues RPAREN {
+funcrvalue:   NAME LPAREN expressions RPAREN {
   result = ast AST::Function,
     :name => val[0][:value], :line => val[0][:line],
     :arguments => val[2],
@@ -391,10 +365,10 @@ boolean:    BOOLEAN {
   result = ast AST::Boolean, :value => val[0][:value], :line => val[0][:line]
 }
 
-resourceref: NAME LBRACK rvalues RBRACK {
+resourceref: NAME LBRACK expressions RBRACK {
   Puppet.warning addcontext("Deprecation notice:  Resource references should now be capitalized")
   result = ast AST::ResourceReference, :type => val[0][:value], :line => val[0][:line], :title => val[2]
-}               | classref LBRACK rvalues RBRACK {
+}               | classref LBRACK expressions RBRACK {
   result = ast AST::ResourceReference, :type => val[0], :title => val[2]
 }
 
@@ -451,7 +425,8 @@ else:             # nothing
 # per operator :-(
 
 expression:   rvalue
-  | expression IN rvalue {
+  | hash
+  | expression IN expression {
     result = ast AST::InOperator, :lval => val[0], :rval => val[2]
 }
   | expression MATCH regex {
@@ -512,7 +487,7 @@ expression:   rvalue
     result = val[1]
 }
 
-casestatement:  CASE rvalue LBRACE caseopts RBRACE {
+casestatement:  CASE expression LBRACE caseopts RBRACE {
   @lexer.commentpop
   result = ast AST::CaseStatement, :test => val[1], :options => val[3]
 }
@@ -639,8 +614,7 @@ nodedef: NODE hostnames nodeparent LBRACE statements RBRACE {
 
 classref:       CLASSREF { result = val[0][:value] }
 
-classname:       NAME { result = val[0][:value] }
-  | CLASSNAME { result = val[0][:value] }
+classname:      NAME { result = val[0][:value] }
   | CLASS { result = "class" }
 
 # Multiple hostnames, as used for node names.  These are all literal
@@ -686,14 +660,14 @@ arguments:    argument
     result << val[2]
 }
 
-argument:     NAME EQUALS rvalue {
+argument:     NAME EQUALS expression {
   Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
   result = [val[0][:value], val[2]]
 }
   | NAME {
     Puppet.warning addcontext("Deprecation notice: must now include '$' in prototype")
     result = [val[0][:value]]
-}           | VARIABLE EQUALS rvalue {
+}           | VARIABLE EQUALS expression {
   result = [val[0][:value], val[2]]
 }           | VARIABLE {
   result = [val[0][:value]]
@@ -715,8 +689,8 @@ variable:     VARIABLE {
   result = ast AST::Variable, :value => val[0][:value], :line => val[0][:line]
 }
 
-array: LBRACK rvalues       RBRACK { result = val[1] }
-     | LBRACK rvalues COMMA RBRACK { result = val[1] }
+array: LBRACK expressions       RBRACK { result = val[1] }
+     | LBRACK expressions COMMA RBRACK { result = val[1] }
      | LBRACK               RBRACK { result = ast AST::ASTArray }
 
 comma:        FARROW
@@ -756,19 +730,19 @@ hashpairs:  hashpair
   end
 }
 
-hashpair:   key FARROW rvalue {
+hashpair:   key FARROW expression {
   result = ast AST::ASTHash, { :value => { val[0] => val[2] } }
 }
 
 key:      NAME { result = val[0][:value] }
   | quotedtext { result = val[0] }
 
-hasharrayaccess: VARIABLE LBRACK rvalue RBRACK {
+hasharrayaccess: VARIABLE LBRACK expression RBRACK {
   result = ast AST::HashOrArrayAccess, :variable => val[0][:value], :key => val[2]
 }
 
 hasharrayaccesses:    hasharrayaccess
-  | hasharrayaccesses LBRACK rvalue RBRACK {
+  | hasharrayaccesses LBRACK expression RBRACK {
     result = ast AST::HashOrArrayAccess, :variable => val[0], :key => val[2]
 }