Fix #2425 - make sure client can contact CA server with REST

The various REST SSL terminii were never setup to use the
ca_server/ca_port if one is setup.

Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>

6 files changed, 33 insertions, 0 deletions

diff --git a/lib/puppet/indirector/certificate/rest.rb b/lib/puppet/indirector/certificate/rest.rb
index f88d60d40..599983030 100644
--- a/lib/puppet/indirector/certificate/rest.rb
+++ b/lib/puppet/indirector/certificate/rest.rb
@@ -3,4 +3,7 @@ require 'puppet/indirector/rest'
 
 class Puppet::SSL::Certificate::Rest < Puppet::Indirector::REST
     desc "Find and save certificates over HTTP via REST."
+
+    use_server_setting(:ca_server)
+    use_port_setting(:ca_port)
 end
diff --git a/lib/puppet/indirector/certificate_request/rest.rb b/lib/puppet/indirector/certificate_request/rest.rb
index 6df014583..eb9e8a9ce 100644
--- a/lib/puppet/indirector/certificate_request/rest.rb
+++ b/lib/puppet/indirector/certificate_request/rest.rb
@@ -3,4 +3,7 @@ require 'puppet/indirector/rest'
 
 class Puppet::SSL::CertificateRequest::Rest < Puppet::Indirector::REST
     desc "Find and save certificate requests over HTTP via REST."
+
+    use_server_setting(:ca_server)
+    use_port_setting(:ca_port)
 end
diff --git a/lib/puppet/indirector/certificate_revocation_list/rest.rb b/lib/puppet/indirector/certificate_revocation_list/rest.rb
index 13cc95c87..6d97ce1e2 100644
--- a/lib/puppet/indirector/certificate_revocation_list/rest.rb
+++ b/lib/puppet/indirector/certificate_revocation_list/rest.rb
@@ -3,4 +3,7 @@ require 'puppet/indirector/rest'
 
 class Puppet::SSL::CertificateRevocationList::Rest < Puppet::Indirector::REST
     desc "Find and save certificate revocation lists over HTTP via REST."
+
+    use_server_setting(:ca_server)
+    use_port_setting(:ca_port)
 end
diff --git a/spec/unit/indirector/certificate/rest.rb b/spec/unit/indirector/certificate/rest.rb
index 62b1ef543..d5959c489 100755
--- a/spec/unit/indirector/certificate/rest.rb
+++ b/spec/unit/indirector/certificate/rest.rb
@@ -12,4 +12,12 @@ describe Puppet::SSL::Certificate::Rest do
     it "should be a sublcass of Puppet::Indirector::REST" do
         Puppet::SSL::Certificate::Rest.superclass.should equal(Puppet::Indirector::REST)
     end
+
+    it "should set server_setting to :ca_server" do
+        Puppet::SSL::Certificate::Rest.server_setting.should == :ca_server
+    end
+
+    it "should set port_setting to :ca_port" do
+        Puppet::SSL::Certificate::Rest.port_setting.should == :ca_port
+    end
 end
diff --git a/spec/unit/indirector/certificate_request/rest.rb b/spec/unit/indirector/certificate_request/rest.rb
index cbd525f17..a1492acab 100755
--- a/spec/unit/indirector/certificate_request/rest.rb
+++ b/spec/unit/indirector/certificate_request/rest.rb
@@ -12,4 +12,12 @@ describe Puppet::SSL::CertificateRequest::Rest do
     it "should be a sublcass of Puppet::Indirector::REST" do
         Puppet::SSL::CertificateRequest::Rest.superclass.should equal(Puppet::Indirector::REST)
     end
+
+    it "should set server_setting to :ca_server" do
+        Puppet::SSL::CertificateRequest::Rest.server_setting.should == :ca_server
+    end
+
+    it "should set port_setting to :ca_port" do
+        Puppet::SSL::CertificateRequest::Rest.port_setting.should == :ca_port
+    end
 end
diff --git a/spec/unit/indirector/certificate_revocation_list/rest.rb b/spec/unit/indirector/certificate_revocation_list/rest.rb
index f6f493c37..4c7cdc3d5 100755
--- a/spec/unit/indirector/certificate_revocation_list/rest.rb
+++ b/spec/unit/indirector/certificate_revocation_list/rest.rb
@@ -12,4 +12,12 @@ describe Puppet::SSL::CertificateRevocationList::Rest do
     it "should be a sublcass of Puppet::Indirector::REST" do
         Puppet::SSL::CertificateRevocationList::Rest.superclass.should equal(Puppet::Indirector::REST)
     end
+
+    it "should set server_setting to :ca_server" do
+        Puppet::SSL::CertificateRevocationList::Rest.server_setting.should == :ca_server
+    end
+
+    it "should set port_setting to :ca_port" do
+        Puppet::SSL::CertificateRevocationList::Rest.port_setting.should == :ca_port
+    end
 end