puppet 2.6.18 → 2.7.1

data/spec/unit/network/http/mongrel/rest_spec.rb

@@ -1,10 +1,9 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/network/http'
 
-describe "Puppet::Network::HTTP::MongrelREST", :if => Puppet.features.mongrel? do
+describe "Puppet::Network::HTTP::MongrelREST", :if => Puppet.features.mongrel?, :'fails_on_ruby_1.9.2' => true do
   before do
     require 'puppet/network/http/mongrel/rest'
   end

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

@@ -1,20 +1,20 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Rick Bradley on 2007-10-15.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'puppet/network/http'
 
-describe "Puppet::Network::HTTP::Mongrel", "after initializing", :if => Puppet.features.mongrel? do
-  it "should not be listening" do
+describe "Puppet::Network::HTTP::Mongrel", "after initializing", :if => Puppet.features.mongrel?, :'fails_on_ruby_1.9.2' => true do
+  it "should not be listening", :'fails_on_ruby_1.9.2' => true do
     require 'puppet/network/http/mongrel'
 
     Puppet::Network::HTTP::Mongrel.new.should_not be_listening
   end
 end
 
-describe "Puppet::Network::HTTP::Mongrel", "when turning on listening", :if => Puppet.features.mongrel? do
+describe "Puppet::Network::HTTP::Mongrel", "when turning on listening", :if => Puppet.features.mongrel?, :'fails_on_ruby_1.9.2' => true do
   before do
     require 'puppet/network/http/mongrel'
 
@@ -96,7 +96,7 @@ describe "Puppet::Network::HTTP::Mongrel", "when turning on listening", :if => P
   end
 end
 
-describe "Puppet::Network::HTTP::Mongrel", "when turning off listening", :if => Puppet.features.mongrel? do
+describe "Puppet::Network::HTTP::Mongrel", "when turning off listening", :if => Puppet.features.mongrel?, :'fails_on_ruby_1.9.2' => true do
   before do
     @mock_mongrel = mock('mongrel httpserver')
     @mock_mongrel.stubs(:run)

data/spec/unit/network/http/rack/rest_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/network/http/rack' if Puppet.features.rack?
 require 'puppet/network/http/rack/rest'
 
@@ -92,23 +91,6 @@ describe "Puppet::Network::HTTP::RackREST", :if => Puppet.features.rack? do
           @handler.set_response(@response, @file, 200)
         end
       end
-
-      it "should ensure the body has been read on success" do
-        req = mk_req('/production/report/foo', :method => 'PUT')
-        req.body.expects(:read).at_least_once
-
-        Puppet::Transaction::Report.stubs(:save)
-
-        @handler.process(req, @response)
-      end
-
-      it "should ensure the body has been partially read on failure" do
-        req = mk_req('/production/report/foo')
-        req.body.expects(:read).with(1)
-        req.stubs(:check_authorization).raises(Exception)
-
-        @handler.process(req, @response)
-      end
     end
 
     describe "and determining the request parameters" do

data/spec/unit/network/http/rack/xmlrpc_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/network/handler'
 require 'puppet/network/http/rack' if Puppet.features.rack?
 require 'puppet/network/http/rack/xmlrpc' if Puppet.features.rack?

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

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/network/handler'
 require 'puppet/network/http/rack' if Puppet.features.rack?
 

data/spec/unit/network/http/webrick/rest_spec.rb

@@ -1,6 +1,5 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 require 'puppet/network/http'
 require 'webrick'
 require 'puppet/network/http/webrick/rest'
@@ -10,7 +9,7 @@ describe Puppet::Network::HTTP::WEBrickREST do
     Puppet::Network::HTTP::WEBrickREST.ancestors.should be_include(Puppet::Network::HTTP::Handler)
   end
 
