smaak 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00546dad5a52379b07bfbf7af3b17a40d20d048
-  data.tar.gz: 64c7c243b3451b8329e2ee8beb2bb2398fd7796d
+  metadata.gz: 53fd9fe4578fa68539091f3b746abda5699f6112
+  data.tar.gz: bff1001ef496c3d9d06d52964f8ffd78b65133d8
 SHA512:
-  metadata.gz: ccc4dc56a2bd6ddb3112ed252b9b1165b03290e24106fa091cd81a93d216d567d6d12bcc6dfad12f77cf24797ec2cb41ad9693065949c5bb20930d49a96bed97
-  data.tar.gz: 2e8466aed402283960edf3cf5fcdcfb5c29dd45657a5e27aa42bdfd2c70ba3fb798c7f313e38db51798c9da494fb83917e2f000254c206e849f96d13481218e6
+  metadata.gz: 6514785cd0fceedb7732d33ea9a9933d4e589b5d8234d530b3c9e36908ec5c22bfe3b3437656ab294829a80fcb979c70b366aada9eb60382ba405f7c62896ec7
+  data.tar.gz: 4086051e9407628877a947a004b5dd83c391a2af1dd7b96c6a8f1234a8a6372c2560d276ea64b954cfeef535c7efdfe53990a4f91c35c4ef0e3f34d55ded4ec5

data/lib/smaak/adaptors/rack_adaptor.rb

@@ -17,6 +17,7 @@ module Smaak
         value = 0 if value.nil?
         return value
       end
+      return @request.env["HTTP_HOST"].split(':')[0] if not @request.env["HTTP_HOST"].nil? and header == "host"
       return value = @request.env["REQUEST_METHOD"] if header == "request-method"
       return @request.env["HTTP_#{header.upcase.gsub("-", "_")}"]
     end

data/lib/smaak/server.rb

@@ -30,7 +30,7 @@ module Smaak
 
     def build_auth_message_from_request(adaptor)
       puts "[smaak error]: x-smaak-* headers not all present. Is this a smaak request?" if adaptor.header("x-smaak-recipient").nil? or adaptor.header("x-smaak-psk").nil? or adaptor.header("x-smaak-expires").nil? or adaptor.header("x-smaak-identifier").nil? or adaptor.header("x-smaak-nonce").nil? or adaptor.header("x-smaak-encrypt").nil?
-      recipient_public_key = Base64.decode64(adaptor.header("x-smaak-recipient"))
+      recipient_public_key = Smaak::Crypto::decode64(adaptor.header("x-smaak-recipient"))
       psk = adaptor.header("x-smaak-psk")
       expires = adaptor.header("x-smaak-expires")
       identifier = adaptor.header("x-smaak-identifier")
@@ -69,11 +69,18 @@ module Smaak
     def verify_signed_request(request)
       adaptor = Smaak::create_adaptor(request)
       auth_message = build_auth_message_from_request(adaptor)
-      return false if not verify_auth_message(auth_message)
+      if not verify_auth_message(auth_message)
+        puts "[smaak error]: could not verify auth_message"
+        return false
+      end
       pubkey = @association_store[auth_message.identifier]['public_key']
+      puts "[smaak warning]: pubkey not specified" if (pubkey.nil?) or (pubkey == "")
       body = Smaak::Crypto::sink(adaptor.body)
       body = Smaak::Crypto::decrypt(body, @private_key) if auth_message.encrypt
-      return false, nil if not Smaak::verify_authorization_headers(adaptor, pubkey)
+      if not Smaak::verify_authorization_headers(adaptor, pubkey)
+        puts "[smaak error]: could not verify authorization headers"
+        return false, nil
+      end
       return auth_message, body # TBD return ID from cert
     end
 

data/lib/smaak/version.rb

@@ -1,3 +1,3 @@
 module Smaak
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/smaak.rb

@@ -55,9 +55,17 @@ module Smaak
   def self.verify_authorization_headers(adaptor, pubkey)
     raise ArgumentError.new("Key is required") if pubkey.nil?
     signature_headers, signature = Smaak::get_signature_data_from_request(adaptor)
-    return false if signature.nil?
-    return false if signature_headers.nil?
-    Smaak::Crypto::verify_signature(signature, Smaak::Crypto::encode64(signature_headers), pubkey)
+    if signature.nil?
+      puts "[smaak error]: could not extract signature"
+      return false
+    end
+    if signature_headers.nil?
+      puts "[smaak error]: could not extract signature headers"
+      return false
+    end
+    verified = Smaak::Crypto::verify_signature(signature, Smaak::Crypto::encode64(signature_headers), pubkey)
+    puts "[smaak error]: verification of headers and signature using pubkey failed" if not verified
+    verified
   end
 
   private
@@ -68,7 +76,7 @@ module Smaak
     signature_headers = specification.extract_signature_headers
     signature = specification.extract_signature
 
-    return signature_headers, Base64.decode64(signature)
+    return signature_headers, Smaak::Crypto::decode64(signature)
   end
 end
 

data/spec/lib/smaak_spec.rb

@@ -125,7 +125,7 @@ describe Smaak do
     it "should extract the signature using the specification" do
       expect(Smaak::Cavage04).to receive(:new).and_return(@mock_specification)
       expect(@mock_specification).to receive(:extract_signature_headers).and_return "headers"
-      expect(@mock_specification).to receive(:extract_signature).and_return "signature"
+      expect(@mock_specification).to receive(:extract_signature).and_return Base64.strict_encode64("signature")
       Smaak::verify_authorization_headers(@adaptor, @test_server_public_key)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smaak
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Ernst van Graan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: persistent-cache