puppet 2.7.3 → 2.7.4

data/spec/unit/indirector/report/processor_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2007-9-23.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 
 require 'puppet/indirector/report/processor'

data/spec/unit/indirector/resource/active_record_spec.rb

@@ -0,0 +1,192 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+begin
+  require 'sqlite3'
+rescue LoadError
+end
+
+require 'puppet/rails'
+require 'puppet/node/facts'
+
+describe "Puppet::Resource::ActiveRecord", :if => (Puppet.features.rails? and defined? SQLite3) do
+  include PuppetSpec::Files
+
+  before :each do
+    dir = Pathname(tmpdir('puppet-var'))
+    Puppet[:vardir]       = dir.to_s
+    Puppet[:dbadapter]    = 'sqlite3'
+    Puppet[:dblocation]   = (dir + 'storeconfigs.sqlite').to_s
+    Puppet[:storeconfigs] = true
+  end
+
+  after :each do
+    ActiveRecord::Base.remove_connection
+  end
+
+  subject {
+    require 'puppet/indirector/resource/active_record'
+    Puppet::Resource.indirection.terminus(:active_record)
+  }
+
+  it "should automatically initialize Rails" do
+    # Other tests in the suite may have established the connection, which will
+    # linger; the assertion is just to enforce our assumption about the call,
+    # not because I *really* want to test ActiveRecord works.  Better to have
+    # an early failure than wonder why the test overall doesn't DTRT.
+    ActiveRecord::Base.remove_connection
+    ActiveRecord::Base.should_not be_connected
+    subject.should be
+    ActiveRecord::Base.should be_connected
+  end
+
+  describe "#search" do
+    before :each do Puppet::Rails.init end
+
+    def search(type, host = 'default.local', filter = nil)
+      args = { :host => host, :filter => filter }
+      subject.search(Puppet::Resource.indirection.request(:search, type, args))
+    end
+
+    it "should fail if the type is not known to Puppet" do
+      expect { search("banana") }.to raise_error Puppet::Error, /Could not find type/
+    end
+
+    it "should return an empty array if no resources match" do
+      search("exec").should == []
+    end
+
+    # Assert that this is a case-insensitive rule, too.
+    %w{and or AND OR And Or anD oR}.each do |op|
+      it "should fail if asked to search with #{op.inspect}" do
+        filter = [%w{tag == foo}, op, %w{title == bar}]
+        expect { search("notify", 'localhost', filter) }.
+          to raise_error Puppet::Error, /not supported/
+      end
+    end
+
+    context "with a matching resource" do
+      before :each do
+        host = Puppet::Rails::Host.create!(:name => 'one.local')
+        Puppet::Rails::Resource.
+          create!(:host     => host,
+                  :restype  => 'exec', :title => 'whammo',
+                  :exported => true)
+
+      end
+
+      it "should return something responding to `to_resource` if a resource matches" do
+        found = search("exec")
+        found.length.should == 1
+        found.map do |item|
+          item.should respond_to :to_resource
+          item.restype.should == "exec"
+        end
+      end
+
+      it "should not filter resources that have been found before" do
+        search("exec").should == search("exec")
+      end
+    end
+  end
+
+  describe "#build_active_record_query" do
+    before :each do
+      Puppet::Rails.init
+    end
+
+    let :type do
+      Puppet::Type.type('notify').name
+    end
+
+    def query(type, host, filter = nil)
+      subject.send :build_active_record_query, type, host, filter
+    end
+
+    it "should exclude all database resources from the host" do
+      host = Puppet::Rails::Host.create! :name => 'one.local'
+      got = query(type, host.name)
+      got.keys.should =~ [:conditions]
+      got[:conditions][0] =~ /\(host_id != \?\)/
+      got[:conditions].last.should == host.id
+    end
+
+    it "should join appropriately when filtering on parameters" do
+      filter = %w{propname == propval}
+      got = query(type, 'whatever', filter)
+      got.keys.should =~ [:conditions, :joins]
+      got[:joins].should == { :param_values => :param_name }
+      got[:conditions][0].should =~ /param_names\.name = \?/
+      got[:conditions][0].should =~ /param_values\.value = \?/
+      got[:conditions].should be_include filter.first
+      got[:conditions].should be_include filter.last
+    end
+
+    it "should join appropriately when filtering on tags" do
+      filter = %w{tag == test}
+      got = query(type, 'whatever', filter)
+      got.keys.should =~ [:conditions, :joins]
+      got[:joins].should == {:resource_tags => :puppet_tag}
+      got[:conditions].first.should =~ /puppet_tags/
+      got[:conditions].should_not be_include filter.first
+      got[:conditions].should be_include filter.last
+    end
+
+    it "should only search for exported resources with the matching type" do
+      got = query(type, 'whatever')
+      got.keys.should =~ [:conditions]
+      got[:conditions][0].should be_include "(exported=? AND restype=?)"
+      got[:conditions][1].should == true
+      got[:conditions][2].should == type.to_s
+    end
+  end
+
+  describe "#filter_to_active_record" do
+    def filter_to_active_record(input)
+      subject.send :filter_to_active_record, input
+    end
+
+    [nil, '', 'whatever', 12].each do |input|
+      it "should fail if filter is not an array (with #{input.inspect})" do
+        expect { filter_to_active_record(input) }.
+          to raise_error ArgumentError, /must be arrays/
+      end
+    end
+
+    # Not exhaustive, just indicative.
+    ['=', '<>', '=~', '+', '-', '!'].each do |input|
+      it "should fail with unexpected comparison operators (with #{input.inspect})" do
+        expect { filter_to_active_record(["one", input, "two"]) }.
+          to raise_error ArgumentError, /unknown operator/
+      end
+    end
+
+    {
+      ["title", "==", "whatever"] => ["title = ?", ["whatever"]],
+      ["title", "!=", "whatever"] => ["title != ?", ["whatever"]],
+
+      # Technically, these are not supported by Puppet yet, but as we pay
+      # approximately zero cost other than a few minutes writing the tests,
+      # and it would be *harder* to fail on them, nested queries.
+      [["title", "==", "foo"], "or", ["title", "==", "bar"]] =>
+        ["(title = ?) OR (title = ?)", ["foo", "bar"]],
+
+      [["title", "==", "foo"], "or", ["tag", "==", "bar"]] =>
+        ["(title = ?) OR (puppet_tags.name = ?)", ["foo", "bar"]],
+
+      [["title", "==", "foo"], "or", ["param", "==", "bar"]] =>
+        ["(title = ?) OR (param_names.name = ? AND param_values.value = ?)",
+         ["foo", "param", "bar"]],
+
+      [[["title","==","foo"],"or",["tag", "==", "bar"]],"and",["param","!=","baz"]] =>
+      ["((title = ?) OR (puppet_tags.name = ?)) AND "+
+       "(param_names.name = ? AND param_values.value != ?)",
+       ["foo", "bar", "param", "baz"]]
+
+    }.each do |input, expect|
+      it "should map #{input.inspect} to #{expect.inspect}" do
+        filter_to_active_record(input).should == expect
+      end
+    end
+  end
+end

