puppet 2.6.18 → 2.7.1

data/test/network/handler/fileserver.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/fileserver'

data/test/network/handler/master.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/master'
@@ -13,7 +13,7 @@ class TestMaster < Test::Unit::TestCase
     @master = Puppet::Network::Handler.master.new(:Manifest => tempfile)
 
     @catalog = stub 'catalog', :extract => ""
-    Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
+    Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
   end
 
   def teardown
@@ -32,15 +32,17 @@ class TestMaster < Test::Unit::TestCase
 
   def test_hostname_is_used_if_client_is_missing
     @master.expects(:decode_facts).returns("hostname" => "yay")
-    Puppet::Node::Facts.expects(:new).with { |name, facts| name == "yay" }.returns(stub('facts', :save => nil))
+    facts = Puppet::Node::Facts.new("the_facts")
+    Puppet::Node::Facts.indirection.stubs(:save).with(facts)
+    Puppet::Node::Facts.expects(:new).with { |name, facts| name == "yay" }.returns(facts)
 
     @master.getconfig("facts")
   end
 
   def test_facts_are_saved
-    facts = mock('facts')
+    facts = Puppet::Node::Facts.new("the_facts")
     Puppet::Node::Facts.expects(:new).returns(facts)
-    facts.expects(:save)
+    Puppet::Node::Facts.indirection.expects(:save).with(facts)
 
     @master.stubs(:decode_facts)
 
@@ -48,12 +50,13 @@ class TestMaster < Test::Unit::TestCase
   end
 
   def test_catalog_is_used_for_compiling
-    facts = stub('facts', :save => nil)
+    facts = Puppet::Node::Facts.new("the_facts")
+    Puppet::Node::Facts.indirection.stubs(:save).with(facts)
     Puppet::Node::Facts.stubs(:new).returns(facts)
 
     @master.stubs(:decode_facts)
 
-    Puppet::Resource::Catalog.expects(:find).with("foo.com").returns(@catalog)
+    Puppet::Resource::Catalog.indirection.expects(:find).with("foo.com").returns(@catalog)
 
     @master.getconfig("facts", "yaml", "foo.com")
   end
@@ -61,14 +64,15 @@ end
 
 class TestMasterFormats < Test::Unit::TestCase
   def setup
-    @facts = stub('facts', :save => nil)
+    @facts = Puppet::Node::Facts.new("the_facts")
     Puppet::Node::Facts.stubs(:new).returns(@facts)
+    Puppet::Node::Facts.indirection.stubs(:save)
 
     @master = Puppet::Network::Handler.master.new(:Code => "")
     @master.stubs(:decode_facts)
 
     @catalog = stub 'catalog', :extract => ""
-    Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
+    Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
   end
 
   def test_marshal_can_be_used

data/test/network/handler/report.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/report'

data/test/network/handler/runner.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/runner'

data/test/network/rights.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/rights'

data/test/network/server/mongrel_test.rb

