Refactor SSL configuration structure

Prefer options[:ssl][:verify] to options[:ignore_ssl_validation]

lib/manticore/client.rb

@@ -124,6 +124,13 @@ class Client
     #                                                     then connections will be kept alive for this long when Connection: keep-alive
     #                                                     is sent, but no Keep-Alive header is sent.
     def initialize(options = {})
+      # Support Deprecated Option
+      if options[:ignore_ssl_validation]
+        $stderr.puts 'The options[:ignore_ssl_validation] setting is deprecated in favor of options[:ssl][verify]!'
+        options[:ssl] ||= {}
+        options[:ssl]   = {:verify => !options.delete(:ignore_ssl_validation)}.merge(options[:ssl])
+      end
+
       builder  = client_builder
       builder.set_user_agent options.fetch(:user_agent, "Manticore #{VERSION}")
       @use_cookies = options.fetch(:cookies, false)
@@ -291,7 +298,7 @@ def client_builder
 
     def pool_builder(options)
       http_sf  = PlainConnectionSocketFactory.new
-      https_sf = ssl_sf_from_options(options)
+      https_sf = ssl_sf_from_options(options.fetch(:ssl, {}))
       registry = RegistryBuilder.create.register("http", http_sf).register("https", https_sf).build
       PoolingHttpClientConnectionManager.new(registry)
     end
@@ -460,8 +467,9 @@ def minimum_encoding_for(string)
     end
 
     # Configure the SSL Context
-    def ssl_sf_from_options(options)
-      if options.fetch(:ignore_ssl_validation, false)
+    def ssl_sf_from_options(ssl_options)
+      ### Trust Root Settings ###
+      if ssl_options.fetch(:verify, true) == false
         context = SSLContexts.custom.load_trust_material(nil, TrustSelfSignedStrategy.new).build
         SSLConnectionSocketFactory.new(context, SSLConnectionSocketFactory::ALLOW_ALL_HOSTNAME_VERIFIER)
       else

spec/manticore/client_spec.rb

@@ -42,7 +42,7 @@
     j["uri"]["port"].should == 55441
   end
 
-  describe "ignore_ssl_validation" do
+  describe "ignore_ssl_validation (deprecated option)" do
     context "when on" do
       let(:client) { Manticore::Client.new ignore_ssl_validation: true }
 
@@ -60,6 +60,34 @@
     end
   end
 
+  describe 'ssl settings' do
+    describe 'verify' do
+      context 'default' do
+        let(:client) { Manticore::Client.new }
+
+        it "should break on SSL validation errors" do
+          expect { client.get("https://localhost:55444/").call }.to raise_exception(Manticore::ClientProtocolException)
+        end
+      end
+
+      context 'when on' do
+        let(:client) { Manticore::Client.new :ssl => {:verify => true} }
+
+        it "should break on SSL validation errors" do
+          expect { client.get("https://localhost:55444/").call }.to raise_exception(Manticore::ClientProtocolException)
+        end
+      end
+
+      context 'when off' do
+        let(:client) { Manticore::Client.new :ssl => {:verify => false} }
+
+        it "should not break on SSL validation errors" do
+          expect { client.get("https://localhost:55444/").body }.to_not raise_exception
+        end
+      end
+    end
+  end
+
   describe "lazy evaluation" do
     it "should not call synchronous requests by default" do
       req = client.get(local_server)