-  describe "when initializing" do
+  describe "when initializing", :'fails_on_ruby_1.9.2' => true do
     it "should call the Handler's initialization hook with its provided arguments as the server and handler" do
       Puppet::Network::HTTP::WEBrickREST.any_instance.expects(:initialize_for_puppet).with(:server => "my", :handler => "arguments")
       Puppet::Network::HTTP::WEBrickREST.new("my", "arguments")

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

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Rick Bradley on 2007-10-15.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'puppet/network/handler'
 require 'puppet/network/http'
 require 'puppet/network/http/webrick'
@@ -282,7 +282,7 @@ describe Puppet::Network::HTTP::WEBrick do
       @cert = stub 'cert', :content => "mycert"
       @host = stub 'host', :key => @key, :certificate => @cert, :name => "yay", :ssl_store => "mystore"
 
-      Puppet::SSL::Certificate.stubs(:find).with('ca').returns @cert
+      Puppet::SSL::Certificate.indirection.stubs(:find).with('ca').returns @cert
 
       Puppet::SSL::Host.stubs(:localhost).returns @host
     end
@@ -299,7 +299,7 @@ describe Puppet::Network::HTTP::WEBrick do
     end
 
     it "should fail if no CA certificate can be found" do
-      Puppet::SSL::Certificate.stubs(:find).with('ca').returns nil
+      Puppet::SSL::Certificate.indirection.stubs(:find).with('ca').returns nil
 
       lambda { @server.setup_ssl }.should raise_error(Puppet::Error)
     end
@@ -320,10 +320,6 @@ describe Puppet::Network::HTTP::WEBrick do
       @server.setup_ssl[:SSLEnable].should be_true
     end
 
-    it "should reject SSLv2" do
-      @server.setup_ssl[:SSLOptions].should == OpenSSL::SSL::OP_NO_SSLv2
-    end
-
     it "should configure the verification method as 'OpenSSL::SSL::VERIFY_PEER'" do
       @server.setup_ssl[:SSLVerifyClient].should == OpenSSL::SSL::VERIFY_PEER
     end

data/spec/unit/network/http_pool_spec.rb

@@ -1,9 +1,9 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env rspec
 #
 #  Created by Luke Kanies on 2007-11-26.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 require 'puppet/network/http_pool'
 
 describe Puppet::Network::HttpPool do
@@ -24,34 +24,38 @@ describe Puppet::Network::HttpPool do
   end
 
   describe "when managing http instances" do
-    before :each do
+    def stub_settings(settings)
+      settings.each do |param, value|
+        Puppet.settings.stubs(:value).with(param).returns(value)
+      end
+    end
+
+    before do
       # All of the cert stuff is tested elsewhere
       Puppet::Network::HttpPool.stubs(:cert_setup)
     end
 
     it "should return an http instance created with the passed host and port" do
-      http = Puppet::Network::HttpPool.http_instance("me", 54321)
-      http.should be_an_instance_of Net::HTTP
-      http.address.should == 'me'
-      http.port.should    == 54321
+      http = stub 'http', :use_ssl= => nil, :read_timeout= => nil, :open_timeout= => nil, :started? => false
+      Net::HTTP.expects(:new).with("me", 54321, nil, nil).returns(http)
+      Puppet::Network::HttpPool.http_instance("me", 54321).should equal(http)
     end
 
     it "should enable ssl on the http instance" do
-      Puppet::Network::HttpPool.http_instance("me", 54321).should be_use_ssl
+      Puppet::Network::HttpPool.http_instance("me", 54321).instance_variable_get("@use_ssl").should be_true
     end
 
-    context "proxy and timeout settings should propagate" do
-      subject { Puppet::Network::HttpPool.http_instance("me", 54321) }
-      before :each do
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout]   = 120
-      end
+    it "should set the read timeout" do
+      Puppet::Network::HttpPool.http_instance("me", 54321).read_timeout.should == 120
+    end
+
+    it "should set the open timeout" do
+      Puppet::Network::HttpPool.http_instance("me", 54321).open_timeout.should == 120
     end
 
