puppet 2.7.26 → 3.0.0.rc4

data/spec/unit/simple_graph_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 require 'puppet/simple_graph'
 
@@ -452,11 +452,25 @@ describe Puppet::SimpleGraph do
     end
   end
 
-  describe "when matching edges", :'fails_on_ruby_1.9.2' => true do
+  describe "when matching edges" do
     before do
       @graph = Puppet::SimpleGraph.new
-      @event = Puppet::Transaction::Event.new(:name => :yay, :resource => "a")
-      @none = Puppet::Transaction::Event.new(:name => :NONE, :resource => "a")
+
+      # The Ruby 1.8 semantics for String#[] are that treating it like an
+      # array and asking for `"a"[:whatever]` returns `nil`.  Ruby 1.9
+      # enforces that your index has to be numeric.
+      #
+      # Now, the real object here, a resource, implements [] and does
+      # something sane, but we don't care about any of the things that get
+      # asked for.  Right now, anyway.
+      #
+      # So, in 1.8 we could just pass a string and it worked.  For 1.9 we can
+      # fake it well enough by stubbing out the operator to return nil no
+      # matter what input we give. --daniel 2012-03-11
+      resource = "a"
+      resource.stubs(:[])
+      @event = Puppet::Transaction::Event.new(:name => :yay, :resource => resource)
+      @none = Puppet::Transaction::Event.new(:name => :NONE, :resource => resource)
 
       @edges = {}
       @edges["a/b"] = Puppet::Relationship.new("a", "b", {:event => :yay, :callback => :refresh})
@@ -776,7 +790,7 @@ describe Puppet::SimpleGraph do
     # Test serialization of graph to YAML.
     [:old, :new].each do |which_format|
       all_test_graphs.each do |graph_to_test|
-        it "should be able to serialize #{graph_to_test} to YAML (#{which_format} format)" do
+        it "should be able to serialize #{graph_to_test} to YAML (#{which_format} format)", :if => (RUBY_VERSION[0,3] == '1.8' or YAML::ENGINE.syck?) do
           graph = Puppet::SimpleGraph.new
           send(graph_to_test, graph)
           yaml_form = graph_to_yaml(graph, which_format)

data/spec/unit/ssl/base_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate'
@@ -14,7 +14,7 @@ describe Puppet::SSL::Certificate do
     before :each do
       @cert = stub 'cert', :to_der => "DER"
       @base.stubs(:content).returns(@cert)
-      OpenSSL::Digest.stubs(:constants).returns ["MD5", "DIGEST"]
+      OpenSSL::Digest.stubs(:constants).returns ["MD5", "SHA1", "SHA256", "SHA512", "DIGEST"]
       @digest = stub_everything
       OpenSSL::Digest.stubs(:const_get).returns @digest
     end

data/spec/unit/ssl/certificate_authority/interface_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby -S rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_authority'
@@ -45,9 +45,9 @@ describe Puppet::SSL::CertificateAuthority::Interface do
       interface.digest.should == :digest
     end
 
-    it "should set the digest to md5 if none given" do
+    it "should set the digest to SHA256 if none given" do
       interface = @class.new(:generate, :to => :all)
-      interface.digest.should == :MD5
+      interface.digest.should == :SHA256
     end
   end
 
@@ -347,10 +347,10 @@ describe Puppet::SSL::CertificateAuthority::Interface do
 
           @applier = @class.new(:fingerprint, :to => :all)
 
-          @ca.expects(:fingerprint).with("host1", :MD5).returns "fingerprint1"
+          @ca.expects(:fingerprint).with("host1", :SHA256).returns "fingerprint1"
           @applier.expects(:puts).with "host1 fingerprint1"
 
-          @ca.expects(:fingerprint).with("host2", :MD5).returns "fingerprint2"
+          @ca.expects(:fingerprint).with("host2", :SHA256).returns "fingerprint2"
           @applier.expects(:puts).with "host2 fingerprint2"
 
           @applier.apply(@ca)
@@ -361,10 +361,10 @@ describe Puppet::SSL::CertificateAuthority::Interface do
         it "should print each named certificate if found" do
           @applier = @class.new(:fingerprint, :to => %w{host1 host2})
 
-          @ca.expects(:fingerprint).with("host1", :MD5).returns "fingerprint1"
+          @ca.expects(:fingerprint).with("host1", :SHA256).returns "fingerprint1"
           @applier.expects(:puts).with "host1 fingerprint1"
 
-          @ca.expects(:fingerprint).with("host2", :MD5).returns "fingerprint2"
+          @ca.expects(:fingerprint).with("host2", :SHA256).returns "fingerprint2"
           @applier.expects(:puts).with "host2 fingerprint2"
 
           @applier.apply(@ca)

