puppet 0.23.2 → 0.24.0

data/lib/puppet/util/storage.rb

@@ -46,7 +46,7 @@ class Puppet::Util::Storage
     self.init
 
     def self.load
-        Puppet.config.use(:main)
+        Puppet.settings.use(:main) unless FileTest.directory?(Puppet[:statedir])
 
         unless File.exists?(Puppet[:statefile])
             unless defined? @@state and ! @@state.nil?
@@ -99,5 +99,3 @@ class Puppet::Util::Storage
         end
     end
 end
-
-# $Id: storage.rb 2463 2007-05-04 23:09:34Z luke $

data/lib/puppet/util/subclass_loader.rb

@@ -87,4 +87,3 @@ module Puppet::Util::SubclassLoader
     end
 end
 
-# $Id: subclass_loader.rb 2479 2007-05-07 22:29:44Z luke $

data/lib/puppet/util/suidmanager.rb

@@ -1,52 +1,41 @@
 require 'facter'
 require 'puppet/util/warnings'
+require 'forwardable'
 
 module Puppet::Util::SUIDManager
     include Puppet::Util::Warnings
+    extend Forwardable
 
-    platform = Facter["kernel"].value
-    [:uid=, :gid=, :uid, :gid].each do |method|
-        define_method(method) do |*args|
-            # NOTE: 'method' is closed here.
-            newmethod = method
+    to_delegate_to_process = [ :euid=, :euid, :egid=, :egid,
+                               :uid=, :uid, :gid=, :gid ]
 
-            if platform == "Darwin" and (method == :uid= or method == :gid=)
-                Puppet::Util::Warnings.warnonce "Cannot change real UID on Darwin"
-                newmethod = ("e" + method.to_s).intern
-            end
-
-            return Process.send(newmethod, *args)
-        end
+    to_delegate_to_process.each do |method|
+        def_delegator Process, method
         module_function method
     end
 
-    [:euid=, :euid, :egid=, :egid].each do |method|
-        define_method(method) do |*args|
-            Process.send(method, *args)
-        end
-        module_function method
+    if Facter['kernel'].value == 'Darwin'
+        # Cannot change real UID on Darwin so we set euid
+        alias :uid :euid
+        alias :gid :egid
     end
 
-    def asuser(new_euid=nil, new_egid=nil)
-        # Unless we're root, don't do a damn thing.
-        unless Process.uid == 0
-            return yield
-        end
-        old_egid = old_euid = nil
-        if new_egid
-            old_egid = self.egid
-            self.egid = convert_xid(:gid, new_egid)
+    # Runs block setting uid and gid if provided then restoring original ids
+    def asuser(new_uid=nil, new_gid=nil)
+        return yield unless Process.uid == 0
+        # We set both because some programs like to drop privs, i.e. bash.
+        old_uid, old_gid = self.uid, self.gid
+        old_euid, old_egid = self.euid, self.egid
+        begin
+            self.egid = convert_xid :gid, new_gid if new_gid
+            self.euid = convert_xid :uid, new_uid if new_uid
+  
+            yield
+        ensure
+            self.euid, self.egid = old_euid, old_egid
         end
-        if new_euid
-            old_euid = self.euid
-            self.euid = convert_xid(:uid, new_euid)
-        end
-
-        return yield
-    ensure
-        self.euid = old_euid if old_euid
-        self.egid = old_egid if old_egid
     end
+    module_function :asuser
     
     # Make sure the passed argument is a number.
     def convert_xid(type, id)
@@ -58,17 +47,13 @@ module Puppet::Util::SUIDManager
         end
         return ret
     end
+    module_function :convert_xid
 
-    module_function :asuser, :convert_xid
 
     def run_and_capture(command, new_uid=nil, new_gid=nil)
-        output = nil
-        
         output = Puppet::Util.execute(command, :failonfail => false, :uid => new_uid, :gid => new_gid)
-
         [output, $?.dup]
     end
-
     module_function :run_and_capture
 
     def system(command, new_uid=nil, new_gid=nil)
@@ -79,8 +64,6 @@ module Puppet::Util::SUIDManager
         end
         status
     end
-            
     module_function :system
 end
 
-# $Id: suidmanager.rb 2387 2007-04-04 21:35:00Z mccune $

data/lib/puppet/util/uri_helper.rb

@@ -0,0 +1,22 @@
+#
+#  Created by Luke Kanies on 2007-10-16.
+#  Copyright (c) 2007. All rights reserved.
+
+require 'uri'
+require 'puppet/util'
+
+# Helper methods for dealing with URIs.
+module Puppet::Util::URIHelper
+    def key2uri(key)
+        # Return it directly if it's fully qualified.
+        if key =~ /^#{::File::SEPARATOR}/
+            key = "file://" + key
+        end
+
+        begin
+            uri = URI.parse(URI.escape(key))
+        rescue => detail
+            raise ArgumentError, "Could not understand URI %s: %s" % [key, detail.to_s]
+        end
+    end
+end

data/lib/puppet/util/variables.rb

