puppet 3.1.1 → 3.2.0.rc1

data/spec/unit/resource/type_spec.rb

@@ -715,13 +715,13 @@ describe Puppet::Resource::Type do
       dest.doc.should == "foonessyayness"
     end
 
-    it "should turn its code into an ASTArray if necessary" do
+    it "should turn its code into a BlockExpression if necessary" do
       dest = Puppet::Resource::Type.new(:hostclass, "bar", :code => code("foo"))
       source = Puppet::Resource::Type.new(:hostclass, "foo", :code => code("bar"))
 
       dest.merge(source)
 
-      dest.code.should be_instance_of(Puppet::Parser::AST::ASTArray)
+      dest.code.should be_instance_of(Puppet::Parser::AST::BlockExpression)
     end
 
     it "should set the other class's code as its code if it has none" do
@@ -742,7 +742,7 @@ describe Puppet::Resource::Type do
 
       dest.merge(source)
 
-      dest.code.children.collect { |l| l.value }.should == %w{dest source}
+      dest.code.children.collect { |l| l[0].value }.should == %w{dest source}
     end
   end
 end

data/spec/unit/scheduler/job_spec.rb

@@ -0,0 +1,79 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/scheduler'
+
+describe Puppet::Scheduler::Job do
+  let(:run_interval) { 10 }
+  let(:job) { described_class.new(run_interval) }
+
+  it "has a minimum run interval of 0" do
+    Puppet::Scheduler::Job.new(-1).run_interval.should == 0
+  end
+
+  describe "when not run yet" do
+    it "is ready" do
+      job.ready?(2).should be
+    end
+
+    it "gives the time to next run as 0" do
+      job.interval_to_next_from(2).should == 0
+    end
+  end
+
+  describe "when run at least once" do
+    let(:last_run) { 50 }
+
+    before(:each) do
+      job.run(last_run)
+    end
+
+    it "is ready when the time is greater than the last run plus the interval" do
+      job.ready?(last_run + run_interval + 1).should be
+    end
+
+    it "is ready when the time is equal to the last run plus the interval" do
+      job.ready?(last_run + run_interval).should be
+    end
+
+    it "is not ready when the time is less than the last run plus the interval" do
+      job.ready?(last_run + run_interval - 1).should_not be
+    end
+
+    context "when calculating the next run" do
+      it "returns the run interval if now == last run" do
+        job.interval_to_next_from(last_run).should == run_interval
+      end
+
+      it "when time is between the last and next runs gives the remaining portion of the run_interval" do
+        time_since_last_run = 2
+        now = last_run + time_since_last_run
+        job.interval_to_next_from(now).should == run_interval - time_since_last_run
+      end
+
+      it "when time is later than last+interval returns 0" do
+        time_since_last_run = run_interval + 5
+        now = last_run + time_since_last_run
+        job.interval_to_next_from(now).should == 0
+      end
+    end
+  end
+
+  it "starts enabled" do
+    job.enabled?.should be
+  end
+
+  it "can be disabled" do
+    job.disable
+    job.enabled?.should_not be
+  end
+
+  it "has the job instance as a parameter" do
+    passed_job = nil
+    job = Puppet::Scheduler::Job.new(run_interval) do |j|
+      passed_job = j
+    end
+    job.run(5)
+
+    passed_job.should eql(job)
+  end
+end

data/spec/unit/scheduler/scheduler_spec.rb