data/spec/unit/ssl/certificate_authority_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_authority'
@@ -43,7 +43,7 @@ describe Puppet::SSL::CertificateAuthority do
 
     describe "and the host is not a CA host" do
       it "should return nil" do
-        Puppet.settings.stubs(:value).with(:ca).returns false
+        Puppet[:ca] = false
         Puppet.run_mode.stubs(:master?).returns true
 
         ca = mock('ca')
@@ -54,7 +54,7 @@ describe Puppet::SSL::CertificateAuthority do
 
     describe "and the run_mode is not master" do
       it "should return nil" do
-        Puppet.settings.stubs(:value).with(:ca).returns true
+        Puppet[:ca] = true
         Puppet.run_mode.stubs(:master?).returns false
 
         ca = mock('ca')
@@ -67,13 +67,12 @@ describe Puppet::SSL::CertificateAuthority do
   describe "when initializing" do
     before do
       Puppet.settings.stubs(:use)
-      Puppet.settings.stubs(:value).returns "ca_testing"
 
       Puppet::SSL::CertificateAuthority.any_instance.stubs(:setup)
     end
 
     it "should always set its name to the value of :certname" do
-      Puppet.settings.expects(:value).with(:certname).returns "ca_testing"
+      Puppet[:certname] = "ca_testing"
 
       Puppet::SSL::CertificateAuthority.new.name.should == "ca_testing"
     end
@@ -122,8 +121,7 @@ describe Puppet::SSL::CertificateAuthority do
   describe "when retrieving the certificate revocation list" do
     before do
       Puppet.settings.stubs(:use)
-      Puppet.settings.stubs(:value).returns "ca_testing"
-      Puppet.settings.stubs(:value).with(:cacrl).returns "/my/crl"
+      Puppet[:cacrl] = "/my/crl"
 
       cert = stub("certificate", :content => "real_cert")
       key = stub("key", :content => "real_key")
@@ -157,7 +155,6 @@ describe Puppet::SSL::CertificateAuthority do
   describe "when generating a self-signed CA certificate" do
     before do
       Puppet.settings.stubs(:use)
-      Puppet.settings.stubs(:value).returns "ca_testing"
 
       Puppet::SSL::CertificateAuthority.any_instance.stubs(:setup)
       Puppet::SSL::CertificateAuthority.any_instance.stubs(:crl)
@@ -171,9 +168,9 @@ describe Puppet::SSL::CertificateAuthority do
     end
 
     it "should create and store a password at :capass" do
-      Puppet.settings.expects(:value).with(:capass).returns "/path/to/pass"
+      Puppet[:capass] = File.expand_path("/path/to/pass")
 
-      FileTest.expects(:exist?).with("/path/to/pass").returns false
+      FileTest.expects(:exist?).with(Puppet[:capass]).returns false
 
       fh = mock 'filehandle'
       Puppet.settings.expects(:write).with(:capass).yields fh
@@ -258,8 +255,8 @@ describe Puppet::SSL::CertificateAuthority do
 
     describe "and calculating the next certificate serial number" do
       before do
-        @path = "/path/to/serial"
-        Puppet.settings.stubs(:value).with(:serial).returns @path
+        @path = File.expand_path("/path/to/serial")
+        Puppet[:serial] = @path
 
         @filehandle = stub 'filehandle', :<< => @filehandle
         Puppet.settings.stubs(:readwritelock).with(:serial).yields @filehandle
@@ -334,7 +331,7 @@ describe Puppet::SSL::CertificateAuthority do
 
         expect do
           @ca.sign(@name, false, @request)
-        end.not_to raise_error(Puppet::SSL::CertificateAuthority::CertificateSigningError)
+        end.should_not raise_error(Puppet::SSL::CertificateAuthority::CertificateSigningError)
       end
 
       it "should save the resulting certificate" do
@@ -418,7 +415,7 @@ describe Puppet::SSL::CertificateAuthority do
 
       it "should sign the resulting certificate using its real key and a digest" do
         digest = mock 'digest'
-        OpenSSL::Digest::SHA1.expects(:new).returns digest
+        OpenSSL::Digest::SHA256.expects(:new).returns digest
 
         key = stub 'key', :content => "real_key"
         @ca.host.stubs(:key).returns key
@@ -473,6 +470,7 @@ describe Puppet::SSL::CertificateAuthority do
       describe "when validating the CN" do
         before :all do
           Puppet[:keylength] = 1024
+          Puppet[:passfile] = '/f00'
           @signing_key = Puppet::SSL::Key.new('my_signing_key')
           @signing_key.generate
         end
@@ -499,7 +497,7 @@ describe Puppet::SSL::CertificateAuthority do
          "not\neven\tkind\rof",
          "ding\adong\a",
          "hidden\b\b\b\b\b\bmessage",