data/spec/unit/indirector/resource/ral_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe "Puppet::Resource::Ral" do
-  describe "find" do
+  describe "find", :fails_on_windows => true do
     before do
       @request = stub 'request', :key => "user/root"
     end

data/spec/unit/indirector/resource/store_configs_spec.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+require 'puppet/resource'
+require 'puppet/indirector/memory'
+require 'puppet/indirector/resource/store_configs'
+
+class Puppet::Resource::StoreConfigsTesting < Puppet::Indirector::Memory
+end
+
+describe Puppet::Resource::StoreConfigs do
+  it_should_behave_like "a StoreConfigs terminus"
+end

data/spec/unit/indirector/resource_type/parser_spec.rb

@@ -25,7 +25,7 @@ describe Puppet::Indirector::ResourceType::Parser do
       @terminus.find(@request).should == type
     end
 
-    it "should attempt to load the type if none is found in memory" do
+    it "should attempt to load the type if none is found in memory", :fails_on_windows => true do
       dir = tmpdir("find_a_type")
       FileUtils.mkdir_p(dir)
       Puppet[:modulepath] = dir
@@ -122,13 +122,13 @@ describe Puppet::Indirector::ResourceType::Parser do
       @terminus.search(@request).should be_nil
     end
 
-    it "should load all resource types from all search paths" do
+    it "should load all resource types from all search paths", :fails_on_windows => true do
       dir = tmpdir("searching_in_all")
       first = File.join(dir, "first")
       second = File.join(dir, "second")
       FileUtils.mkdir_p(first)
       FileUtils.mkdir_p(second)
-      Puppet[:modulepath] = "#{first}:#{second}"
+      Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}"
 
       # Make a new request, since we've reset the env
       @request = Puppet::Indirector::Request.new(:resource_type, :search, "*")

data/spec/unit/indirector/ssl_file_spec.rb