@@ -0,0 +1,129 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/scheduler'
+
+describe Puppet::Scheduler::Scheduler do
+  let(:now) { 183550 }
+  let(:timer) { MockTimer.new(now) }
+
+  class MockTimer
+    attr_reader :wait_for_calls
+
+    def initialize(start=1729)
+      @now = start
+      @wait_for_calls = []
+    end
+
+    def wait_for(seconds)
+      @wait_for_calls << seconds
+      @now += seconds
+    end
+
+    def now
+      @now
+    end
+  end
+
+  def one_time_job(interval)
+    Puppet::Scheduler::Job.new(interval) { |j| j.disable }
+  end
+
+  def disabled_job(interval)
+    job = Puppet::Scheduler::Job.new(interval) { |j| j.disable }
+    job.disable
+    job
+  end
+
+  it "uses the minimum interval" do
+    later_job = one_time_job(7)
+    earlier_job = one_time_job(2)
+    scheduler = Puppet::Scheduler::Scheduler.new([later_job, earlier_job], timer)
+    later_job.last_run = now
+    earlier_job.last_run = now
+
+    scheduler.run_loop
+
+    timer.wait_for_calls.should == [2, 5]
+  end
+
+  it "ignores disabled jobs when calculating intervals" do
+    enabled = one_time_job(7)
+    enabled.last_run = now
+    disabled = disabled_job(2)
+    scheduler = Puppet::Scheduler::Scheduler.new([enabled, disabled], timer)
+
+    scheduler.run_loop
+
+    timer.wait_for_calls.should == [7]
+  end
+
+  it "asks the timer to wait for the job interval" do
+    job = one_time_job(5)
+    job.last_run = now
+    scheduler = Puppet::Scheduler::Scheduler.new([job], timer)
+
+    scheduler.run_loop
+
+    timer.wait_for_calls.should == [5]
+  end
+
+  it "does not run when there are no jobs" do
+    timer = mock 'no run timer'
+    scheduler = Puppet::Scheduler::Scheduler.new([], timer)
+
+    timer.stubs(:now).returns(now)
+    timer.expects(:wait_for).never
+
+    scheduler.run_loop
+  end
+
+  it "does not run when there are only disabled jobs" do
+    timer = mock 'no run timer'
+    disabled_job = Puppet::Scheduler::Job.new(0)
+    scheduler = Puppet::Scheduler::Scheduler.new([disabled_job], timer)
+
+    disabled_job.disable
+    timer.stubs(:now).returns(now)
+    timer.expects(:wait_for).never
+
+    scheduler.run_loop
+  end
+
+  it "stops running when there are no more enabled jobs" do
+    timer = mock 'run once timer'
+    disabling_job = Puppet::Scheduler::Job.new(0) do |j|
+      j.disable
+    end
+    scheduler = Puppet::Scheduler::Scheduler.new([disabling_job], timer)
+
+    timer.stubs(:now).returns(now)
+    timer.expects(:wait_for).once
+
+    scheduler.run_loop
+  end
+
+  it "marks the start of the run loop" do
+    disabled_job = Puppet::Scheduler::Job.new(0)
+
+    disabled_job.disable
+
+    scheduler = Puppet::Scheduler::Scheduler.new([disabled_job], timer)
+    scheduler.run_loop
+
+    disabled_job.start_time.should == now
+  end
+
+  it "calculates the next interval from the start of a job" do
+    countdown = 2
+    slow_job = Puppet::Scheduler::Job.new(10) do |job|
+      timer.wait_for(3)
+      countdown -= 1
+      job.disable if countdown == 0
+    end
+
+    scheduler = Puppet::Scheduler::Scheduler.new([slow_job], timer)
+    scheduler.run_loop
+
+    timer.wait_for_calls.should == [0, 3, 7, 3]
+  end
+end

data/spec/unit/scheduler/splay_job_spec.rb

@@ -0,0 +1,35 @@
+#! /usr/bin/env ruby
+require 'spec_helper'
+require 'puppet/scheduler'
+
+describe Puppet::Scheduler::SplayJob do
+  let(:run_interval) { 10 }
+  let(:last_run) { 50 }
+  let(:splay_limit) { 5 }
+  let(:start_time) { 23 }
+  let(:job) { described_class.new(run_interval, splay_limit) }
+
+  it "does not apply a splay after the first run" do
+    job.run(last_run)
+    job.interval_to_next_from(last_run).should == run_interval
+  end
+
+  it "calculates the first run splayed from the start time" do
+    job.start_time = start_time
+
+    job.interval_to_next_from(start_time).should == job.splay
+  end
+
+  it "interval to the next run decreases as time advances" do
+    time_passed = 3
+    job.start_time = start_time
+
+    job.interval_to_next_from(start_time + time_passed).should == job.splay - time_passed
+  end
+
+  it "is not immediately ready if splayed" do
+    job.start_time = start_time
+    job.expects(:splay).returns(6)
+    job.ready?(start_time).should_not be
+  end
+end