-         "☃ :("
+         "\xE2\x98\x83 :("
         ].each do |name|
           it "should reject #{name.inspect}" do
             # We aren't even allowed to make objects with these names, so let's
@@ -610,16 +608,17 @@ describe Puppet::SSL::CertificateAuthority do
     end
 
     describe "when autosigning certificates" do
+      let(:autosign) { File.expand_path("/auto/sign") }
       it "should do nothing if autosign is disabled" do
-        Puppet.settings.expects(:value).with(:autosign).returns 'false'
+        Puppet[:autosign] = 'false'
 
         Puppet::SSL::CertificateRequest.indirection.expects(:search).never
         @ca.autosign
       end
 
       it "should do nothing if no autosign.conf exists" do
-        Puppet.settings.expects(:value).with(:autosign).returns '/auto/sign'
-        FileTest.expects(:exist?).with("/auto/sign").returns false
+        Puppet[:autosign] = autosign
+        FileTest.expects(:exist?).with(autosign).returns false
 
         Puppet::SSL::CertificateRequest.indirection.expects(:search).never
         @ca.autosign
@@ -627,9 +626,9 @@ describe Puppet::SSL::CertificateAuthority do
 
       describe "and autosign is enabled and the autosign.conf file exists" do
         before do
-          Puppet.settings.stubs(:value).with(:autosign).returns '/auto/sign'
-          FileTest.stubs(:exist?).with("/auto/sign").returns true
-          File.stubs(:readlines).with("/auto/sign").returns ["one\n", "two\n"]
+          Puppet[:autosign] = autosign
+          FileTest.stubs(:exist?).with(autosign).returns true
+          File.stubs(:readlines).with(autosign).returns ["one\n", "two\n"]
 
           Puppet::SSL::CertificateRequest.indirection.stubs(:search).returns []
 
@@ -655,14 +654,14 @@ describe Puppet::SSL::CertificateAuthority do
           end
 
           it "should ignore comments" do
-            File.stubs(:readlines).with("/auto/sign").returns ["one\n", "#two\n"]
+            File.stubs(:readlines).with(autosign).returns ["one\n", "#two\n"]
 
             @store.expects(:allow).with("one")
             @ca.autosign
           end
 
           it "should ignore blank lines" do
-            File.stubs(:readlines).with("/auto/sign").returns ["one\n", "\n"]
+            File.stubs(:readlines).with(autosign).returns ["one\n", "\n"]
 
             @store.expects(:allow).with("one")
             @ca.autosign
@@ -792,13 +791,12 @@ describe Puppet::SSL::CertificateAuthority do
     end
 
     describe "and verifying certificates" do
+      let(:cacert) { File.expand_path("/ca/cert") }
       before do
         @store = stub 'store', :verify => true, :add_file => nil, :purpose= => nil, :add_crl => true, :flags= => nil
 
         OpenSSL::X509::Store.stubs(:new).returns @store
 
-        Puppet.settings.stubs(:value).returns "crtstuff"
-
         @cert = stub 'cert', :content => "mycert"
         Puppet::SSL::Certificate.indirection.stubs(:find).returns @cert
 
@@ -820,8 +818,8 @@ describe Puppet::SSL::CertificateAuthority do
       end
 
       it "should add the CA Certificate to the store" do
-        Puppet.settings.stubs(:value).with(:cacert).returns "/ca/cert"
-        @store.expects(:add_file).with "/ca/cert"
+        Puppet[:cacert] = cacert
+        @store.expects(:add_file).with cacert
 
         @ca.verify("me")
       end
@@ -833,8 +831,8 @@ describe Puppet::SSL::CertificateAuthority do
       end
 
       it "should set the store purpose to OpenSSL::X509::PURPOSE_SSL_CLIENT" do
-        Puppet.settings.stubs(:value).with(:cacert).returns "/ca/cert"
-        @store.expects(:add_file).with "/ca/cert"
+        Puppet[:cacert] = cacert
+        @store.expects(:add_file).with cacert
 
         @ca.verify("me")
       end
@@ -906,30 +904,6 @@ describe Puppet::SSL::CertificateAuthority do
         @ca.crl.expects(:revoke).with { |serial, key| serial == 16 }
         @ca.revoke('host')
       end