@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
+
+require 'puppettest'
+require 'mocha'
+
+class TestMongrelServer < PuppetTest::TestCase
+  confine "Missing mongrel" => Puppet.features.mongrel?
+
+  include PuppetTest::ServerTest
+
+  def mkserver(handlers = nil)
+    handlers ||= { :Status => nil }
+    mongrel = Puppet::Network::HTTPServer::Mongrel.new(handlers)
+  end
+
+  # Make sure client info is correctly extracted.
+  def test_client_info
+    obj = Object.new
+    obj.singleton_class.send(:attr_accessor, :params)
+    params = {}
+    obj.params = params
+
+    mongrel = mkserver
+
+    ip = Facter.value(:ipaddress)
+    params["REMOTE_ADDR"] = ip
+    params[Puppet[:ssl_client_header]] = ""
+    params[Puppet[:ssl_client_verify_header]] = "failure"
+    info = nil
+    Resolv.expects(:getname).with(ip).returns("host.domain.com").times(4)
+    assert_nothing_raised("Could not call client_info") do
+      info = mongrel.send(:client_info, obj)
+    end
+    assert(! info.authenticated?, "Client info object was marked valid even though headers were missing")
+    assert_equal(ip, info.ip, "Did not copy over ip correctly")
+
+    assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
+
+    # Now pass the X-Forwarded-For header and check it is preferred over REMOTE_ADDR
+    params["REMOTE_ADDR"] = '127.0.0.1'
+    params["HTTP_X_FORWARDED_FOR"] = ip
+    info = nil
+    assert_nothing_raised("Could not call client_info") do
+      info = mongrel.send(:client_info, obj)
+    end
+    assert(! info.authenticated?, "Client info object was marked valid even though headers were missing")
+    assert_equal(ip, info.ip, "Did not copy over ip correctly")
+
+    assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
+
+    # Now add a valid auth header.
+    params["REMOTE_ADDR"] = ip
+    params["HTTP_X_FORWARDED_FOR"] = nil
+    params[Puppet[:ssl_client_header]] = "/CN=host.domain.com"
+    assert_nothing_raised("Could not call client_info") do
+      info = mongrel.send(:client_info, obj)
+    end
+    assert(! info.authenticated?, "Client info object was marked valid even though the verify header was fals")
+    assert_equal(ip, info.ip, "Did not copy over ip correctly")
+    assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
+
+    # Now change the verify header to be true
+    params[Puppet[:ssl_client_verify_header]] = "SUCCESS"
+    assert_nothing_raised("Could not call client_info") do
+      info = mongrel.send(:client_info, obj)
+    end
+
+    assert(info.authenticated?, "Client info object was not marked valid even though all headers were correct")
+    assert_equal(ip, info.ip, "Did not copy over ip correctly")
+    assert_equal("host.domain.com", info.name, "Did not copy over hostname correctly")
+
+    # Now try it with a different header name
+    params.delete(Puppet[:ssl_client_header])
+    Puppet[:ssl_client_header] = "header_testing"
+    params["header_testing"] = "/CN=other.domain.com"
+    info = nil
+    assert_nothing_raised("Could not call client_info with other header") do
+      info = mongrel.send(:client_info, obj)
+    end
+
+    assert(info.authenticated?, "Client info object was not marked valid even though the header was present")
+    assert_equal(ip, info.ip, "Did not copy over ip correctly")
+    assert_equal("other.domain.com", info.name, "Did not copy over hostname correctly")
+
+    # Now make sure it's considered invalid without that header
+    params.delete("header_testing")
+    info = nil
+    assert_nothing_raised("Could not call client_info with no header") do
+      info = mongrel.send(:client_info, obj)
+    end
+
+    assert(! info.authenticated?, "Client info object was marked valid without header")
+    assert_equal(ip, info.ip, "Did not copy over ip correctly")
+    assert_equal(Resolv.getname(ip), info.name, "Did not look up hostname correctly")
+  end
+end
+

data/test/network/server/webrick.rb

