content_gateway 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6496c9d2bb6da6aa267c4650e40fb529bf808cb7
-  data.tar.gz: e3b5d86df942e0798184e500b92393b97a177218
+  metadata.gz: fa85efc4f1c83ec7bdd1a6759fb1fda12afcbea4
+  data.tar.gz: aab412e14cccaac8e3110a82b9067e95dc5c034a
 SHA512:
-  metadata.gz: a592281ea0b05ac5c191f347d5358ae3d2fcf77ee21b1d0a148c3de55f12f90669105839847ee16cd9e706e583ef5f4727060073569a590c25aa50a90354bc6b
-  data.tar.gz: cba7bc8d0ef2934debfc73660fdc16e14face3c19fa20964c1f6c63fb4f408e2f76ae4b985aeb167e5bd6bd71f65decef8b53e07420223c15583cdfbb83a3dd4
+  metadata.gz: 89ce05e82342e19a45d4cdf54bcbd065d6ee2f897230d5af0aaecad301b636c455fa4f531fc2dc5abe08fffa0bdb522d7d8c26383b5acfd32942459fd1e58241
+  data.tar.gz: bd179384af08df8c163fd8e2e32509bff4dcdbcf8aed44192dd27b5c039114edceec71f3018d9b759860b728086e61b0adcb547d7f20aab0ebf2e9e5d63f5641

data/Changelog

@@ -1,3 +1,6 @@
+2015-06-16 [0.4.0]
+  * Adding ssl_version support to ssl_certificate hash
+
 2015-01-05 [0.3.0]
   * Optional url generator. (Without the url generator on boot the content gateway will use the get/post/delete/put resource argument as full url for request). Closes #4
 

data/README.md

@@ -85,7 +85,7 @@ Optional parameters are supported:
 - `stale_expires_in`: overwrites the default stale cache expiration time
 - `skip_cache`: if set to `true`, ignores cache and stale cache
 - `headers`: a hash with request headers
-- `ssl_certificate`: a hash with ssl cert and key (see ssl support section below)
+- `ssl_certificate`: a hash with ssl cert, key, ssl version (see ssl support section below)
 
 Every other parameter is passed to URLGenerator `generate` method (like query string parameters).
 
@@ -133,6 +133,20 @@ gateway.get_json("/path.json", skip_cache: true, ssl_certificate: ssl)
 gateway.post("/api/post_example", payload: { param1: "value" }, ssl_certificate: ssl)
 ```
 
+You can use ssl_version to specify which version you need. (You can use with client cert and key or use it alone) See example below:
+
+```ruby
+ssl = {
+  ssl_version: "SSLv23"
+}
+
+gateway.get("/path", timeout: 3, ssl_certificate: ssl)
+
+gateway.get_json("/path.json", skip_cache: true, ssl_certificate: ssl)
+
+gateway.post("/api/post_example", payload: { param1: "value" }, ssl_certificate: ssl)
+```
+
 ## Authors
 
 - [Túlio Ornelas](https://github.com/tulios)

data/lib/content_gateway/request.rb

@@ -42,12 +42,20 @@ module ContentGateway
     private
 
     def load_ssl_params h, params
-      client_cert_file = File.read params[:ssl_certificate][:ssl_client_cert]
-      client_cert_key = File.read params[:ssl_certificate][:ssl_client_key]
+      ssl_client_cert = params[:ssl_certificate][:ssl_client_cert]
+      ssl_client_key = params[:ssl_certificate][:ssl_client_key]
+      if ssl_client_cert || ssl_client_key
+        client_cert_file = File.read ssl_client_cert
+        client_cert_key = File.read ssl_client_key
+
+        h[:ssl_client_cert] = OpenSSL::X509::Certificate.new(client_cert_file)
+        h[:ssl_client_key] = OpenSSL::PKey::RSA.new(client_cert_key)
+        h[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+      end
+
+      ssl_version = params[:ssl_certificate][:ssl_version]
+      h[:ssl_version] = ssl_version if ssl_version
 
-      h[:ssl_client_cert] = OpenSSL::X509::Certificate.new(client_cert_file)
-      h[:ssl_client_key] = OpenSSL::PKey::RSA.new(client_cert_key)
-      h[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
       h
 
     rescue Errno::ENOENT => e0

data/lib/content_gateway/version.rb

@@ -1,3 +1,3 @@
 module ContentGateway
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/unit/content_gateway/request_spec.rb

@@ -104,14 +104,32 @@ describe ContentGateway::Request do
 
     context "requests with SSL" do
 
-      let(:ssl_certificate_params) { { ssl_client_cert: "test", ssl_client_key: "test"} }
-      let(:restclient_ssl_params) { { :ssl_client_cert=>"cert", :ssl_client_key=>"key", :verify_ssl=>0 } }
+      let(:ssl_certificate_params) { { ssl_client_cert: "test", ssl_client_key: "test", ssl_version: "SSLv23"} }
+      let(:restclient_ssl_params) { { ssl_client_cert: "cert", ssl_client_key: "key", verify_ssl: 0, ssl_version: "SSLv23" } }
       let(:request_params_ssl) { request_params.merge! restclient_ssl_params }
 
       let :subject_ssl do
         ContentGateway::Request.new(:get, "/url", {}, {}, nil, ssl_certificate: ssl_certificate_params)
       end
 
+      context "only with ssl version" do
+        let(:ssl_certificate_params) { { ssl_version: "SSLv23" } }
+        let(:restclient_ssl_params) { { ssl_version: "SSLv23" } }
+        let(:request_params_ssl) { request_params.merge! restclient_ssl_params }
+
+        it "should setup request with ssl version" do
+          expect(RestClient::Request).to receive(:new).with(request_params_ssl)
+          subject_ssl.execute
+        end
+
+        it "should not setup ssl certificates" do
+          allow(RestClient::Request).to receive(:new).with(request_params_ssl).and_return(client)
+          expect(OpenSSL::X509::Certificate).to_not receive(:new)
+          expect(OpenSSL::PKey::RSA).to_not receive(:new)
+          subject_ssl.execute
+        end
+      end
+
       context "when request is successful" do
         before do
           allow(File).to receive(:read).with("test").and_return("cert_content")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_gateway
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Content Gateway