smaak 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d73a7bae2454b5626a8a50fd7028c62cf071b0
-  data.tar.gz: e562fc1e85c951f86b4dedb8fbdcc9ebf17487c6
+  metadata.gz: fb8410c5b436029e036acecdf7c192f5c9d807de
+  data.tar.gz: cc6f08a6ca3df055ba225d6ca696a4102ac05795
 SHA512:
-  metadata.gz: 4305d3436bea55aba4e63b131792edb6b6df5715a8537519703930f8774ceb74c878bdf5cb2a06345ad0e96f75879ebb7c40b49d368dab289219b2e05b90a910
-  data.tar.gz: a52f81b5f4a7b5dad3991bac7720c2af94cfffbf0bf791f101ca794f1cb5a78f96547158b9c06680920693276103d414f602cdbe2e68f58da4f68ea65052519e
+  metadata.gz: ee40f00cbd01cc9c1f8fdfb2a478795c2f5637ab0425aef711181517368480c85fb8fd76eeacb237af3d978974631a106351c714188feb53bd1ab79756da2ace
+  data.tar.gz: 7ed63f1be7a63c2deb37b3692a4665253ee30e0b1b7c60113bfc243b3bbcb23191f03ab5555b6e9aa772315145e4176949ac8f5718d0f19dfcf21491927720ac

data/lib/smaak/client.rb

@@ -51,7 +51,8 @@ module Smaak
       adaptor = Smaak::create_adaptor(req)
       req = (sign_request(identifier, adaptor)).request
       response = http.request(req)
-      response.body = Smaak::Crypto::decrypt(response.body, @key) if @association_store[identifier]['encrypt']
+      response.body = Smaak::Crypto::decrypt(response.body, @key) if @association_store[identifier]['encrypt']  and response.code[0] == '2'
+      puts "[smaak error]: response from #{identifier} was #{response.code}" if not response.code[0] == '2'
       response
     end
   end

data/lib/smaak/version.rb

@@ -1,3 +1,3 @@
 module Smaak
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/spec/lib/smaak/client_spec.rb

@@ -151,7 +151,9 @@ describe Smaak::Client do
       mock_req = Net::HTTP::Post.new(url.to_s)
       expect(Net::HTTP).to receive(:new).with(url.host, url.port).and_return(mock_http)
       expect(Net::HTTP::Post).to receive(:new).with(url.to_s).and_return(mock_req)
-      expect(mock_http).to receive(:request).with(mock_req)
+      mock_response = ""
+      allow(mock_response).to receive(:code).and_return "200"
+      expect(mock_http).to receive(:request).with(mock_req).and_return(mock_response)
       @iut.post(@test_service_identifier, @test_uri, @test_body, false, OpenSSL::SSL::VERIFY_NONE)
     end
 
@@ -164,6 +166,7 @@ describe Smaak::Client do
       expect(Net::HTTP::Post).to receive(:new).with(url.to_s).and_return(mock_req)
       mock_response = ""
       expect(mock_response).to receive(:body).and_return ""
+      allow(mock_response).to receive(:code).and_return "200"
       expect(mock_response).to receive(:body=)
       expect(mock_http).to receive(:request).with(mock_req).and_return(mock_response)
       expect(Smaak::Crypto).to receive(:encrypt).and_return ""
@@ -172,13 +175,33 @@ describe Smaak::Client do
       @iut.post('encrypted', @test_uri, @test_body, false, OpenSSL::SSL::VERIFY_NONE)
     end
 
+    it "should decrypt the response body only if the response code is a 200 class code (2XX)" do
+      @iut.add_association('encrypted', @test_service_public_key, @test_service_psk, true)
+      url = URI.parse(@test_uri)
+      mock_http = Net::HTTP.new(url.host, url.port)
+      mock_req = Net::HTTP::Post.new(url.to_s)
+      expect(Net::HTTP).to receive(:new).with(url.host, url.port).and_return(mock_http)
+      expect(Net::HTTP::Post).to receive(:new).with(url.to_s).and_return(mock_req)
+      mock_response = ""
+      expect(mock_response).to receive(:body).and_return ""
+      allow(mock_response).to receive(:code).and_return "200"
+      expect(mock_response).to receive(:body=)
+      expect(mock_http).to receive(:request).with(mock_req).and_return(mock_response)
+      expect(Smaak::Crypto).to receive(:encrypt).and_return ""
+      expect(Smaak::Crypto).to receive(:decrypt).with("", @iut.key)
+
+      @iut.post('encrypted', @test_uri, @test_body, false, OpenSSL::SSL::VERIFY_NONE)
+    end
+
     it "should return the response" do
       url = URI.parse(@test_uri)
       mock_http = Net::HTTP.new(url.host, url.port)
       mock_req = Net::HTTP::Post.new(url.to_s)
       expect(Net::HTTP).to receive(:new).with(url.host, url.port).and_return(mock_http)
       expect(Net::HTTP::Post).to receive(:new).with(url.to_s).and_return(mock_req)
-      expect(mock_http).to receive(:request).with(mock_req).and_return "response"
+      mock_response = "response"
+      allow(mock_response).to receive(:code).and_return "200"
+      expect(mock_http).to receive(:request).with(mock_req).and_return mock_response
       expect(@iut.post(@test_service_identifier, @test_uri, @test_body, false, OpenSSL::SSL::VERIFY_NONE)).to eql("response")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smaak
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache