puppet 5.0.0 → 6.0.0

data/spec/unit/ssl/host_spec.rb

@@ -1,8 +1,11 @@
-#! /usr/bin/env ruby
+#!/usr/bin/env ruby
 require 'spec_helper'
+require 'puppet/test_ca'
 
 require 'puppet/ssl/host'
 require 'matchers/json'
+require 'puppet_spec/ssl'
+require 'puppet/rest/routes'
 
 def base_json_comparison(result, json_hash)
   expect(result["fingerprint"]).to eq(json_hash["fingerprint"])
@@ -10,13 +13,11 @@ def base_json_comparison(result, json_hash)
   expect(result["state"]).to       eq(json_hash["desired_state"])
 end
 
-describe Puppet::SSL::Host do
+describe Puppet::SSL::Host, if: !Puppet::Util::Platform.jruby? do
   include JSONMatchers
   include PuppetSpec::Files
 
   before do
-    Puppet::SSL::Host.indirection.terminus_class = :file
-
     # Get a safe temporary file
     dir = tmpdir("ssl_host_testing")
     Puppet.settings[:confdir] = dir
@@ -29,7 +30,6 @@ describe Puppet::SSL::Host do
   after do
     # Cleaned out any cached localhost instance.
     Puppet::SSL::Host.reset
-    Puppet::SSL::Host.ca_location = :none
   end
 
   it "should use any provided name as its name" do
@@ -46,59 +46,45 @@ describe Puppet::SSL::Host do
     expect(@host.public_key).to equal(pubkey)
   end
 
-  it "should default to being a non-ca host" do
-    expect(@host.ca?).to be_falsey
-  end
-
-  it "should be a ca host if its name matches the CA_NAME" do
-    Puppet::SSL::Host.stubs(:ca_name).returns "yayca"
-    expect(Puppet::SSL::Host.new("yayca")).to be_ca
-  end
-
-  it "should have a method for determining the CA location" do
-    expect(Puppet::SSL::Host).to respond_to(:ca_location)
-  end
-
-  it "should have a method for specifying the CA location" do
-    expect(Puppet::SSL::Host).to respond_to(:ca_location=)
-  end
-
-  it "should have a method for retrieving the default ssl host" do
-    expect(Puppet::SSL::Host).to respond_to(:ca_location=)
-  end
+  describe 'localhost' do
+    before(:each) do
+      Puppet::SSL::Host.any_instance.stubs(:certificate).returns nil
+      Puppet::SSL::Host.any_instance.stubs(:generate)
+    end
 
-  it "should have a method for producing an instance to manage the local host's keys" do
-    expect(Puppet::SSL::Host).to respond_to(:localhost)
-  end
+    it "should have a method for producing an instance to manage the local host's keys" do
+      expect(Puppet::SSL::Host).to respond_to(:localhost)
+    end
 
-  it "should allow to reset localhost" do
-    previous_host = Puppet::SSL::Host.localhost
-    Puppet::SSL::Host.reset
-    expect(Puppet::SSL::Host.localhost).not_to eq(previous_host)
-  end
+    it "should allow to reset localhost" do
+      previous_host = Puppet::SSL::Host.localhost
+      Puppet::SSL::Host.reset
+      expect(Puppet::SSL::Host.localhost).not_to eq(previous_host)
+    end
 
-  it "should generate the certificate for the localhost instance if no certificate is available" do
-    host = stub 'host', :key => nil
-    Puppet::SSL::Host.expects(:new).returns host
+    it "should generate the certificate for the localhost instance if no certificate is available" do
+      host = stub 'host', :key => nil
+      Puppet::SSL::Host.expects(:new).returns host
 
-    host.expects(:certificate).returns nil
-    host.expects(:generate)
+      host.expects(:certificate).returns nil
+      host.expects(:generate)
 
-    expect(Puppet::SSL::Host.localhost).to equal(host)
-  end
+      expect(Puppet::SSL::Host.localhost).to equal(host)
+    end
 
-  it "should create a localhost cert if no cert is available and it is a CA with autosign and it is using DNS alt names", :unless => Puppet.features.microsoft_windows? do
-    Puppet[:autosign] = true
-    Puppet[:confdir] = tmpdir('conf')
-    Puppet[:dns_alt_names] = "foo,bar,baz"
-    ca = Puppet::SSL::CertificateAuthority.new
-    Puppet::SSL::CertificateAuthority.stubs(:instance).returns ca
+    it "should always read the key for the localhost instance in from disk" do
+      host = stub 'host', :certificate => "eh"
+      host.expects(:key)
+      Puppet::SSL::Host.expects(:new).returns host
 
-    localhost = Puppet::SSL::Host.localhost
-    cert = localhost.certificate
+      Puppet::SSL::Host.localhost
+    end
 
-    expect(cert).to be_a(Puppet::SSL::Certificate)
-    expect(cert.subject_alt_names).to match_array(%W[DNS:#{Puppet[:certname]} DNS:foo DNS:bar DNS:baz])
+    it "should cache the localhost instance" do
+      host = stub 'host', :certificate => "eh", :key => 'foo'
+      Puppet::SSL::Host.expects(:new).once.returns host
+      expect(Puppet::SSL::Host.localhost).to eq(Puppet::SSL::Host.localhost)
+    end
   end
 
   context "with dns_alt_names" do
@@ -108,9 +94,9 @@ describe Puppet::SSL::Host do
       Puppet::SSL::Key.stubs(:new).returns key
       Puppet::SSL::Key.indirection.stubs(:save).with(key)
 
-      @cr = stub('certificate request')
+      @cr = stub('certificate request', :render => "csr pem")
       Puppet::SSL::CertificateRequest.stubs(:new).returns @cr
-      Puppet::SSL::CertificateRequest.indirection.stubs(:save).with(@cr)
+      Puppet::SSL::Host.any_instance.stubs(:submit_certificate_request)
     end
 
     describe "explicitly specified" do
@@ -121,78 +107,17 @@ describe Puppet::SSL::Host do
       it "should not include subjectAltName if not the local node" do
         @cr.expects(:generate).with(@key, {})
 
-        Puppet::SSL::Host.new('not-the-' + Puppet[:certname]).generate
-      end
-
-      it "should include subjectAltName if I am a CA" do
-        @cr.expects(:generate).
-          with(@key, { :dns_alt_names => Puppet[:dns_alt_names] })
-
-        Puppet::SSL::Host.localhost
-      end
-    end
-
-    describe "implicitly defaulted" do
-      let(:ca) { stub('ca', :sign => nil) }
-
-      before :each do
-        Puppet[:dns_alt_names] = ''
-
-        Puppet::SSL::CertificateAuthority.stubs(:instance).returns ca
-      end
-
-      it "should not include defaults if we're not the CA" do
-        Puppet::SSL::CertificateAuthority.stubs(:ca?).returns false
-
-        @cr.expects(:generate).with(@key, {})
-
-        Puppet::SSL::Host.localhost
+        Puppet::SSL::Host.new('not-the-' + Puppet[:certname]).generate_certificate_request
       end
 
-      it "should not include defaults if not the local node" do
-        Puppet::SSL::CertificateAuthority.stubs(:ca?).returns true
-
-        @cr.expects(:generate).with(@key, {})
-
-        Puppet::SSL::Host.new('not-the-' + Puppet[:certname]).generate
-      end
-
-      it "should not include defaults if we can't resolve our fqdn" do
-        Puppet::SSL::CertificateAuthority.stubs(:ca?).returns true
-        Facter.stubs(:value).with(:fqdn).returns nil
-
-        @cr.expects(:generate).with(@key, {})
-
-        Puppet::SSL::Host.localhost
-      end
-
-      it "should provide defaults if we're bootstrapping the local master" do
-        Puppet::SSL::CertificateAuthority.stubs(:ca?).returns true
-        Facter.stubs(:value).with(:fqdn).returns 'web.foo.com'
-        Facter.stubs(:value).with(:domain).returns 'foo.com'
-
-        @cr.expects(:generate).with(@key, {:dns_alt_names => "puppet, web.foo.com, puppet.foo.com"})
+      it "should include subjectAltName if the local node" do
+        @cr.expects(:generate).with(@key, { :dns_alt_names => 'one, two' })
 
-        Puppet::SSL::Host.localhost
+        Puppet::SSL::Host.new(Puppet[:certname]).generate_certificate_request
       end
     end
   end
 
-  it "should always read the key for the localhost instance in from disk" do
-    host = stub 'host', :certificate => "eh"
-    Puppet::SSL::Host.expects(:new).returns host
-
-    host.expects(:key)
-
-    Puppet::SSL::Host.localhost
-  end
-
-  it "should cache the localhost instance" do
-    host = stub 'host', :certificate => "eh", :key => 'foo'
-    Puppet::SSL::Host.expects(:new).once.returns host
-    expect(Puppet::SSL::Host.localhost).to eq(Puppet::SSL::Host.localhost)
-  end
-
   it "should be able to verify its certificate matches its key" do
     expect(Puppet::SSL::Host.new("foo")).to respond_to(:validate_certificate_with_key)
   end
@@ -200,16 +125,14 @@ describe Puppet::SSL::Host do
   it "should consider the certificate invalid if it cannot find a key" do
     host = Puppet::SSL::Host.new("foo")
     certificate = mock('cert', :fingerprint => 'DEADBEEF')
-    host.expects(:certificate).twice.returns certificate
     host.expects(:key).returns nil
-    expect { host.validate_certificate_with_key }.to raise_error(Puppet::Error, "No private key with which to validate certificate with fingerprint: DEADBEEF")
+    expect { host.validate_certificate_with_key(certificate) }.to raise_error(Puppet::Error, "No private key with which to validate certificate with fingerprint: DEADBEEF")
   end
 
   it "should consider the certificate invalid if it cannot find a certificate" do
     host = Puppet::SSL::Host.new("foo")
     host.expects(:key).never
-    host.expects(:certificate).returns nil
-    expect { host.validate_certificate_with_key }.to raise_error(Puppet::Error, "No certificate to validate.")
+    expect { host.validate_certificate_with_key(nil) }.to raise_error(Puppet::Error, "No certificate to validate.")
   end
 
   it "should consider the certificate invalid if the SSL certificate's key verification fails" do
@@ -218,9 +141,8 @@ describe Puppet::SSL::Host do
     sslcert = mock 'sslcert'
     certificate = mock 'cert', {:content => sslcert, :fingerprint => 'DEADBEEF'}
     host.stubs(:key).returns key
-    host.stubs(:certificate).returns certificate
     sslcert.expects(:check_private_key).with("private_key").returns false
-    expect { host.validate_certificate_with_key }.to raise_error(Puppet::Error, /DEADBEEF/)
+    expect { host.validate_certificate_with_key(certificate) }.to raise_error(Puppet::Error, /DEADBEEF/)
   end
 
   it "should consider the certificate valid if the SSL certificate's key verification succeeds" do
@@ -229,147 +151,8 @@ describe Puppet::SSL::Host do
     sslcert = mock 'sslcert'
     certificate = mock 'cert', :content => sslcert
     host.stubs(:key).returns key
-    host.stubs(:certificate).returns certificate
     sslcert.expects(:check_private_key).with("private_key").returns true
-    expect{ host.validate_certificate_with_key }.not_to raise_error
-  end
-
-  describe "when specifying the CA location" do
-    it "should support the location ':local'" do
-      expect { Puppet::SSL::Host.ca_location = :local }.not_to raise_error
-    end
-
-    it "should support the location ':remote'" do
-      expect { Puppet::SSL::Host.ca_location = :remote }.not_to raise_error
-    end
-
-    it "should support the location ':none'" do
-      expect { Puppet::SSL::Host.ca_location = :none }.not_to raise_error
-    end
-
-    it "should support the location ':only'" do
-      expect { Puppet::SSL::Host.ca_location = :only }.not_to raise_error
-    end
-
-    it "should not support other modes" do
-      expect { Puppet::SSL::Host.ca_location = :whatever }.to raise_error(ArgumentError)
-    end
-
-    describe "as 'local'" do
-      before do
-        Puppet::SSL::Host.ca_location = :local
-      end
-
-      it "should set the cache class for Certificate, CertificateRevocationList, and CertificateRequest as :file" do
-        expect(Puppet::SSL::Certificate.indirection.cache_class).to eq(:file)
-        expect(Puppet::SSL::CertificateRequest.indirection.cache_class).to eq(:file)
-        expect(Puppet::SSL::CertificateRevocationList.indirection.cache_class).to eq(:file)
-      end
-
-      it "should set the terminus class for Key and Host as :file" do
-        expect(Puppet::SSL::Key.indirection.terminus_class).to eq(:file)
-        expect(Puppet::SSL::Host.indirection.terminus_class).to eq(:file)
-      end
-
-      it "should set the terminus class for Certificate, CertificateRevocationList, and CertificateRequest as :ca" do
-        expect(Puppet::SSL::Certificate.indirection.terminus_class).to eq(:ca)
-        expect(Puppet::SSL::CertificateRequest.indirection.terminus_class).to eq(:ca)
-        expect(Puppet::SSL::CertificateRevocationList.indirection.terminus_class).to eq(:ca)
-      end
-    end
-
-    describe "as 'remote'" do
-      before do
-        Puppet::SSL::Host.ca_location = :remote
-      end
-
-      it "should set the cache class for Certificate, CertificateRevocationList, and CertificateRequest as :file" do
-        expect(Puppet::SSL::Certificate.indirection.cache_class).to eq(:file)
-        expect(Puppet::SSL::CertificateRequest.indirection.cache_class).to eq(:file)
-        expect(Puppet::SSL::CertificateRevocationList.indirection.cache_class).to eq(:file)
-      end
-
-      it "should set the terminus class for Key as :file" do
-        expect(Puppet::SSL::Key.indirection.terminus_class).to eq(:file)
-      end
-
-      it "should set the terminus class for Host, Certificate, CertificateRevocationList, and CertificateRequest as :rest" do
-        expect(Puppet::SSL::Host.indirection.terminus_class).to eq(:rest)
-        expect(Puppet::SSL::Certificate.indirection.terminus_class).to eq(:rest)
-        expect(Puppet::SSL::CertificateRequest.indirection.terminus_class).to eq(:rest)
-        expect(Puppet::SSL::CertificateRevocationList.indirection.terminus_class).to eq(:rest)
-      end
-    end
-
-    describe "as 'only'" do
-      before do
-        Puppet::SSL::Host.ca_location = :only
-      end
-
-      it "should set the terminus class for Key, Certificate, CertificateRevocationList, and CertificateRequest as :ca" do
-        expect(Puppet::SSL::Key.indirection.terminus_class).to eq(:ca)
-        expect(Puppet::SSL::Certificate.indirection.terminus_class).to eq(:ca)
-        expect(Puppet::SSL::CertificateRequest.indirection.terminus_class).to eq(:ca)
-        expect(Puppet::SSL::CertificateRevocationList.indirection.terminus_class).to eq(:ca)
-      end
-
-      it "should set the cache class for Certificate, CertificateRevocationList, and CertificateRequest to nil" do
-        expect(Puppet::SSL::Certificate.indirection.cache_class).to be_nil
-        expect(Puppet::SSL::CertificateRequest.indirection.cache_class).to be_nil
-        expect(Puppet::SSL::CertificateRevocationList.indirection.cache_class).to be_nil
-      end
-
-      it "should set the terminus class for Host to :file" do
-        expect(Puppet::SSL::Host.indirection.terminus_class).to eq(:file)
-      end
-    end
-
-    describe "as 'none'" do
-      before do
-        Puppet::SSL::Host.ca_location = :none
-      end
-
-      it "should set the terminus class for Key, Certificate, CertificateRevocationList, and CertificateRequest as :file" do
-        expect(Puppet::SSL::Key.indirection.terminus_class).to eq(:disabled_ca)
-        expect(Puppet::SSL::Certificate.indirection.terminus_class).to eq(:disabled_ca)
-        expect(Puppet::SSL::CertificateRequest.indirection.terminus_class).to eq(:disabled_ca)
-        expect(Puppet::SSL::CertificateRevocationList.indirection.terminus_class).to eq(:disabled_ca)
-      end
-
-      it "should set the terminus class for Host to 'none'" do
-        expect { Puppet::SSL::Host.indirection.terminus_class }.to raise_error(Puppet::DevError)
-      end
-    end
-  end
-
-  it "should have a class method for destroying all files related to a given host" do
-    expect(Puppet::SSL::Host).to respond_to(:destroy)
-  end
-
-  describe "when destroying a host's SSL files" do
-    before do
-      Puppet::SSL::Key.indirection.stubs(:destroy).returns false
-      Puppet::SSL::Certificate.indirection.stubs(:destroy).returns false
-      Puppet::SSL::CertificateRequest.indirection.stubs(:destroy).returns false
-    end
-
-    it "should destroy its certificate, certificate request, and key" do
-      Puppet::SSL::Key.indirection.expects(:destroy).with("myhost")
-      Puppet::SSL::Certificate.indirection.expects(:destroy).with("myhost")
-      Puppet::SSL::CertificateRequest.indirection.expects(:destroy).with("myhost")
-
-      Puppet::SSL::Host.destroy("myhost")
-    end
-
-    it "should return true if any of the classes returned true" do
-      Puppet::SSL::Certificate.indirection.expects(:destroy).with("myhost").returns true
-
-      expect(Puppet::SSL::Host.destroy("myhost")).to be_truthy
-    end
-
-    it "should report that nothing was deleted if none of the classes returned true" do
-      expect(Puppet::SSL::Host.destroy("myhost")).to eq("Nothing was deleted")
-    end
+    expect{ host.validate_certificate_with_key(certificate) }.not_to raise_error
   end
 
   describe "when initializing" do
@@ -382,11 +165,6 @@ describe Puppet::SSL::Host do
     it "should downcase a passed in name" do
       expect(Puppet::SSL::Host.new("Host.Domain.Com").name).to eq("host.domain.com")
     end
-
-    it "should indicate that it is a CA host if its name matches the ca_name constant" do
-      Puppet::SSL::Host.stubs(:ca_name).returns "myca"
-      expect(Puppet::SSL::Host.new("myca")).to be_ca
-    end
   end
 
   describe "when managing its private key" do
@@ -434,67 +212,63 @@ describe Puppet::SSL::Host do
   end
 
   describe "when managing its certificate request" do
-    before do
-      @realrequest = "real request"
-      @request = Puppet::SSL::CertificateRequest.new("myname")
-      @request.content = @realrequest
+    before(:all) do
+      @pki = PuppetSpec::SSL.create_chained_pki
     end
 
-    it "should return nil if the key is not set and cannot be found" do
-      Puppet::SSL::CertificateRequest.indirection.expects(:find).with("myname").returns(nil)
-      expect(@host.certificate_request).to be_nil
+    before(:each) do
+      Puppet[:requestdir] = tmpdir('requests')
     end
 
-    it "should find the request in the Key class and return it and return the Puppet SSL request" do
-      Puppet::SSL::CertificateRequest.indirection.expects(:find).with("myname").returns @request
-
-      expect(@host.certificate_request).to equal(@request)
-    end
+    let(:key) { Puppet::SSL::Key.from_s(@pki[:leaf_key].to_s, @host.name) }
 
     it "should generate a new key when generating the cert request if no key exists" do
-      Puppet::SSL::CertificateRequest.expects(:new).with("myname").returns @request
-
-      key = stub 'key', :public_key => mock("public_key"), :content => "mycontent"
-
       @host.expects(:key).times(2).returns(nil).then.returns(key)
       @host.expects(:generate_key).returns(key)
 
-      @request.stubs(:generate)
-      Puppet::SSL::CertificateRequest.indirection.stubs(:save)
+      @host.stubs(:submit_certificate_request)
 
       @host.generate_certificate_request
+      expect(Puppet::FileSystem.exist?(File.join(Puppet[:requestdir], "#{@host.name}.pem"))).to be true
     end
 
     it "should be able to generate and save a new request using the private key" do
-      Puppet::SSL::CertificateRequest.expects(:new).with("myname").returns @request
-
-      key = stub 'key', :public_key => mock("public_key"), :content => "mycontent"
       @host.stubs(:key).returns(key)
-      @request.expects(:generate).with("mycontent", {})
-      Puppet::SSL::CertificateRequest.indirection.expects(:save).with(@request)
+      @host.stubs(:submit_certificate_request)
 
       expect(@host.generate_certificate_request).to be_truthy
-      expect(@host.certificate_request).to equal(@request)
+      expect(Puppet::FileSystem.exist?(File.join(Puppet[:requestdir], "#{@host.name}.pem"))).to be true
+    end
+
+    it "should send a new request to the CA for signing" do
+      @http = mock("http")
+      @host.stubs(:http_client).returns(@http)
+      @host.stubs(:ssl_store).returns(mock("ssl store"))
+      @host.stubs(:key).returns(key)
+      request = mock("request")
+      request.stubs(:generate)
+      request.expects(:render).returns("my request").twice
+      Puppet::SSL::CertificateRequest.expects(:new).returns(request)
+
+      Puppet::Rest::Routes.expects(:put_certificate_request)
+        .with("my request", @host.name, anything)
+        .returns(nil)
+
+      expect(@host.generate_certificate_request).to be true
     end
 
     it "should return any previously found request without requerying" do
-      Puppet::SSL::CertificateRequest.indirection.expects(:find).with("myname").returns(@request).once
+      request = mock("request")
+      @host.expects(:load_certificate_request_from_file).returns(request).once
 
-      expect(@host.certificate_request).to equal(@request)
-      expect(@host.certificate_request).to equal(@request)
+      expect(@host.certificate_request).to equal(request)
+      expect(@host.certificate_request).to equal(request)
     end
 
     it "should not keep its certificate request in memory if the request cannot be saved" do
-      Puppet::SSL::CertificateRequest.expects(:new).with("myname").returns @request
-
-      key = stub 'key', :public_key => mock("public_key"), :content => "mycontent"
       @host.stubs(:key).returns(key)
-      @request.stubs(:generate)
-      @request.stubs(:name).returns("myname")
-      terminus = stub 'terminus'
-      terminus.stubs(:validate)
-      Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus)
-      terminus.expects(:save).with { |req| req.instance == @request && req.key == "myname" }.raises "eh"
+      @host.stubs(:submit_certificate_request)
+      Puppet::Util.expects(:replace_file).raises(RuntimeError)
 
       expect { @host.generate_certificate_request }.to raise_error(RuntimeError)
 
@@ -503,114 +277,113 @@ describe Puppet::SSL::Host do
   end
 
   describe "when managing its certificate" do
-    before do
-      @realcert = mock 'certificate'
-      @cert = stub 'cert', :content => @realcert
-      @host.stubs(:key).returns mock("key")
-      @host.stubs(:validate_certificate_with_key)
+    before(:all) do
+      @pki = PuppetSpec::SSL.create_chained_pki
     end
 
-    it "should find the CA certificate if it does not have a certificate" do
-      Puppet::SSL::Certificate.indirection.expects(:find).with(Puppet::SSL::CA_NAME, :fail_on_404 => true).returns mock("cacert")
-      Puppet::SSL::Certificate.indirection.stubs(:find).with("myname").returns @cert
-      @host.certificate
+    before(:each) do
+      Puppet[:certdir] = tmpdir('certs')
+      @host.stubs(:key).returns mock("key")
+      @host.stubs(:validate_certificate_with_key)
+      @host.stubs(:http_client).returns(@http)
+      @host.stubs(:ssl_store).returns(mock("ssl store"))
     end
 
-    it "should not find the CA certificate if it is the CA host" do
-      @host.expects(:ca?).returns true
-      Puppet::SSL::Certificate.indirection.stubs(:find)
-      Puppet::SSL::Certificate.indirection.expects(:find).with(Puppet::SSL::CA_NAME, :fail_on_404 => true).never
+    let(:ca_cert_response) { @pki[:ca_bundle] }
+    let(:host_cert_response) { @pki[:unrevoked_leaf_node_cert] }
 
+    it "should find the CA certificate and save it to disk" do
+      Puppet::Rest::Routes.expects(:get_certificate)
+                          .with(Puppet::SSL::CA_NAME, anything)
+                          .returns(ca_cert_response)
+      Puppet::Rest::Routes.expects(:get_certificate)
+                          .with(@host.name, anything)
+                          .raises(Puppet::Rest::ResponseError.new('no client cert',
+                                                                  mock('response', code: '404')))
       @host.certificate
+      actual_ca_bundle = Puppet::FileSystem.read(Puppet[:localcacert])
+      expect(actual_ca_bundle).to match(/BEGIN CERTIFICATE.*END CERTIFICATE.*BEGIN CERTIFICATE/m)
     end
 
     it "should return nil if it cannot find a CA certificate" do
-      Puppet::SSL::Certificate.indirection.expects(:find).with(Puppet::SSL::CA_NAME, :fail_on_404 => true).returns nil
-      Puppet::SSL::Certificate.indirection.expects(:find).with("myname").never
+      @host.expects(:ensure_ca_certificate).returns(false)
+      @host.expects(:get_host_certificate).never
 
       expect(@host.certificate).to be_nil
     end
 
     it "should find the key if it does not have one" do
-      Puppet::SSL::Certificate.indirection.stubs(:find)
+      @host.expects(:ensure_ca_certificate).returns(true)
+      @host.expects(:get_host_certificate).returns(nil)
       @host.expects(:key).returns mock("key")
       @host.certificate
     end
 
     it "should generate the key if one cannot be found" do
-      Puppet::SSL::Certificate.indirection.stubs(:find)
+      @host.expects(:ensure_ca_certificate).returns(true)
+      @host.expects(:get_host_certificate).returns(nil)
       @host.expects(:key).returns nil
       @host.expects(:generate_key)
       @host.certificate
     end
 
-    it "should find the certificate in the Certificate class and return the Puppet certificate instance" do
-      Puppet::SSL::Certificate.indirection.expects(:find).with(Puppet::SSL::CA_NAME, :fail_on_404 => true).returns mock("cacert")
-      Puppet::SSL::Certificate.indirection.expects(:find).with("myname").returns @cert
-      expect(@host.certificate).to equal(@cert)
+    it "should find the host certificate, write it to file, and return the Puppet certificate instance" do
+      Puppet::Rest::Routes.expects(:get_certificate)
+                          .with(Puppet::SSL::CA_NAME, anything)
+                          .returns(ca_cert_response)
+      Puppet::Rest::Routes.expects(:get_certificate)
+                          .with(@host.name, anything)
+                          .returns(host_cert_response)
+      expected_cert = Puppet::SSL::Certificate.from_s(@pki[:unrevoked_leaf_node_cert])
+      actual_cert = @host.certificate
+      expect(actual_cert).to be_a(Puppet::SSL::Certificate)
+      expect(actual_cert.to_s).to eq(expected_cert.to_s)
+      host_cert_from_file = Puppet::FileSystem.read(File.join(Puppet[:certdir], "#{@host.name}.pem"))
+      expect(host_cert_from_file).to eq(expected_cert.to_s)
     end
 
     it "should return any previously found certificate" do
-      Puppet::SSL::Certificate.indirection.expects(:find).with(Puppet::SSL::CA_NAME, :fail_on_404 => true).returns mock("cacert")
-      Puppet::SSL::Certificate.indirection.expects(:find).with("myname").returns(@cert).once
+      cert = mock 'cert'
+      @host.expects(:ensure_ca_certificate).returns(true).once
+      @host.expects(:get_host_certificate).returns(cert).once
 
-      expect(@host.certificate).to equal(@cert)
-      expect(@host.certificate).to equal(@cert)
-    end
-  end
-
-  it "should have a method for listing certificate hosts" do
-    expect(Puppet::SSL::Host).to respond_to(:search)
-  end
-
-  describe "when listing certificate hosts" do
-    it "should default to listing all clients with any file types" do
-      Puppet::SSL::Key.indirection.expects(:search).returns []
-      Puppet::SSL::Certificate.indirection.expects(:search).returns []
-      Puppet::SSL::CertificateRequest.indirection.expects(:search).returns []
-      Puppet::SSL::Host.search
-    end
-
-    it "should be able to list only clients with a key" do
-      Puppet::SSL::Key.indirection.expects(:search).returns []
-      Puppet::SSL::Certificate.indirection.expects(:search).never
-      Puppet::SSL::CertificateRequest.indirection.expects(:search).never
-      Puppet::SSL::Host.search :for => Puppet::SSL::Key
+      expect(@host.certificate).to equal(cert)
+      expect(@host.certificate).to equal(cert)
     end
 
-    it "should be able to list only clients with a certificate" do
-      Puppet::SSL::Key.indirection.expects(:search).never
-      Puppet::SSL::Certificate.indirection.expects(:search).returns []
-      Puppet::SSL::CertificateRequest.indirection.expects(:search).never
-      Puppet::SSL::Host.search :for => Puppet::SSL::Certificate
-    end
-
-    it "should be able to list only clients with a certificate request" do
-      Puppet::SSL::Key.indirection.expects(:search).never
-      Puppet::SSL::Certificate.indirection.expects(:search).never
-      Puppet::SSL::CertificateRequest.indirection.expects(:search).returns []
-      Puppet::SSL::Host.search :for => Puppet::SSL::CertificateRequest
-    end
-
-    it "should return a Host instance created with the name of each found instance" do
-      key  = stub 'key',  :name => "key",  :to_ary => nil
-      cert = stub 'cert', :name => "cert", :to_ary => nil
-      csr  = stub 'csr',  :name => "csr",  :to_ary => nil
+    context 'invalid certificates' do
+      it "should raise if the CA certificate downloaded from CA is invalid" do
+        Puppet::Rest::Routes.expects(:get_certificate)
+                            .with(Puppet::SSL::CA_NAME, anything)
+                            .returns('garbage')
+        expect { @host.certificate }.to raise_error(Puppet::Error, /did not contain a valid CA certificate/)
+      end
 
-      Puppet::SSL::Key.indirection.expects(:search).returns [key]
-      Puppet::SSL::Certificate.indirection.expects(:search).returns [cert]
-      Puppet::SSL::CertificateRequest.indirection.expects(:search).returns [csr]
+      it "should warn if the host certificate downloaded from CA is invalid" do
+        Puppet::Rest::Routes.expects(:get_certificate)
+                            .with(Puppet::SSL::CA_NAME, anything)
+                            .returns(ca_cert_response)
+        Puppet::Rest::Routes.expects(:get_certificate)
+                            .with(@host.name, anything)
+                            .returns('garbage')
+        expect { @host.certificate }.to raise_error(Puppet::Error, /did not contain a valid certificate for #{@host.name}/)
+      end
 
-      returned = []
-      %w{key cert csr}.each do |name|
-        result = mock(name)
-        returned << result
-        Puppet::SSL::Host.expects(:new).with(name).returns result
+      it 'should warn if the CA certificate loaded from disk is invalid' do
+        Puppet::FileSystem.open(Puppet[:localcacert], nil, "w:ASCII") do |f|
+          f.puts 'garbage'
+        end
+        expect { @host.certificate }.to raise_error(Puppet::Error, /The CA certificate.*invalid/)
       end
 
-      result = Puppet::SSL::Host.search
-      returned.each do |r|
-        expect(result).to be_include(r)
+      it 'should warn if the host certificate loaded from disk in invalid' do
+        Puppet::Rest::Routes.expects(:get_certificate)
+                            .with(Puppet::SSL::CA_NAME, anything)
+                            .returns(ca_cert_response)
+        Puppet::FileSystem.open(File.join(Puppet[:certdir], "#{@host.name}.pem"), nil, "w:ASCII") do |f|
+          f.puts 'garbage'
+        end
+        expect { @host.certificate }.to raise_error(Puppet::Error, /The certificate.*invalid/)
       end
     end
   end
@@ -624,6 +397,8 @@ describe Puppet::SSL::Host do
       @host = Puppet::SSL::Host.new("me")
       @host.stubs(:generate_key)
       @host.stubs(:generate_certificate_request)
+      @host.stubs(:certificate_request)
+      @host.stubs(:certificate)
     end
 
     it "should generate a key if one is not present" do
@@ -639,110 +414,135 @@ describe Puppet::SSL::Host do
 
       @host.generate
     end
+  end
 
-    describe "and it can create a certificate authority" do
-      before do
-        @ca = mock 'ca'
-        Puppet::SSL::CertificateAuthority.stubs(:instance).returns @ca
-      end
+  it "should have a method for creating an SSL store" do
+    expect(Puppet::SSL::Host.new("me")).to respond_to(:ssl_store)
+  end
 
-      it "should use the CA to sign its certificate request if it does not have a certificate" do
-        @host.expects(:certificate).returns nil
+  describe "when creating an SSL store" do
+    before do
+      Puppet[:localcacert] = "ssl_host_testing"
+    end
 
-        @ca.expects(:sign).with(@host.name, {allow_dns_alt_names: true})
+    it "should accept a purpose" do
+      store = mock 'store'
+      store.stub_everything
+      OpenSSL::X509::Store.expects(:new).returns store
+      store.expects(:purpose=).with(OpenSSL::X509::PURPOSE_SSL_SERVER)
+      host = Puppet::SSL::Host.new("me")
+      host.crl_usage = false
 
-        @host.generate
-      end
+      host.ssl_store(OpenSSL::X509::PURPOSE_SSL_SERVER)
     end
 
-    describe "and it cannot create a certificate authority" do
+    context "and the CRL is not on disk" do
       before do
-        Puppet::SSL::CertificateAuthority.stubs(:instance).returns nil
+        @pki = PuppetSpec::SSL.create_chained_pki
+        @revoked_cert = @pki[:revoked_root_node_cert]
+        localcacert = Puppet.settings[:localcacert]
+        Puppet::Util.replace_file(localcacert, 0644) {|f| f.write @pki[:ca_bundle] }
+        @http = mock 'http'
+        @host.stubs(:http_client).returns(@http)
       end
 
-      it "should seek its certificate" do
-        @host.expects(:certificate)
+      after do
+        Puppet::FileSystem.unlink(Puppet.settings[:localcacert])
+        Puppet::FileSystem.unlink(Puppet.settings[:hostcrl])
+      end
+
+      it "retrieves it from the server" do
+        Puppet::Rest::Routes.expects(:get_crls)
+          .with(Puppet::SSL::CA_NAME, anything)
+          .returns(@pki[:crl_chain])
 
-        @host.generate
+        @host.ssl_store
+        expect(Puppet::FileSystem.read(Puppet.settings[:hostcrl], :encoding => Encoding::UTF_8)).to eq(@pki[:crl_chain])
       end
     end
-  end
 
-  it "should have a method for creating an SSL store" do
-    expect(Puppet::SSL::Host.new("me")).to respond_to(:ssl_store)
-  end
+    describe "and a CRL is available" do
+      before do
+        pki = PuppetSpec::SSL.create_chained_pki
 
-  it "should always return the same store" do
-    host = Puppet::SSL::Host.new("foo")
-    store = mock 'store'
-    store.stub_everything
-    OpenSSL::X509::Store.expects(:new).returns store
-    expect(host.ssl_store).to equal(host.ssl_store)
-  end
+        @revoked_cert_from_self_signed_root          = pki[:revoked_root_node_cert]
+        @revoked_cert_from_ca_with_untrusted_chain   = pki[:revoked_leaf_node_cert]
+        @unrevoked_cert_from_self_signed_root        = pki[:unrevoked_root_node_cert]
+        @unrevoked_cert_from_revoked_ca              = pki[:unrevoked_int_node_cert]
+        @unrevoked_cert_from_ca_with_untrusted_chain = pki[:unrevoked_leaf_node_cert]
 
-  describe "when creating an SSL store" do
-    before do
-      @host = Puppet::SSL::Host.new("me")
-      @store = mock 'store'
-      @store.stub_everything
-      OpenSSL::X509::Store.stubs(:new).returns @store
-
-      Puppet[:localcacert] = "ssl_host_testing"
+        localcacert = Puppet.settings[:localcacert]
+        hostcrl     = Puppet.settings[:hostcrl]
 
-      Puppet::SSL::CertificateRevocationList.indirection.stubs(:find).returns(nil)
-    end
+        Puppet::Util.replace_file(localcacert, 0644) {|f| f.write pki[:ca_bundle] }
+        Puppet::Util.replace_file(hostcrl, 0644)     {|f| f.write pki[:crl_chain] }
+      end
 
-    it "should accept a purpose" do
-      @store.expects(:purpose=).with "my special purpose"
-      @host.ssl_store("my special purpose")
-    end
+      after do
+        Puppet::FileSystem.unlink(Puppet.settings[:localcacert])
+        Puppet::FileSystem.unlink(Puppet.settings[:hostcrl])
+      end
 
-    it "should default to OpenSSL::X509::PURPOSE_ANY as the purpose" do
-      @store.expects(:purpose=).with OpenSSL::X509::PURPOSE_ANY
-      @host.ssl_store
-    end
+      [true, :chain].each do |crl_setting|
+        describe "and 'certificate_revocation' is #{crl_setting}" do
+          before do
+            @host = Puppet::SSL::Host.new(crl_setting.to_s)
+            @host.crl_usage = crl_setting
+          end
 
-    it "should add the local CA cert file" do
-      Puppet[:localcacert] = "/ca/cert/file"
-      @store.expects(:add_file).with Puppet[:localcacert]
-      @host.ssl_store
-    end
+          it "should verify unrevoked certs" do
+            expect(
+              @host.ssl_store.verify(@unrevoked_cert_from_self_signed_root)
+            ).to be true
+          end
 
-    describe "and a CRL is available" do
-      before do
-        @crl = stub 'crl', :content => "real_crl"
-        Puppet::SSL::CertificateRevocationList.indirection.stubs(:find).returns @crl
+          it "should not verify revoked certs" do
+            [@revoked_cert_from_self_signed_root,
+             @revoked_cert_from_ca_with_untrusted_chain,
+             @unrevoked_cert_from_revoked_ca,
+             @unrevoked_cert_from_ca_with_untrusted_chain].each do |cert|
+              expect(@host.ssl_store.verify(cert)).to be false
+            end
+          end
+        end
       end
 
-      describe "and 'certificate_revocation' is true" do
+      describe "and 'certificate_revocation' is leaf" do
         before do
-          Puppet[:certificate_revocation] = true
+          @host = Puppet::SSL::Host.new("leaf")
+          @host.crl_usage = :leaf
         end
 
-        it "should add the CRL" do
-          @store.expects(:add_crl).with "real_crl"
-          @host.ssl_store
+        it "should verify unrevoked certs regardless of signing CA's revocation status" do
+          [@unrevoked_cert_from_self_signed_root,
+           @unrevoked_cert_from_revoked_ca,
+           @unrevoked_cert_from_ca_with_untrusted_chain].each do |cert|
+            expect(@host.ssl_store.verify(cert)).to be true
+          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
+        it "should not verify certs revoked by their signing CA" do
+          [@revoked_cert_from_self_signed_root,
+           @revoked_cert_from_ca_with_untrusted_chain].each do |cert|
+            expect(@host.ssl_store.verify(cert)).to be false
+          end
         end
       end
 
       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
+          @host = Puppet::SSL::Host.new("host")
+          @host.crl_usage = false
         end
 
-        it "should not set the flags" do
-          @store.expects(:flags=).never
-          @host.ssl_store
+        it "should verify valid certs regardless of revocation status" do
+          [@revoked_cert_from_self_signed_root,
+           @revoked_cert_from_ca_with_untrusted_chain,
+           @unrevoked_cert_from_self_signed_root,
+           @unrevoked_cert_from_revoked_ca,
+           @unrevoked_cert_from_ca_with_untrusted_chain].each do |cert|
+            expect(@host.ssl_store.verify(cert)).to be true
+          end
         end
       end
     end
@@ -806,135 +606,4 @@ describe Puppet::SSL::Host do
       @host.wait_for_cert(1)
     end
   end
-
-  describe "when handling JSON", :unless => Puppet.features.microsoft_windows? do
-    include PuppetSpec::Files
-
-    before do
-      Puppet[:vardir] = tmpdir("ssl_test_vardir")
-      Puppet[:ssldir] = tmpdir("ssl_test_ssldir")
-      # localcacert is where each client stores the CA certificate
-      # cacert is where the master stores the CA certificate
-      # Since we need to play the role of both for testing we need them to be the same and exist
-      Puppet[:cacert] = Puppet[:localcacert]
-
-      @ca=Puppet::SSL::CertificateAuthority.new
-    end
-
-    describe "when converting to JSON" do
-      let(:host) do
-        Puppet::SSL::Host.new("bazinga")
-      end
-
-      let(:json_hash) do
-        {
-          "fingerprint"   => host.certificate_request.fingerprint,
-          "desired_state" => 'requested',
-          "name"          => host.name
-        }
-      end
-
-      it "should be able to identify a host with an unsigned certificate request" do
-        host.generate_certificate_request
-
-        result = JSON.parse(Puppet::SSL::Host.new(host.name).to_json)
-
-        base_json_comparison result, json_hash
-      end
-
-      it "should validate against the schema" do
-        host.generate_certificate_request
-
-        expect(host.to_json).to validate_against('api/schemas/host.json')
-      end
-
-      describe "explicit fingerprints" do
-        [:SHA1, :SHA256, :SHA512].each do |md|
-          it "should include #{md}" do
-            mds = md.to_s
-            host.generate_certificate_request
-            json_hash["fingerprints"] = {}
-            json_hash["fingerprints"][mds] = host.certificate_request.fingerprint(md)
-
-            result = JSON.parse(Puppet::SSL::Host.new(host.name).to_json)
-            base_json_comparison result, json_hash
-            expect(result["fingerprints"][mds]).to eq(json_hash["fingerprints"][mds])
-          end
-        end
-      end
-
-      describe "dns_alt_names" do
-        describe "when not specified" do
-          it "should include the dns_alt_names associated with the certificate" do
-            host.generate_certificate_request
-            json_hash["desired_alt_names"] = host.certificate_request.subject_alt_names
-
-            result = JSON.parse(Puppet::SSL::Host.new(host.name).to_json)
-            base_json_comparison result, json_hash
-            expect(result["dns_alt_names"]).to eq(json_hash["desired_alt_names"])
-          end
-        end
-
-        [ "",
-          "test, alt, names"
-        ].each do |alt_names|
-          describe "when #{alt_names}" do
-            before(:each) do
-              host.generate_certificate_request :dns_alt_names => alt_names
-            end
-
-            it "should include the dns_alt_names associated with the certificate" do
-              json_hash["desired_alt_names"] = host.certificate_request.subject_alt_names
-
-              result = JSON.parse(Puppet::SSL::Host.new(host.name).to_json)
-              base_json_comparison result, json_hash
-              expect(result["dns_alt_names"]).to eq(json_hash["desired_alt_names"])
-            end
-
-            it "should validate against the schema" do
-              expect(host.to_json).to validate_against('api/schemas/host.json')
-            end
-          end
-        end
-      end
-
-      it "should be able to identify a host with a signed certificate" do
-        host.generate_certificate_request
-        @ca.sign(host.name)
-        json_hash = {
-          "fingerprint"          => Puppet::SSL::Certificate.indirection.find(host.name).fingerprint,
-          "desired_state"        => 'signed',
-          "name"                 => host.name,
-        }
-
-        result = JSON.parse(Puppet::SSL::Host.new(host.name).to_json)
-        base_json_comparison result, json_hash
-      end
-
-      it "should be able to identify a host with a revoked certificate" do
-        host.generate_certificate_request
-        @ca.sign(host.name)
-        @ca.revoke(host.name)
-        json_hash["fingerprint"] = Puppet::SSL::Certificate.indirection.find(host.name).fingerprint
-        json_hash["desired_state"] = 'revoked'
-
-        result = JSON.parse(Puppet::SSL::Host.new(host.name).to_json)
-        base_json_comparison result, json_hash
-      end
-    end
-
-    describe "when converting from JSON" do
-      it "should return a Puppet::SSL::Host object with the specified desired state" do
-        host = Puppet::SSL::Host.new("bazinga")
-        host.desired_state="signed"
-        json_hash = {
-          "name"  => host.name,
-          "desired_state" => host.desired_state,
-        }
-        generated_host = Puppet::SSL::Host.from_data_hash(json_hash)
-        expect(generated_host.desired_state).to eq(host.desired_state)
-        expect(generated_host.name).to eq(host.name)
-      end
-    end
-  end
 end