-    it "should not set a proxy if the value is 'none'" do
-      Puppet[:http_proxy_host] = 'none'
-      Puppet::Network::HttpPool.http_instance("me", 54321).proxy_address.should be_nil
+    it "should create the http instance with the proxy host and port set if the http_proxy is not set to 'none'" do
+      stub_settings :http_proxy_host => "myhost", :http_proxy_port => 432, :configtimeout => 120
+      Puppet::Network::HttpPool.http_instance("me", 54321).open_timeout.should == 120
     end
 
     describe "and http keep-alive is enabled" do
@@ -60,24 +64,19 @@ describe Puppet::Network::HttpPool do
       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
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout] = 120
-
+        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
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout] = 120
-
+        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)
@@ -85,9 +84,7 @@ describe Puppet::Network::HttpPool do
       end
 
       it "should have a mechanism for clearing the http cache" do
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout] = 120
+        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)
@@ -96,9 +93,7 @@ describe Puppet::Network::HttpPool do
       end
 
       it "should close open http connections when clearing the cache" do
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout] = 120
+        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)
@@ -106,9 +101,7 @@ describe Puppet::Network::HttpPool do
       end
 
       it "should not close unopened http connections when clearing the cache" do
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout] = 120
+        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
@@ -122,9 +115,7 @@ describe Puppet::Network::HttpPool do
       end
 
       it "should not cache http instances" do
-        Puppet[:http_proxy_host] = "myhost"
-        Puppet[:http_proxy_port] = 432
-        Puppet[:configtimeout] = 120
+        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
@@ -135,85 +126,81 @@ describe Puppet::Network::HttpPool do
     end
   end
 
-  describe "when doing SSL setup for http instances" do
-    let :http do
-      http = Net::HTTP.new('localhost', 443)
-      http.use_ssl = true
-      http
+  describe "when adding certificate information to http instances" do
+    before do
+      @http = mock 'http'
+      [:cert_store=, :verify_mode=, :ca_file=, :cert=, :key=].each { |m| @http.stubs(m) }
+      @store = stub 'store'
+
+      @cert = stub 'cert', :content => "real_cert"
+      @key = stub 'key', :content => "real_key"
+      @host = stub 'host', :certificate => @cert, :key => @key, :ssl_store => @store
+
+      Puppet[:confdir] = "/sometthing/else"
+      Puppet.settings.stubs(:value).returns "/some/file"
+      Puppet.settings.stubs(:value).with(:hostcert).returns "/host/cert"
+      Puppet.settings.stubs(:value).with(:localcacert).returns "/local/ca/cert"
+
+      FileTest.stubs(:exist?).with("/host/cert").returns true
+      FileTest.stubs(:exist?).with("/local/ca/cert").returns true
+
+      Puppet::Network::HttpPool.stubs(:ssl_host).returns @host
+    end
+
+    after do
+      Puppet.settings.clear
     end
 
-    let :store do stub('store') end
+    it "should do nothing if no host certificate is on disk" do
+      FileTest.expects(:exist?).with("/host/cert").returns false
+      @http.expects(:cert=).never
+      Puppet::Network::HttpPool.cert_setup(@http)
+    end
 
-    before :each do
-      Puppet[:hostcert]    = '/host/cert'
-      Puppet[:localcacert] = '/local/ca/cert'
-      cert  = stub 'cert', :content => 'real_cert'
-      key   = stub 'key',  :content => 'real_key'
-      host  = stub 'host', :certificate => cert, :key => key, :ssl_store => store
-      Puppet::Network::HttpPool.stubs(:ssl_host).returns(host)
+    it "should do nothing if no local certificate is on disk" do
+      FileTest.expects(:exist?).with("/local/ca/cert").returns false
+      @http.expects(:cert=).never
+      Puppet::Network::HttpPool.cert_setup(@http)
     end
 