data/spec/unit/ssl/base_spec.rb

@@ -38,16 +38,10 @@ describe Puppet::SSL::Certificate do
   end
 
   describe "when determining a name from a certificate subject" do
-    it "should convert it to a string" do
+    it "should extract only the CN and not any other components" do
       subject = stub 'sub'
-      subject.expects(:to_s).returns('foo')
-
-      @class.name_from_subject(subject).should == 'foo'
-    end
-
-    it "should strip the prefix" do
-      subject = '/CN=foo'
-      @class.name_from_subject(subject).should == 'foo'
+      Puppet::Util::SSL.expects(:cn_from_subject).with(subject).returns 'host.domain.com'
+      @class.name_from_subject(subject).should == 'host.domain.com'
     end
   end
 

data/spec/unit/ssl/certificate_authority_spec.rb

@@ -1,4 +1,5 @@
 #! /usr/bin/env ruby
+# encoding: ASCII-8BIT
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_authority'

data/spec/unit/ssl/certificate_request_spec.rb

@@ -31,7 +31,9 @@ describe Puppet::SSL::CertificateRequest do
 
   describe "when converting from a string" do
     it "should create a CSR instance with its name set to the CSR subject and its content set to the extracted CSR" do
-      csr = stub 'csr', :subject => "/CN=Foo.madstop.com", :is_a? => true
+      csr = stub 'csr',
+        :subject => OpenSSL::X509::Name.parse("/CN=Foo.madstop.com"),
+        :is_a? => true
       OpenSSL::X509::Request.expects(:new).with("my csr").returns(csr)
 
       mycsr = stub 'sslcsr'

data/spec/unit/ssl/certificate_spec.rb

@@ -26,7 +26,9 @@ describe Puppet::SSL::Certificate do
 
   describe "when converting from a string" do
     it "should create a certificate instance with its name set to the certificate subject and its content set to the extracted certificate" do
-      cert = stub 'certificate', :subject => "/CN=Foo.madstop.com", :is_a? => true
+      cert = stub 'certificate',
+        :subject => OpenSSL::X509::Name.parse("/CN=Foo.madstop.com"),
+        :is_a? => true
       OpenSSL::X509::Certificate.expects(:new).with("my certificate").returns(cert)
 
       mycert = stub 'sslcert'

data/spec/unit/ssl/configuration_spec.rb

@@ -1,6 +1,7 @@
 #! /usr/bin/env ruby
 #
 
+require 'spec_helper'
 require 'puppet/ssl/configuration'
 
 describe Puppet::SSL::Configuration do
@@ -40,6 +41,12 @@ describe Puppet::SSL::Configuration do
     it "#ca_auth_file == ssl_server_ca_auth" do
       subject.ca_auth_file.should == ssl_server_ca_auth
     end
+    it "#ca_auth_certificates returns an Array<OpenSSL::X509::Certificate>" do
+      subject.stubs(:read_file).returns(master_ca_pem + root_ca_pem)
+
+      certs = subject.ca_auth_certificates
+      certs.each { |cert| cert.should be_a_kind_of OpenSSL::X509::Certificate }
+    end
   end
 
   context "Partially configured" do
@@ -57,4 +64,71 @@ describe Puppet::SSL::Configuration do
       end
     end
   end