@@ -1,13 +1,11 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2008-3-10.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 
 require 'puppet/indirector/ssl_file'
 
 describe Puppet::Indirector::SslFile do
+  include PuppetSpec::Files
+
   before :all do
     @indirection = stub 'indirection', :name => :testing, :model => @model
     Puppet::Indirector::Indirection.expects(:instance).with(:testing).returns(@indirection)
@@ -21,7 +19,7 @@ describe Puppet::Indirector::SslFile do
 
     @setting = :certdir
     @file_class.store_in @setting
-    @path = "/tmp/my_directory"
+    @path = make_absolute("/thisdoesntexist/my_directory")
     Puppet[:noop] = false
     Puppet[@setting] = @path
     Puppet[:trace] = false
@@ -45,7 +43,9 @@ describe Puppet::Indirector::SslFile do
   it "should fail if no store directory or file location has been set" do
     @file_class.store_in nil
     @file_class.store_at nil
-    lambda { @file_class.new }.should raise_error(Puppet::DevError)
+    FileTest.expects(:exists?).with(File.dirname(@path)).at_least(0).returns(true)
+    Dir.stubs(:mkdir).with(@path)
+    lambda { @file_class.new }.should raise_error(Puppet::DevError, /No file or directory setting provided/)
   end
 
   describe "when managing ssl files" do
@@ -88,6 +88,25 @@ describe Puppet::Indirector::SslFile do
       it "should set them in the setting directory, with the certificate name plus '.pem', if a directory setting is available" do
         @searcher.path(@cert.name).should == @certpath
       end
+
+      ['../foo', '..\\foo', './../foo', '.\\..\\foo',
+       '/foo', '//foo', '\\foo', '\\\\goo',
+       "test\0/../bar", "test\0\\..\\bar",
+       "..\\/bar", "/tmp/bar", "/tmp\\bar", "tmp\\bar",
+       " / bar", " /../ bar", " \\..\\ bar",
+       "c:\\foo", "c:/foo", "\\\\?\\UNC\\bar", "\\\\foo\\bar",
+       "\\\\?\\c:\\foo", "//?/UNC/bar", "//foo/bar",
+       "//?/c:/foo",
+      ].each do |input|
+        it "should resist directory traversal attacks (#{input.inspect})" do
+          expect { @searcher.path(input) }.to raise_error
+        end
+      end
+
+      # REVISIT: Should probably test MS-DOS reserved names here, too, since
+      # they would represent a vulnerability on a Win32 system, should we ever
+      # support that path.  Don't forget that 'CON.foo' == 'CON'
+      # --daniel 2011-09-24
     end
 
     describe "when finding certificates on disk" do

data/spec/unit/indirector/store_configs_spec.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env rspec
+require 'spec_helper'
+
+require 'puppet/indirector/store_configs'
+
+describe Puppet::Indirector::StoreConfigs do
+  pending "REVISIT: creating an instance requires ludicrous amounts of stubbing, and there is relatively little to actually test here.  What to do?  Shared behaviours allow us to push down a lot of the testing into the implementation class tests anyhow..."
+end

data/spec/unit/indirector/yaml_spec.rb

@@ -63,6 +63,20 @@ describe Puppet::Indirector::Yaml, " when choosing file location" do
     it "should use the object's name to determine the file name" do
       @store.path(:me).should =~ %r{me.yaml$}
     end
+
+    ['../foo', '..\\foo', './../foo', '.\\..\\foo',
+     '/foo', '//foo', '\\foo', '\\\\goo',
+     "test\0/../bar", "test\0\\..\\bar",
+     "..\\/bar", "/tmp/bar", "/tmp\\bar", "tmp\\bar",
+     " / bar", " /../ bar", " \\..\\ bar",
+     "c:\\foo", "c:/foo", "\\\\?\\UNC\\bar", "\\\\foo\\bar",
+     "\\\\?\\c:\\foo", "//?/UNC/bar", "//foo/bar",
+     "//?/c:/foo",
+    ].each do |input|
+      it "should resist directory traversal attacks (#{input.inspect})" do
+        expect { @store.path(input) }.to raise_error
+      end
+    end
   end
 
   describe Puppet::Indirector::Yaml, " when storing objects as YAML" do

data/spec/unit/module_spec.rb

@@ -275,7 +275,7 @@ describe Puppet::Module do
 
     FileUtils.mkdir_p(first)
     FileUtils.mkdir_p(second)