@@ -36,4 +36,3 @@ module Puppet::Util::Variables
     end
 end
 
-# $Id: variables.rb 1762 2006-10-10 20:59:10Z luke $

data/lib/puppet/util/warnings.rb

@@ -12,4 +12,3 @@ module Puppet::Util::Warnings
     end
 end
 
-# $Id: warnings.rb 1580 2006-09-13 16:48:56Z lutter $

data/test/Rakefile

@@ -94,4 +94,4 @@ filemap.each do |dir, files|
     task(dir + "/" => dir)
 end
 
-# $Id: Rakefile 2144 2007-02-01 01:20:20Z lutter $
+# $Id$

data/test/certmgr/ca.rb

@@ -1,14 +1,21 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/sslcertificates/ca.rb'
 require 'puppettest'
 require 'puppettest/certificates'
+require 'mocha'
 
 class TestCA < Test::Unit::TestCase
     include PuppetTest
+
+    def setup
+      super
+      Puppet::Util::SUIDManager.stubs(:asuser).yields
+    end
+
     def hosts
         %w{host.domain.com Other.Testing.Com}
     end
@@ -78,4 +85,3 @@ class TestCA < Test::Unit::TestCase
     end
 end
 
-# $Id: ca.rb 2232 2007-02-27 22:14:56Z luke $

data/test/certmgr/certmgr.rb

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/sslcertificates.rb'
 require 'puppettest'
 require 'puppettest/certificates'
+require 'mocha'
 
 class TestCertMgr < Test::Unit::TestCase
     include PuppetTest::Certificates
@@ -14,6 +15,8 @@ class TestCertMgr < Test::Unit::TestCase
         #@dir = File.join(Puppet[:certdir], "testing")
         @dir = File.join(@configpath, "certest")
         system("mkdir -p %s" % @dir)
+
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
     end
 
     def testCreateSelfSignedCertificate
@@ -236,14 +239,20 @@ class TestCertMgr < Test::Unit::TestCase
 
         ca.revoke(h1.serial)
 
+        oldcert = File.read(Puppet.settings[:cacert])
+        oldserial = File.read(Puppet.settings[:serial])
+
         # Recreate the CA from disk
         ca = mkCA()
+        newcert = File.read(Puppet.settings[:cacert])
+        newserial = File.read(Puppet.settings[:serial])
+        assert_equal(oldcert, newcert, "The certs are not equal after making a new CA.")
+        assert_equal(oldserial, newserial, "The serials are not equal after making a new CA.")
         store = mkStore(ca)
-        assert( store.verify(ca.cert))
-        assert(!store.verify(h1, [ca.cert]))
-        assert( store.verify(h2, [ca.cert]))
+        assert( store.verify(ca.cert), "Could not verify CA certs after reloading certs.")
+        assert(!store.verify(h1, [ca.cert]), "Incorrectly verified revoked cert.")
+        assert( store.verify(h2, [ca.cert]), "Could not verify certs with reloaded CA.")
         
-        Puppet.err :yay
         ca.revoke(h2.serial)
         assert_equal(1, ca.crl.extensions.size)
 
@@ -288,4 +297,3 @@ class TestCertMgr < Test::Unit::TestCase
     end
 end
 
-# $Id: certmgr.rb 2169 2007-02-07 06:47:10Z luke $

data/test/certmgr/inventory.rb

@@ -1,16 +1,22 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest/certificates'
 require 'puppet/sslcertificates/inventory.rb'
+require 'mocha'
 
 class TestCertInventory < Test::Unit::TestCase
     include PuppetTest::Certificates
 
     Inventory = Puppet::SSLCertificates::Inventory
 
+    def setup
+      super
+      Puppet::Util::SUIDManager.stubs(:asuser).yields
+    end
+
     def test_format
         cert = mksignedcert
 
@@ -20,8 +26,8 @@ class TestCertInventory < Test::Unit::TestCase
         end
 
         assert(format =~ /^0x0001 \S+ \S+ #{cert.subject}/,
-            "Did not create correct format")
-    end
+              "Did not create correct format")
+      end
 
     def test_init
         # First create a couple of certificates
@@ -42,38 +48,20 @@ class TestCertInventory < Test::Unit::TestCase
     end
 
     def test_add
-        certs = []
-
-        user = Puppet::Util.uid(Puppet[:user])
-
         ca = mkCA
-        3.times do |i|
-            cert = mksignedcert(ca, "host#{i.to_s}.domain.com")
-            certs << cert
+        cert = mksignedcert(ca, "host.domain.com")
 
-            # Add the cert
-            assert_nothing_raised do
-                Puppet::SSLCertificates::Inventory.add(cert)
-            end
-
-            # Now make sure the cert is in there
-            assert(FileTest.exists?(Puppet[:cert_inventory]),
-                "Inventory file was not created")
-
-            # And make sure all of our certs are in there
-            certs.each do |c|
-                assert(
-                    File.read(Puppet[:cert_inventory]).include?(cert.subject.to_s),
-                    "File does not contain %s" % cert.subject.to_s
-                )
+        assert_nothing_raised do
+            file = mock()
+            file.expects(:puts).with do |written|
+                written.include? cert.subject.to_s
             end