+
+  # This is the Intermediate CA specifically designated for issuing master
+  # certificates.  It is signed by the Root CA.
+  def master_ca_pem
+    @master_ca_pem ||= <<-AUTH_BUNDLE
+-----BEGIN CERTIFICATE-----
+MIICljCCAf+gAwIBAgIBAjANBgkqhkiG9w0BAQUFADBJMRAwDgYDVQQDDAdSb290
+IENBMRowGAYDVQQLDBFTZXJ2ZXIgT3BlcmF0aW9uczEZMBcGA1UECgwQRXhhbXBs
+ZSBPcmcsIExMQzAeFw0xMzAzMzAwNTUwNDhaFw0zMzAzMjUwNTUwNDhaMH4xJDAi
+BgNVBAMTG0ludGVybWVkaWF0ZSBDQSAobWFzdGVyLWNhKTEfMB0GCSqGSIb3DQEJ
+ARYQdGVzdEBleGFtcGxlLm9yZzEZMBcGA1UEChMQRXhhbXBsZSBPcmcsIExMQzEa
+MBgGA1UECxMRU2VydmVyIE9wZXJhdGlvbnMwXDANBgkqhkiG9w0BAQEFAANLADBI
+AkEAvo/az3oR69SP92jGnUHMJLEyyD1Ui1BZ/rUABJcQTRQqn3RqtlfYePWZnUaZ
+srKbXRS4q0w5Vqf1kx5w3q5tIwIDAQABo4GcMIGZMHkGA1UdIwRyMHCAFDBN1mqO
+Nc4gUraE4zRtw6ueFDDaoU2kSzBJMRAwDgYDVQQDDAdSb290IENBMRowGAYDVQQL
+DBFTZXJ2ZXIgT3BlcmF0aW9uczEZMBcGA1UECgwQRXhhbXBsZSBPcmcsIExMQ4IJ
+ALf2Pk2HvtBzMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4GBACRfa1YPS7RQUuhYovGgV0VYqxuATC7WwdIRihVh5FceSXKgSIbz
+BKmOBAy/KixEhpnHTbkpaJ0d9ITkvjMTmj3M5YMahKaQA5niVPckQPecMMd6jg9U
+l1k75xLLIcrlsDYo3999KOSSchH2K7bLT7TuQ2okdP6FHWmeWmudewlu
+-----END CERTIFICATE-----
+    AUTH_BUNDLE
+  end
+
+  # This is the Root CA
+  def root_ca_pem
+    @root_ca_pem ||= <<-LOCALCACERT
+-----BEGIN CERTIFICATE-----
+MIICYDCCAcmgAwIBAgIJALf2Pk2HvtBzMA0GCSqGSIb3DQEBBQUAMEkxEDAOBgNV
+BAMMB1Jvb3QgQ0ExGjAYBgNVBAsMEVNlcnZlciBPcGVyYXRpb25zMRkwFwYDVQQK
+DBBFeGFtcGxlIE9yZywgTExDMB4XDTEzMDMzMDA1NTA0OFoXDTMzMDMyNTA1NTA0
+OFowSTEQMA4GA1UEAwwHUm9vdCBDQTEaMBgGA1UECwwRU2VydmVyIE9wZXJhdGlv
+bnMxGTAXBgNVBAoMEEV4YW1wbGUgT3JnLCBMTEMwgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBAMGSpafR4lboYOPfPJC1wVHHl0gD49ZVRjOlJ9jidEUjBdFXK6SA
+S1tecDv2G4tM1ANmfMKjZl0m+KaZ8O2oq0g6kxkq1Mg0eSNvlnEyehjmTLRzHC2i
+a0biH2wMtCLzfAoXDKy4GPlciBPE9mup5I8Kien5s91t92tc7K8AJ8oBAgMBAAGj
+UDBOMB0GA1UdDgQWBBQwTdZqjjXOIFK2hOM0bcOrnhQw2jAfBgNVHSMEGDAWgBQw
+TdZqjjXOIFK2hOM0bcOrnhQw2jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4GBACs8EZRrzgzAlcKC1Tz8GYlNHQg0XhpbEDm+p2mOV//PuDD190O+UBpWxo9Q
+rrkkx8En0wXQZJf6iH3hwewwHLOq5yXZKbJN+SmvJvRNL95Yhyy08Y9N65tJveE7
+rPsNU/Tx19jHC87oXlmAePLI4IaUHXrWb7CRbY9TEcPdmj1R
+-----END CERTIFICATE-----
+    LOCALCACERT
+  end
+
+  # This is the intermediate CA designated to issue Agent SSL certs.  It is
+  # signed by the Root CA.
+  def agent_ca_pem
+    @agent_ca_pem ||= <<-AGENT_CA
+-----BEGIN CERTIFICATE-----
+MIIClTCCAf6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRAwDgYDVQQDDAdSb290
+IENBMRowGAYDVQQLDBFTZXJ2ZXIgT3BlcmF0aW9uczEZMBcGA1UECgwQRXhhbXBs
+ZSBPcmcsIExMQzAeFw0xMzAzMzAwNTUwNDhaFw0zMzAzMjUwNTUwNDhaMH0xIzAh
+BgNVBAMTGkludGVybWVkaWF0ZSBDQSAoYWdlbnQtY2EpMR8wHQYJKoZIhvcNAQkB
+FhB0ZXN0QGV4YW1wbGUub3JnMRkwFwYDVQQKExBFeGFtcGxlIE9yZywgTExDMRow
+GAYDVQQLExFTZXJ2ZXIgT3BlcmF0aW9uczBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
+QQDkEj/Msmi4hJImxP5+ocixMTHuYC1M1E2p4QcuzOkZYrfHf+5hJMcahfYhLiXU
+jHBredOXhgSisHh6CLSb/rKzAgMBAAGjgZwwgZkweQYDVR0jBHIwcIAUME3Wao41
+ziBStoTjNG3Dq54UMNqhTaRLMEkxEDAOBgNVBAMMB1Jvb3QgQ0ExGjAYBgNVBAsM
+EVNlcnZlciBPcGVyYXRpb25zMRkwFwYDVQQKDBBFeGFtcGxlIE9yZywgTExDggkA
+t/Y+TYe+0HMwDwYDVR0TAQH/BAUwAwEB/zALBgNVHQ8EBAMCAQYwDQYJKoZIhvcN
+AQEFBQADgYEAujSj9rxIxJHEuuYXb15L30yxs9Tdvy4OCLiKdjvs9Z7gG8Pbutls
+ooCwyYAkmzKVs/8cYjZJnvJrPEW1gFwqX7Xknp85Cfrl+/pQEPYq5sZVa5BIm9tI
+0EvlDax/Hd28jI6Bgq5fsTECNl9GDGknCy7vwRZem0h+hI56lzR3pYE=
+-----END CERTIFICATE-----
+AGENT_CA
+  end
 end