-    shared_examples "HTTPS setup without all certificates" do
-      subject { Puppet::Network::HttpPool.cert_setup(http); http }
+    it "should add a certificate store from the ssl host" do
+      @http.expects(:cert_store=).with(@store)
 
-      it                { should be_use_ssl }
-      its(:cert)        { should be_nil }
-      its(:ca_file)     { should be_nil }
-      its(:key)         { should be_nil }
-      its(:verify_mode) { should == OpenSSL::SSL::VERIFY_NONE }
+      Puppet::Network::HttpPool.cert_setup(@http)
     end
 
-    context "with neither a host cert or a local CA cert" do
-      before :each do
-        FileTest.stubs(:exist?).with(Puppet[:hostcert]).returns(false)
-        FileTest.stubs(:exist?).with(Puppet[:localcacert]).returns(false)
-      end
+    it "should add the client certificate" do
+      @http.expects(:cert=).with("real_cert")
 
-      include_examples "HTTPS setup without all certificates"
+      Puppet::Network::HttpPool.cert_setup(@http)
     end
 
-    context "with there is no host certificate" do
-      before :each do
-        FileTest.stubs(:exist?).with(Puppet[:hostcert]).returns(false)
-        FileTest.stubs(:exist?).with(Puppet[:localcacert]).returns(true)
-      end
+    it "should add the client key" do
+      @http.expects(:key=).with("real_key")
 
-      include_examples "HTTPS setup without all certificates"
+      Puppet::Network::HttpPool.cert_setup(@http)
     end
 
-    context "with there is no local CA certificate" do
-      before :each do
-        FileTest.stubs(:exist?).with(Puppet[:hostcert]).returns(true)
-        FileTest.stubs(:exist?).with(Puppet[:localcacert]).returns(false)
-      end
+    it "should set the verify mode to OpenSSL::SSL::VERIFY_PEER" do
+      @http.expects(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER)
 
-      include_examples "HTTPS setup without all certificates"
+      Puppet::Network::HttpPool.cert_setup(@http)
     end
 
-    context "with both the host and CA cert" do
-      subject { Puppet::Network::HttpPool.cert_setup(http); http }
+    it "should set the ca file" do
+      Puppet.settings.stubs(:value).returns "/some/file"
+      FileTest.stubs(:exist?).with(Puppet[:hostcert]).returns true
 
-      before :each do
-        FileTest.expects(:exist?).with(Puppet[:hostcert]).returns(true)
-        FileTest.expects(:exist?).with(Puppet[:localcacert]).returns(true)
-      end
+      Puppet.settings.stubs(:value).with(:localcacert).returns "/ca/cert/file"
+      FileTest.stubs(:exist?).with("/ca/cert/file").returns true
+      @http.expects(:ca_file=).with("/ca/cert/file")
 
-      it                { should be_use_ssl }
-      its(:cert_store)  { should equal store }
-      its(:cert)        { should == "real_cert" }
-      its(:key)         { should == "real_key" }
-      its(:verify_mode) { should == OpenSSL::SSL::VERIFY_PEER }
-      its(:ca_file)     { should == Puppet[:localcacert] }
+      Puppet::Network::HttpPool.cert_setup(@http)
     end
 
     it "should set up certificate information when creating http instances" do
-      Puppet::Network::HttpPool.expects(:cert_setup).with do |http|
-        http.should be_an_instance_of Net::HTTP
-        http.address.should == "one"
-        http.port.should == 2
-      end
-
-      Puppet::Network::HttpPool.http_instance("one", 2)
+      Puppet::Network::HttpPool.expects(:cert_setup).with { |i| i.is_a?(Net::HTTP) }
+      Puppet::Network::HttpPool.http_instance("one", "two")
     end
   end
 end

data/spec/unit/network/http_spec.rb

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

data/spec/unit/network/rest_authconfig_spec.rb