@@ -0,0 +1,128 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
+
+require 'puppettest'
+require 'puppet/network/http_server/webrick'
+require 'mocha'
+
+class TestWebrickServer < Test::Unit::TestCase
+  include PuppetTest::ServerTest
+
+  def setup
+    Puppet::Util::SUIDManager.stubs(:asuser).yields
+    super
+  end
+
+  def teardown
+    super
+    Puppet::Network::HttpPool.clear_http_instances
+  end
+
+  # Make sure we can create a server, and that it knows how to create its
+  # certs by default.
+  def test_basics
+    server = nil
+    assert_raise(Puppet::Error, "server succeeded with no cert") do
+
+            server = Puppet::Network::HTTPServer::WEBrick.new(
+                
+        :Port => @@port,
+        
+        :Handlers => {
+          :Status => nil
+        }
+      )
+    end
+
+    assert_nothing_raised("Could not create simple server") do
+
+            server = Puppet::Network::HTTPServer::WEBrick.new(
+                
+        :Port => @@port,
+        
+        :Handlers => {
+          :CA => {}, # so that certs autogenerate
+          :Status => nil
+        }
+      )
+    end
+
+    assert(server, "did not create server")
+
+    assert(server.cert, "did not retrieve cert")
+  end
+
+  # test that we can connect to the server
+  # we have to use fork here, because we apparently can't use threads
+  # to talk to other threads
+  def test_connect_with_fork
+    Puppet[:autosign] = true
+    serverpid, server = mk_status_server
+
+    # create a status client, and verify it can talk
+    client = mk_status_client
+
+    assert(client.cert, "did not get cert for client")
+
+    retval = nil
+    assert_nothing_raised("Could not connect to server") {
+      retval = client.status
+    }
+    assert_equal(1, retval)
+  end
+
+  def mk_status_client
+    client = nil
+
+    assert_nothing_raised {
+
+            client = Puppet::Network::Client.status.new(
+                
+        :Server => "localhost",
+        
+        :Port => @@port
+      )
+    }
+    client
+  end
+
+  def mk_status_server
+    server = nil
+    Puppet[:certdnsnames] = "localhost"
+    assert_nothing_raised {
+
+            server = Puppet::Network::HTTPServer::WEBrick.new(
+                
+        :Port => @@port,
+        
+        :Handlers => {
+          :CA => {}, # so that certs autogenerate
+          :Status => nil
+        }
+      )
+
+    }
+
+    pid = fork {
+      Puppet.run_mode.stubs(:master?).returns true
+      assert_nothing_raised {
+        trap(:INT) { server.shutdown }
+        server.start
+      }
+    }
+    @@tmppids << pid
+    [pid, server]
+  end
+
+  def kill_and_wait(pid, file)
+    %x{kill -INT #{pid} 2>/dev/null}
+    count = 0
+    while count < 30 && File::exist?(file)
+      count += 1
+      sleep(1)
+    end
+    assert(count < 30, "Killing server #{pid} failed")
+  end
+end
+

data/test/network/xmlrpc/client.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
+
+require 'puppettest'
+require 'puppet/network/xmlrpc/client'
+require 'mocha'
+
+class TestXMLRPCClient < Test::Unit::TestCase
+  include PuppetTest
+
+  def setup
+    Puppet::Util::SUIDManager.stubs(:asuser).yields
+    super
+  end
+
+  def test_set_backtrace
+    error = Puppet::Network::XMLRPCClientError.new("An error")
+    assert_nothing_raised do
+      error.set_backtrace ["caller"]
+    end
+    assert_equal(["caller"], error.backtrace)
+  end
+
+  # Make sure we correctly generate a netclient
+  def test_handler_class
+    # Create a test handler
+    klass = Puppet::Network::XMLRPCClient
+    yay = Class.new(Puppet::Network::Handler) do
+      @interface = XMLRPC::Service::Interface.new("yay") { |iface|
+        iface.add_method("array getcert(csr)")
+      }
+
+      @name = :Yay
+    end
+    Object.const_set("Yay", yay)
+
+    net = nil
+    assert_nothing_raised("Failed when retrieving client for handler") do
+      net = klass.handler_class(yay)
+    end
+
+    assert(net, "did not get net client")
+  end
+end

data/test/network/xmlrpc/processor.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/xmlrpc/processor'

data/test/network/xmlrpc/server.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/xmlrpc/server'

data/test/network/xmlrpc/webrick_servlet.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'

data/test/other/provider.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/provider'

data/test/other/puppet.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'

data/test/other/relationships.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
@@ -14,11 +14,8 @@ class TestRelationships < Test::Unit::TestCase
 
   def newfile
     assert_nothing_raised {
-
-            return Puppet::Type.type(:file).new(
-                
+      return Puppet::Type.type(:file).new(
         :path => tempfile,
-        
         :check => [:mode, :owner, :group]
       )
     }
@@ -58,18 +55,14 @@ class TestRelationships < Test::Unit::TestCase
   def test_autorequire
     # We know that execs autorequire their cwd, so we'll use that
     path = tempfile
-
-
-          file = Puppet::Type.type(:file).new(
-        :title => "myfile", :path => path,
-        
-      :ensure => :directory)
-
-          exec = Puppet::Type.newexec(
-        :title => "myexec", :cwd => path,
-        
-      :command => "/bin/echo")
-
+    file = Puppet::Type.type(:file).new(
+      :title => "myfile", :path => path,
+      :ensure => :directory
+    )
+    exec = Puppet::Type.newexec(
+      :title => "myexec", :cwd => path,
+      :command => "/bin/echo"
+    )
     catalog = mk_catalog(file, exec)
     reqs = nil
     assert_nothing_raised do
@@ -82,7 +75,7 @@ class TestRelationships < Test::Unit::TestCase
     # Now make sure that these relationships are added to the
     # relationship graph
     catalog.apply do |trans|
-      assert(catalog.relationship_graph.edge?(file, exec), "autorequire edge was not created")
+      assert(catalog.relationship_graph.path_between(file, exec), "autorequire edge was not created")
     end
   end