data/spec/unit/ssl/host_spec.rb

@@ -710,17 +710,38 @@ describe Puppet::SSL::Host do
       before do
         @crl = stub 'crl', :content => "real_crl"
         Puppet::SSL::CertificateRevocationList.indirection.stubs(:find).returns @crl
-        Puppet[:certificate_revocation] = true
       end
 
-      it "should add the CRL" do
-        @store.expects(:add_crl).with "real_crl"
-        @host.ssl_store
+      describe "and 'certificate_revocation' is true" do
+        before do
+          Puppet[:certificate_revocation] = true
+        end
+
+        it "should add the CRL" do
+          @store.expects(:add_crl).with "real_crl"
+          @host.ssl_store
+        end
+
+        it "should set the flags to OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK" do
+          @store.expects(:flags=).with OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK
+          @host.ssl_store
+        end
       end
 
-      it "should set the flags to OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK" do
-        @store.expects(:flags=).with OpenSSL::X509::V_FLAG_CRL_CHECK_ALL|OpenSSL::X509::V_FLAG_CRL_CHECK
-        @host.ssl_store
+      describe "and 'certificate_revocation' is false" do
+        before do
+          Puppet[:certificate_revocation] = false
+        end
+
+        it "should not add the CRL" do
+          @store.expects(:add_crl).never
+          @host.ssl_store
+        end
+
+        it "should not set the flags" do
+          @store.expects(:flags=).never
+          @host.ssl_store
+        end
       end
     end
   end