@@ -1,37 +1,22 @@
-#!/usr/bin/env ruby
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+#!/usr/bin/env rspec
+require 'spec_helper'
 
 require 'puppet/network/rest_authconfig'
 
 describe Puppet::Network::RestAuthConfig do
 
-  DEFAULT_ACL = [
-    { :acl => "~ ^\/catalog\/([^\/]+)$", :method => :find, :allow => '$1', :authenticated => true },
-    # this one will allow all file access, and thus delegate
-    # to fileserver.conf
-    { :acl => "/file" },
-    { :acl => "/certificate_revocation_list/ca", :method => :find, :authenticated => true },
-    { :acl => "~ ^\/report\/([^\/]+)$", :method => :save, :allow => '$1', :authenticated => true },
-    { :acl => "/certificate/ca", :method => :find, :authenticated => false },
-    { :acl => "/certificate/", :method => :find, :authenticated => false },
-    { :acl => "/certificate_request", :method => [:find, :save], :authenticated => false },
-    { :acl => "/status", :method => [:find], :authenticated => true },
-  ]
+  DEFAULT_ACL = Puppet::Network::RestAuthConfig::DEFAULT_ACL
 
   before :each do
     FileTest.stubs(:exists?).returns(true)
     File.stubs(:stat).returns(stub('stat', :ctime => :now))
-    Time.stubs(:now).returns :now
+    Time.stubs(:now).returns Time.now
 
     @authconfig = Puppet::Network::RestAuthConfig.new("dummy", false)
     @authconfig.stubs(:read)
 
     @acl = stub_everything 'rights'
     @authconfig.rights = @acl
-
-    @request = stub 'request', :indirection_name => "path", :key => "to/resource", :ip => "127.0.0.1",
-      :node => "me", :method => :save, :environment => :env, :authenticated => true
   end
 
   it "should use the puppet default rest authorization file" do
@@ -40,16 +25,11 @@ describe Puppet::Network::RestAuthConfig do
     Puppet::Network::RestAuthConfig.new(nil, false)
   end
 
-  it "should read the config file when needed" do
-    @authconfig.expects(:read)
-
-    @authconfig.allowed?(@request)
-  end
-
   it "should ask for authorization to the ACL subsystem" do
-    @acl.expects(:is_request_forbidden_and_why?).with(@request).returns(nil)
+    params = {:ip => "127.0.0.1", :node => "me", :environment => :env, :authenticated => true}
+    @acl.expects(:is_request_forbidden_and_why?).with("path", :save, "to/resource", params).returns(nil)
 
-    @authconfig.allowed?(@request)
+    @authconfig.allowed?("path", :save, "to/resource", params)
   end
 
   describe "when defining an acl with mk_acl" do
@@ -104,22 +84,7 @@ describe Puppet::Network::RestAuthConfig do
     end
   end
 
-  it '(CVE-2013-2275) allows report submission only for the node matching the certname by default' do
-    acl = {
-      :acl => "~ ^\/report\/([^\/]+)$",
-      :method => :save,
-      :allow => '$1',
-      :authenticated => true
-    }
-    @authconfig.stubs(:mk_acl)
-    @authconfig.expects(:mk_acl).with(acl)
-    @authconfig.insert_default_acl
-  end
-
   it "should create default ACL entries if no file have been read" do
-    # The singleton instance is stored as an instance variable we don't have
-    # access to, so.. instance_variable_set. Alas.
-    Puppet::Network::RestAuthConfig.instance_variable_set(:@main, nil)
     Puppet::Network::RestAuthConfig.any_instance.stubs(:exists?).returns(false)
 
     Puppet::Network::RestAuthConfig.any_instance.expects(:insert_default_acl)
@@ -156,5 +121,7 @@ describe Puppet::Network::RestAuthConfig do
 
       @authconfig.insert_default_acl
     end
+
   end
+
 end