-
-      context "revocation by serial number (#16798)" do
-        it "revokes when given a lower case hexadecimal formatted string" do
-          @ca.crl.expects(:revoke).with { |serial, key| serial == 15 }
-          Puppet::SSL::Certificate.indirection.expects(:find).with("0xf").returns nil
-
-          @ca.revoke('0xf')
-        end
-
-        it "revokes when given an upper case hexadecimal formatted string" do
-          @ca.crl.expects(:revoke).with { |serial, key| serial == 15 }
-          Puppet::SSL::Certificate.indirection.expects(:find).with("0xF").returns nil
-
-          @ca.revoke('0xF')
-        end
-
-        it "handles very large serial numbers" do
-          bighex = '0x4000000000000000000000000000000000000000'
-          @ca.crl.expects(:revoke).with { |serial, key| serial == 2**(159-1) }
-          Puppet::SSL::Certificate.indirection.expects(:find).with(bighex).returns nil
-
-          @ca.revoke(bighex)
-        end
-      end
     end
 
     it "should be able to generate a complete new SSL host" do

data/spec/unit/ssl/certificate_factory_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_factory'

data/spec/unit/ssl/certificate_request_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_request'
@@ -207,7 +207,7 @@ describe Puppet::SSL::CertificateRequest do
 
     it "should sign the csr with the provided key and a digest" do
       digest = mock 'digest'
-      OpenSSL::Digest::MD5.expects(:new).returns(digest)
+      OpenSSL::Digest::SHA256.expects(:new).returns(digest)
       @request.expects(:sign).with(@key, digest)
       @instance.generate(@key)
     end
@@ -254,7 +254,6 @@ describe Puppet::SSL::CertificateRequest do
 
         csr = Puppet::SSL::CertificateRequest.new("me")
         terminus = mock 'terminus'
-        terminus.stubs(:validate)
         Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus)
         terminus.expects(:save).with { |request| request.instance == csr && request.key == "me" }
 
@@ -268,7 +267,6 @@ describe Puppet::SSL::CertificateRequest do
 
         csr = Puppet::SSL::CertificateRequest.new("me")
         terminus = mock 'terminus'
-        terminus.stubs(:validate)
         Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus)
         terminus.expects(:save).with { |request| request.instance == csr && request.key == "me" }
 

data/spec/unit/ssl/certificate_revocation_list_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate_revocation_list'
@@ -136,11 +136,11 @@ describe Puppet::SSL::CertificateRevocationList do
       @crl.revoke(1, @key)
     end
 
-    it "should mark the CRL as updated" do
+    it "should mark the CRL as updated at a time that makes it valid now" do
       time = Time.now
       Time.stubs(:now).returns time
 
-      @crl.content.expects(:last_update=).with(time)
+      @crl.content.expects(:last_update=).with(time - 1)
 
       @crl.revoke(1, @key)
     end

data/spec/unit/ssl/certificate_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+#! /usr/bin/env ruby -S rspec
 require 'spec_helper'
 
 require 'puppet/ssl/certificate'

data/spec/unit/ssl/configuration_spec.rb

@@ -0,0 +1,60 @@
+#! /usr/bin/env ruby -S rspec
+#
+
+require 'puppet/ssl/configuration'
+
+describe Puppet::SSL::Configuration do
+  let(:localcacert) { "/path/to/certs/ca.pem" }
+
+  let(:ssl_server_ca_chain) { "/path/to/certs/ssl_server_ca_chain.pem" }
+  let(:ssl_server_ca_auth) { "/path/to/certs/ssl_server_ca_auth.pem" }
+
+  it "should require the localcacert argument" do
+    lambda { subject }.should raise_error ArgumentError
+  end
+
+  context "Default configuration" do
+    subject do
+      described_class.new(localcacert)
+    end
+    it "#ca_chain_file == localcacert" do
+      subject.ca_chain_file.should == localcacert
+    end
+    it "#ca_auth_file == localcacert" do
+      subject.ca_auth_file.should == localcacert
+    end
+  end
+
+  context "Explicitly configured" do
+    subject do
+      options = {
+        :ca_chain_file => ssl_server_ca_chain,
+        :ca_auth_file  => ssl_server_ca_auth,
+      }
+      Puppet::SSL::Configuration.new(localcacert, options)
+    end
+
+    it "#ca_chain_file == ssl_server_ca_chain" do
+      subject.ca_chain_file.should == ssl_server_ca_chain
+    end
+    it "#ca_auth_file == ssl_server_ca_auth" do
+      subject.ca_auth_file.should == ssl_server_ca_auth
+    end
+  end
+
+  context "Partially configured" do
+    it "should error if only ca_chain_file is specified" do
+      lambda {
+        described_class.new(localcacert, { :ca_chain_file => "/path/to/cert.pem" })
+      }.should raise_error ArgumentError
+    end
+    describe "#ca_chain_file" do
+      subject do
+        described_class.new(localcacert, { :ca_auth_file => ssl_server_ca_auth })
+      end
+      it "should use ca_auth_file" do
+        subject.ca_chain_file.should == ssl_server_ca_auth
+      end
+    end
+  end
+end