-    Puppet[:modulepath] = "#{first}:#{second}"
+    Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}"
 
     modpath = File.join(first, "foo")
     FileUtils.mkdir_p(modpath)
@@ -294,7 +294,7 @@ describe Puppet::Module do
 
     FileUtils.mkdir_p(first)
     FileUtils.mkdir_p(second)
-    Puppet[:modulepath] = "#{first}:#{second}"
+    Puppet[:modulepath] = "#{first}#{File::PATH_SEPARATOR}#{second}"
 
     modpath = File.join(second, "foo")
     FileUtils.mkdir_p(modpath)

data/spec/unit/network/handler/fileserver_spec.rb

@@ -73,12 +73,12 @@ describe Puppet::Network::Handler::FileServer do
     @mount.list("/no_such_file", false, false).should be(nil)
   end
 
-  it "should list a symbolic link as a file when given the link path" do
+  it "should list a symbolic link as a file when given the link path", :unless => Puppet.features.microsoft_windows? do
     File.symlink(@file, @link)
     @mount.list("/aLink", false, false).should == [["/", "file"]]
   end
 
-  it "should return nil for a dangling symbolic link when given the link path" do
+  it "should return nil for a dangling symbolic link when given the link path", :unless => Puppet.features.microsoft_windows? do
     File.symlink("/some/where", @link)
     @mount.list("/aLink", false, false).should be(nil)
   end
@@ -138,18 +138,18 @@ describe Puppet::Network::Handler::FileServer do
     list.sort.should == [   ["/aFile", "file"], ["/", "directory"] , ["/nested_dir", "directory"], ["/nested_dir/nested_dir_file", "file"]].sort
   end
 
-  it "should list a valid symbolic link as a file when recursing base dir" do
+  it "should list a valid symbolic link as a file when recursing base dir", :unless => Puppet.features.microsoft_windows? do
     File.symlink(@file, @link)
     list = @mount.list("/", true, false)
     list.sort.should == [ ["/", "directory"], ["/aFile", "file"], ["/aLink", "file"] ].sort
   end
 
-  it "should not error when a dangling symlink is present" do
+  it "should not error when a dangling symlink is present", :unless => Puppet.features.microsoft_windows? do
     File.symlink("/some/where", @link)
     lambda { @mount.list("/", true, false) }.should_not raise_error
   end
 
-  it "should return the directory contents of valid entries when a dangling symlink is present" do
+  it "should return the directory contents of valid entries when a dangling symlink is present", :unless => Puppet.features.microsoft_windows? do
     File.symlink("/some/where", @link)
     list = @mount.list("/", true, false)
     list.sort.should == [ ["/aFile", "file"], ["/", "directory"] ].sort

data/spec/unit/network/http/mongrel_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Rick Bradley on 2007-10-15.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/network/http'
 

data/spec/unit/network/http/webrick_spec.rb

@@ -1,20 +1,16 @@
 #!/usr/bin/env rspec
-#
-#  Created by Rick Bradley on 2007-10-15.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/network/handler'
 require 'puppet/network/http'
 require 'puppet/network/http/webrick'
 
-describe Puppet::Network::HTTP::WEBrick, "after initializing" do
+describe Puppet::Network::HTTP::WEBrick, "after initializing", :unless => Puppet.features.microsoft_windows? do
   it "should not be listening" do
     Puppet::Network::HTTP::WEBrick.new.should_not be_listening
   end
 end
 
-describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do
+describe Puppet::Network::HTTP::WEBrick, "when turning on listening", :unless => Puppet.features.microsoft_windows? do
   before do
     @mock_webrick = stub('webrick', :[] => {}, :listeners => [], :status => :Running)
     [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
@@ -143,7 +139,7 @@ describe Puppet::Network::HTTP::WEBrick, "when turning on listening" do
 end
 
 
-describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a protocol" do
+describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a protocol", :unless => Puppet.features.microsoft_windows? do
   it "should require a protocol" do
     lambda { Puppet::Network::HTTP::WEBrick.class_for_protocol }.should raise_error(ArgumentError)
   end
@@ -161,7 +157,7 @@ describe Puppet::Network::HTTP::WEBrick, "when looking up the class to handle a
   end
 end
 
-describe Puppet::Network::HTTP::WEBrick, "when turning off listening" do
+describe Puppet::Network::HTTP::WEBrick, "when turning off listening", :unless => Puppet.features.microsoft_windows? do
   before do
     @mock_webrick = stub('webrick', :[] => {}, :listeners => [], :status => :Running)
     [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}
@@ -188,7 +184,7 @@ describe Puppet::Network::HTTP::WEBrick, "when turning off listening" do
   end
 end
 
-describe Puppet::Network::HTTP::WEBrick do
+describe Puppet::Network::HTTP::WEBrick, :unless => Puppet.features.microsoft_windows? do
   before do
     @mock_webrick = stub('webrick', :[] => {})
     [:mount, :start, :shutdown].each {|meth| @mock_webrick.stubs(meth)}

data/spec/unit/network/http_pool_spec.rb

@@ -1,22 +1,12 @@
 #!/usr/bin/env rspec
-#
-#  Created by Luke Kanies on 2007-11-26.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/network/http_pool'
 
 describe Puppet::Network::HttpPool do
   after do
-    Puppet::Util::Cacher.expire
-    Puppet::Network::HttpPool.clear_http_instances
     Puppet::Network::HttpPool.instance_variable_set("@ssl_host", nil)
   end
 
-  it "should have keep-alive disabled" do
-    Puppet::Network::HttpPool::HTTP_KEEP_ALIVE.should be_false
-  end
-
   it "should use the global SSL::Host instance to get its certificate information" do
     host = mock 'host'
     Puppet::SSL::Host.expects(:localhost).with.returns host
@@ -58,71 +48,10 @@ describe Puppet::Network::HttpPool do
       Puppet::Network::HttpPool.http_instance("me", 54321).open_timeout.should == 120
     end
 
-    describe "and http keep-alive is enabled" do
-      before do
-        Puppet::Network::HttpPool.stubs(:keep_alive?).returns true
-      end
-
-      it "should cache http instances" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        old = Puppet::Network::HttpPool.http_instance("me", 54321)
-        Puppet::Network::HttpPool.http_instance("me", 54321).should equal(old)
-      end
-
-      it "should have a mechanism for getting a new http instance instead of the cached instance" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        old = Puppet::Network::HttpPool.http_instance("me", 54321)
-        Puppet::Network::HttpPool.http_instance("me", 54321, true).should_not equal(old)
-      end
-
-      it "should close existing, open connections when requesting a new connection" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        old = Puppet::Network::HttpPool.http_instance("me", 54321)
-        old.expects(:started?).returns(true)
-        old.expects(:finish)
-        Puppet::Network::HttpPool.http_instance("me", 54321, true)
-      end
-
-      it "should have a mechanism for clearing the http cache" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        old = Puppet::Network::HttpPool.http_instance("me", 54321)
-        Puppet::Network::HttpPool.http_instance("me", 54321).should equal(old)
-        old = Puppet::Network::HttpPool.http_instance("me", 54321)
-        Puppet::Network::HttpPool.clear_http_instances
-        Puppet::Network::HttpPool.http_instance("me", 54321).should_not equal(old)
-      end
-
-      it "should close open http connections when clearing the cache" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        one = Puppet::Network::HttpPool.http_instance("me", 54321)
-        one.expects(:started?).returns(true)
-        one.expects(:finish).returns(true)
-        Puppet::Network::HttpPool.clear_http_instances
-      end
-
-      it "should not close unopened http connections when clearing the cache" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        one = Puppet::Network::HttpPool.http_instance("me", 54321)
-        one.expects(:started?).returns(false)
-        one.expects(:finish).never
-        Puppet::Network::HttpPool.clear_http_instances
-      end
-    end
-
-    describe "and http keep-alive is disabled" do
-      before do
-        Puppet::Network::HttpPool.stubs(:keep_alive?).returns false
-      end
-
-      it "should not cache http instances" do
-        stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
-        old = Puppet::Network::HttpPool.http_instance("me", 54321)
-        Puppet::Network::HttpPool.http_instance("me", 54321).should_not equal(old)
-      end
-    end
-
-    after do
-      Puppet::Network::HttpPool.clear_http_instances
+    it "should not cache http instances" do
+      stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
+      old = Puppet::Network::HttpPool.http_instance("me", 54321)
+      Puppet::Network::HttpPool.http_instance("me", 54321).should_not equal(old)
     end
   end
 

data/spec/unit/network/http_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Rick Bradley on 2007-10-03.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 
 require 'puppet/network/http'

data/spec/unit/network/server_spec.rb

@@ -1,8 +1,4 @@
 #!/usr/bin/env rspec
-#
-#  Created by Rick Bradley on 2007-10-03.
-#  Copyright (c) 2007. All rights reserved.
-
 require 'spec_helper'
 require 'puppet/network/server'
 require 'puppet/network/handler'