+            Puppet::Util::Settings.any_instance.stubs(:write)
+            Puppet::Util::Settings.any_instance.expects(:write).
+              with(:cert_inventory, 'a').yields(file)
 
-            # And make sure the inventory file is owned by the right user
-            if Process.uid == 0
-                assert_equal(user, File.stat(Puppet[:cert_inventory]).uid)
-            end
+            Puppet::SSLCertificates::Inventory.add(cert)
         end
     end
 end
 
-# $Id: inventory.rb 1835 2006-11-08 05:22:24Z luke $

data/test/certmgr/support.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/sslcertificates/support'
+require 'mocha'
 
 class TestCertSupport < Test::Unit::TestCase
     include PuppetTest
@@ -15,6 +16,7 @@ class TestCertSupport < Test::Unit::TestCase
 
     def setup
         super
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
         @user = CertUser.new
         @ca = Puppet::SSLCertificates::CA.new
         @client = Puppet::Network::Client.ca.new(:CA => @ca)
@@ -78,4 +80,3 @@ class TestCertSupport < Test::Unit::TestCase
     end
 end
 
-# $Id: support.rb 2259 2007-03-06 19:03:05Z luke $

data/test/executables/filebucket.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/network/client'
@@ -46,4 +46,3 @@ class TestFileBucketExe < Test::Unit::TestCase
     end
 end
 
-# $Id: filebucket.rb 2349 2007-03-24 21:17:37Z luke $

data/test/executables/puppetbin.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 
@@ -85,4 +85,3 @@ class TestPuppetBin < Test::Unit::TestCase
     end
 end
 
-# $Id: puppetbin.rb 2259 2007-03-06 19:03:05Z luke $

data/test/executables/puppetca.rb

@@ -1,11 +1,17 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
+require 'mocha'
 
 class TestPuppetCA < Test::Unit::TestCase
     include PuppetTest::ExeTest
+
+    def setup
+      super
+      Puppet::Util::SUIDManager.stubs(:asuser).yields
+    end
     
     def gen_cert(ca, host)
         runca("-g #{host}")
@@ -107,4 +113,3 @@ class TestPuppetCA < Test::Unit::TestCase
     end
 end
 
-# $Id: puppetca.rb 2259 2007-03-06 19:03:05Z luke $

data/test/executables/puppetd.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/network/client'
@@ -10,50 +10,44 @@ require 'facter'
 
 class TestPuppetDExe < Test::Unit::TestCase
     include PuppetTest::ExeTest
-    def test_normalstart
+    def setup
+        super
         # start the master
-        file = startmasterd
-
-        # create the client
-        client = Puppet::Network::Client.master.new(:Server => "localhost", :Port => @@port)
-
-        # make a new fqdn
-        fqdn = Puppet[:certname].sub(/^\w+\./, "testing.")
-
-        cmd = "puppetd"
-        cmd += " --verbose"
-        cmd += " --onetime"
-        cmd += " --masterport %s" % @@port
-        cmd += " --confdir %s" % Puppet[:confdir]
-        cmd += " --rundir %s" % File.join(Puppet[:vardir], "run")
-        cmd += " --vardir %s" % Puppet[:vardir]
-        cmd += " --server localhost"
+        @manifest = startmasterd
+
+        @cmd = "puppetd"
+        @cmd += " --verbose"
+        @cmd += " --test"
+        @cmd += " --masterport %s" % @@port
+        @cmd += " --confdir %s" % Puppet[:confdir]
+        @cmd += " --rundir %s" % File.join(Puppet[:vardir], "run")
+        @cmd += " --vardir %s" % Puppet[:vardir]
+        @cmd += " --server localhost"
+    end
 
+    def test_normalstart
         # and verify our daemon runs
+        output = nil
         assert_nothing_raised {
-            %x{#{cmd} 2>&1}
+            output = %x{#{@cmd} 2>&1}
         }
         sleep 1
         assert($? == 0, "Puppetd exited with code %s" % $?)
 
-        assert(FileTest.exists?(@createdfile),
-            "Failed to create config'ed file")
-
-        # now verify that --noop works
-        File.unlink(@createdfile)
+        assert(FileTest.exists?(@createdfile), "Failed to create file %s" % @createdfile)
+    end
 
-        cmd += " --noop"
+    # now verify that --noop works
+    def test_noop_start
+        @cmd += " --noop"
         assert_nothing_raised {
-            output = %x{#{cmd}}.chomp
+            output = %x{#{@cmd}}.chomp
         }
         sleep 1
         assert($? == 0, "Puppetd exited with code %s" % $?)
 
         assert(! FileTest.exists?(@createdfile),
             "Noop created config'ed file")
-
-        stopmasterd
     end
 end
 
-# $Id: puppetd.rb 2259 2007-03-06 19:03:05Z luke $