akami 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208bce131b542d769f19dd08ee9ca4fabffd2bb3
-  data.tar.gz: ab59a51d740dcabd830313410803fe6853bedbfa
+  metadata.gz: 79e369911fc1792b59cfc6160731e6c3512e1a5d
+  data.tar.gz: c8ac3cb62b958af7682ad4fdf33a177216b0854f
 SHA512:
-  metadata.gz: 675a10d8d0cbf41cb96627f736c372c1c8a9fc9793c28e35ffafee7f916c57e0cd7d901be1fda698d42bec82de71fe161bda6fa7ed66a897fcbb379fb687b680
-  data.tar.gz: a2d88a8c8966bad864ebc14f150ee950748de0567a60d9db7568d3983de929ea223a105f308528ad13f6189d3f538479bc63c4c72a2fdffcabff48ff879d60e2
+  metadata.gz: c148827b7a0b58d3b6efeca602d4a747b069966eeebd4119210d54340b78fb3e138a33793cec5949faabc4982e07292df9f76a146d1e0cbec963af54c758ad51
+  data.tar.gz: 442e501d1c5df900c6776cf3846d4ee1c088d0162d49ef61aa22cee8c55346afb924d650ca10fa9e72c7a3001317b1f9d8ca7585323e05c29b8b0f167d0fff93

data/CHANGELOG.md

@@ -1,6 +1,11 @@
+## 1.3.1 (2015-05-4)
+
+* Fix re
+
 ## 1.3.0 (2015-03-31)
 
 * Formally drop support for ruby 1.8.7
+* Feature: [#20](https://github.com/savonrb/akami/pull/20) Allow passing cert and private keys as a string, rather than a path to a file.
 
 ## 1.2.1 (2014-01-31)
 * Fix: [#2](https://github.com/savonrb/akami/pull/2) Fixes related to WS-Security,

data/akami.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake",    "~> 10.0"
   s.add_development_dependency "rspec",   "~> 2.14"
-  s.add_development_dependency "mocha",   "~> 0.13"
   s.add_development_dependency "timecop", "~> 0.5"
 
   s.files         = `git ls-files`.split("\n")

data/lib/akami/version.rb

@@ -1,5 +1,5 @@
 module Akami
 
-  VERSION = "1.3.0"
+  VERSION = '1.3.1'
 
 end

data/lib/akami/wsse/certs.rb

@@ -14,9 +14,9 @@ module Akami
       # Returns an <tt>OpenSSL::X509::Certificate</tt> for the +cert_string+ or +cert_file+.
       def cert
         @cert ||=
-          if cert_string.present?
+          if !cert_string.nil?
             OpenSSL::X509::Certificate.new(cert_string)
-          elsif cert_file.present?
+          elsif !cert_file.nil?
             OpenSSL::X509::Certificate.new(File.read(cert_file))
           end
       end
@@ -24,9 +24,9 @@ module Akami
       # Returns an <tt>OpenSSL::PKey::RSA</tt> for the +private_key_string+ or +private_key_file+.
       def private_key
         @private_key ||=
-          if private_key_string.present?
+          if !private_key_string.nil?
             OpenSSL::PKey::RSA.new(private_key_string, private_key_password)
-          elsif private_key_file.present?
+          elsif !private_key_file.nil?
             OpenSSL::PKey::RSA.new(File.read(private_key_file), private_key_password)
           end
       end

data/spec/akami/wsse/certs_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe Akami::WSSE::Certs do
+
+  let(:private_key_password) {'password' }
+  let(:cert_string)          { nil }
+  let(:private_key_string)   { nil }
+
+  let(:fixtures_path) do
+    File.join(Bundler.root, 'spec', 'fixtures', 'akami', 'wsse', 'signature' )
+  end
+
+  let(:subject) do
+    Akami::WSSE::Certs.new(
+      cert_file:            cert_file_path,
+      cert_string:          cert_string,
+      private_key_file:     private_key_path,
+      private_key_string:   private_key_string,
+      private_key_password: private_key_password,
+    )
+  end
+
+  context 'with a path to a certificate and private key' do
+    let(:cert_file_path)   { File.join(fixtures_path, 'cert.pem') }
+    let(:private_key_path) { File.join(fixtures_path, 'private_key') }
+
+    it 'should use the certificate path provided' do
+      expected_certificate = OpenSSL::X509::Certificate.new(File.read(cert_file_path))
+      expect(subject.cert.to_pem).to eq(expected_certificate.to_pem)
+    end
+
+    it 'should use the private key path provided' do
+      expected_key = OpenSSL::PKey::RSA.new(File.read(private_key_path), private_key_password)
+      expect(subject.private_key.to_pem).to eq(expected_key.to_pem)
+    end
+
+    context 'with an in-memory cert and private key' do
+      let!(:cert_string) { File.read(File.join(fixtures_path, 'cert2.pem')) }
+      let!(:private_key_string) { File.read(File.join(fixtures_path, 'private_key2')) }
+
+      it 'should use the strings provided' do
+        expected_certificate = OpenSSL::X509::Certificate.new(cert_string).to_pem
+        expect(subject.cert.to_pem).to eq(expected_certificate)
+      end
+
+      it 'should use the private key provided' do
+        expected_key = OpenSSL::PKey::RSA.new(private_key_string, private_key_password)
+        expect(subject.private_key.to_pem).to eq(expected_key.to_pem)
+      end
+
+    end
+  end
+end

data/spec/fixtures/akami/wsse/signature/cert2.pem

@@ -0,0 +1,37 @@
+-----BEGIN CERTIFICATE-----
+MIIDIjCCAougAwIBAgIJAI53JnRgJIJwMA0GCSqGSIb3DQEBBQUAMGoxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMQ4wDAYDVQQKEwVTYXZvbjEOMAwGA1UECxMFU2F2b24xDjAMBgNVBAMTBVNh
+dm9uMB4XDTE0MTIwMjAwMTMwMloXDTI0MTEyOTAwMTMwMlowajELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28x
+DjAMBgNVBAoTBVNhdm9uMQ4wDAYDVQQLEwVTYXZvbjEOMAwGA1UEAxMFU2F2b24w
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM56hKF3+4SSUu8msb5HWMvp322y
+QL+luJ+Lt/r/ib7EPeb4UU68b+Wf3xIa3N1+w8tDQghCR4YuEIILKH/UGC785Old
+VJfikD4kxiwF4jB0RgdRK/JEG/UthHKqJID+oyijW4ws4MgZ/bWMhSbSVRioqcwe
+2JElg/m2TemKJkXDAgMBAAGjgc8wgcwwHQYDVR0OBBYEFKSd+UicrRDQS2NeLSEA
+Zpipjk8EMIGcBgNVHSMEgZQwgZGAFKSd+UicrRDQS2NeLSEAZpipjk8EoW6kbDBq
+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2Fu
+IEZyYW5jaXNjbzEOMAwGA1UEChMFU2F2b24xDjAMBgNVBAsTBVNhdm9uMQ4wDAYD
+VQQDEwVTYXZvboIJAI53JnRgJIJwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEF
+BQADgYEAWI27+cDx3U53zaJROXKfQutqUZzZz9B0NzQ0vlN2h5UbACGbXH9C1wLz
+MBvNjgEiK+/jHSadSDgfvADv+2hCsFw8eNgbisWiV5yvDyTqttg3cSJHz8jRDeA+
+jnvaC9Y//AoRr/WGKKU3FY40J7pQKcQNczGUzCS+ag0IO64agTs=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,A0BF079E41C9A4C1
+
+rEO5mWOWbnr8uyjtfIRwW9wRo2/y1wMON2c605BkgaNeAKH/++1UC9qEhNtHfE2Q
+omQkXiHfV6yt3l3dWPcnA9ToT9PRNLyoRMMC+Ds5EuEk4ypihQ8SS2xt3wqCRkwm
+3/AyrRZXUnBTVzZ9D35lz1HCFfJ61UpOMN9XOZy4yUqDZVG/ybMhXilfNKgTr8xJ
+StTb7ruwV/8xTiEgmcxGKJbOcDKqwsd/mW3VbDN6zOqYC0TlFc/eiCbJxMd35l6a
+oRfHWHbabumcfZplqoDcOwYpRb8ZiDbu74RrDogKnpH7nnJrp8jSYueCiXGDWGFG
+ZXB6f2FhsbrLEM87L8cxJO6Hk6+c39qgiP2aRICeKjUNKPOfSiPr4yP4/g3tFY2z
+sI9xur3nAXoqxXBrEkEdvXiH35UfJpqOTxbAN+Ozxnj1QeLWDDE8nkMW/XRRxdCk
+jeUwR5PS3sM2S/fIn7rThQSKRMxznK//cEUsMwz514HekxnKyj8rZUETcFFySxmz
+lmOzDOaPNejDOgNSrlT+IDqE9YlMxLObv5l960QOjk0qBaO8e33HkgfBqENzq7Uv
+Wrj3FyBlNz4vfhCZHBY0+rSgdZHM64DV0HybE7yc+mMUwrV7ish1bGb/Bek/4JF+
+lrpRuxTEQFGNTGFYa0C5zDpz9UtiSUs2X4EX74GfxCUmn7kNND+4OVrndZiEONPz
+/6QffS7YG1UtahDpDzI1wOCYD9Iwg/HnmTWMcXj2Yw7jRvlG0sArw/5dNJkrmuJY
+6PvFoEeZSF4qrUCDlw/BUJMaGDlhSCyTWulZZU+wWuJRTWCiDxYO1g==
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/akami/wsse/signature/private_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAw86gdw+0nANIB2+8y/2eMXppCI8AbRM+UuZuRbu1WbuGBuwL
+BfkkYwqGOYfms7DF5VE9oMs0Z7s+jHjm4OuI14ikBpQZs4QAHow/FKUT7AgTURk5
+c3Hq2mk3se4sM5VZ6sWV64IqengrueIdv5hNLkqA0iP+ckh2TT/xSYPjFDWIyFkR
+46ZaHtrEqnMLadp8w/5iwYj2Wr9JWbgptFxlWdfJolDo2XPN2Y7FT3y1uPJ97X7w
+ieEMrdy2VTVx3n5S82uRO8lq7JbOrG/ywYqlc8qy//fygW5lC9svy61AMNoLnEMt
+L/sXHa4Khw97nwAHJVgul7hHIg++yb+8fA0U5QIDAQABAoIBACPjf23TJxthTpZu
+WIBbH9+ZvB6hd0aGvGmdaqDFYtvrjwk9wld57r1odGmfCx3sTJlXZqBOHnDU1QYS
+Mt8OzKoUlVvPUVah3xO6SOWTzC762++FXA5Y1t7pYhfuu5NI0I5DYNMlrHt+AyWy
+2BkB5UOSzEG37y8rMOO/0I3U6o4NX1xmA7SXdTnGDPAa+UkxmWsuiDqoDez86E0l
+OlUgm76VBY/i19spI+eDqVozxWV9edqO06kSFIevN9bXAqab9oSyKgj9zkPofzHB
+FxBBsmGWlYEFllo7e4MnAYuTBV49UJc+yKnAyHqt7EQo4pylu8Ly7qu1tXPpR+wi
+qJKfzRECgYEA+GvwRoS76nArZ73NzqWfNxdHwq2IsGUOmlOikMreSwOfn+lPBbgs
+mDeLOf8MBwAvJjyTQXxkW/sCA+sRlM4BtuDRYLRLQLgzxXLGKMi2QAeLiJCL+bQJ
+ytVsOAu7EvQ8aSRSPAfZD+S7wv135sr2MyzyHushpGZwToqOizo3hq8CgYEAycfK
+6and3bYd9QvZH7GALqQauBe+9fmNG5YJKYcjjQNBtStRAMDtNRuAagcaVbIjQrgm
++BzLbOOJS4/CTtYJPrZDmsQxX0cVI28FwRPWTPjM3g+1IMmaW1QhogU9mea2uPZK
+y6Lb/fEdx0erueDnSzfEDisseh7LFsqaX5rTQqsCgYA+MwBpF6jZTRaBFhPmrq9L
+oueTxdFYoSTj3Rbx++lmjNS1vDvN6cw4nIeekM5ZHmGvyDDyj4utQA7EHmI7iM0D
+Fg02kk3ZOYW05UTaR07if0Efg1mYvsxI3eEHs2A2obJSfQaeAzUE9rdQXhhcT+sO
+6y0AMs0slX1/HNAN6him/wKBgQCFBqipn4lbj6L0WFlOYbEGDr5mu5DzjRAQLbvg
+mu0/G/SHwgTnIEnCB12DiSc9c/F3HPzj+efK478yB5asbsMtiu/K6qk6DRzMfXcn
+sTJJEIXPqD9bXE3dA/wgWqAgBFBWZFkvIzExm3JsXL3ED5esqRkh1ii+Yeq2Hd/k
+Q6gffQKBgEOiUeqjGjH0GZZF5m3Z2S3SqIJEkrZShWfGkADj0d567TyDBIZaFDlI
+fsWIijrkJqLxRykKHkSuC25zHekvwjvYZH0nJU+aHzMhOUp9EHOG8R0N2iRJB+fI
+IFWPH8APR0B/1dSC2bHdShgocZo4EbzjqHXBYXqtca1fwGwL1QdD
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/akami/wsse/signature/private_key2

@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: AES-128-CBC,52173193B53D1099E18A13BF0FB75922
+
+mZBvI9dsttoS0EHLKN5Th9noq7oaxoon3l5gSSaRNd2qwj74bWLQDIVLYP1loJrq
+EebaE9IVXUAxULws/ZHA5DwdLOekGfppeyClyNxy5aZk3cnzv5mpue+LhuXryaPx
+Uu5gHu3S1cL/OAOhqAFxfwQXDgdYLmsHYWwpr/Hqs2yDgCDcZBbiq7D/FA5/deA4
+V71OH9Ig/5gt8xshuo6ZRrqgiTI5gyml2xXE633/XpYK4wFez2EaJFcziVcmxFYl
+19UfoTCLZiuNE6y4VgyDpRQlb/xn6robuRDhWg6ab0rKEo3FG8pbQv1n/OwFyR0s
+1P4ENRygWXDkURTGwfOsduvC9io2NiQISupSrKyOb2SySwUvqXWjjROKoG5rln2i
+HDLXQqNJ7klmFmh90j/hPE3IaIJQZpalBPwHqPrmUCwW3clUZF6YVIUbSmeDpX2/
+t8jeKtttwb04TqVPVoT1/ufBbj+CsO4YmrOQhXmQWvPFJMKqmhk7yhfE9xmfTU2j
+2NEzpo3icz58IQekrN5WkNLoiRHGcbVzXhaMKIg4e9QqSIatBNkQ/OsM2wgElaiX
+BxdMuhunb4C236U0g0q0YEGbvpUZXScDkI0/eEBkmPcZLtb5GpBl0fruwBehh6ML
+b4y/de3qGGkEZVEErPLlPoELs26ptkZnqp4jrrg2RzIPrfcgH9Cww4kbCGrrflJA
+DTXfprj17AxPW4xxLYAPhndQfhE8knJdMTgFxE3Z7w0QiL6FgSjM1106w45Wde11
+E9w7/NmgbJlphEQwy5xpxE74f+cCIjx/9qbUIEUgpfMGGwSn6b6ZSu3IKLa/Twsj
+F4Vv9jjraagGKtC1cM+FsHq6fXQvSVRopMcwIX4ilD0BXMewNUVVfKFCtcSHXv3P
+lrIxbHZlnL9Xky8bNd/HD0nLRBJOMzCV3TfxKa7h0FhIrfgYEjlv+0Xj8n6ndHBR
+riqTyAUMYTQyxvLdTvqTsNKHNOTGmBljP68dRibhOwxIT5Dp8XPE06pmOPz+6ChZ
+6lNzydTPU5HCpFWAm7ZkmFgFkf4Fw44OXb7zWq0p10Wht4shxQX+jZaBzg9iWwt2
+Q+arLuV7Z9ucqK/MtbTOrCtvoVZ/zWPx6v0ORhv9XKbLJVZUNRotguyyXfLtTSt5
+ifU8RQyqK3UjVcGfL4xfPLJ3RB5vU7yswcneO16W57N1PnLLEINY5r23kWxFDg65
+limd1LL7u4v+dJMcExUnBBCC+fttxtTC9VlmuHMh7D7I2bUfDSQUfFb5nAe1xqLm
+ycU+EN9bkyDQgEv5c1+Bi5fvenky6vbPCdDTX6S6IQ1pBzacuw31w994I35q/pZZ
+7f0QEFoPVhLlMLeyxW8Yl4cC4YvN8asqgtveUY2+iNEtYCZduE8DtBkyaKIaISTw
+AfHumzs4QHA7hoOBTXjSO9ozfspmeUHS5jUFU/QDFvkE+DCvKu2fxDzK5rfcH9sy
+DcnyEJJScJQRar96yJHP/9Q8JcQHt/taU8t4yAecZ+qoYPG/q6mxFQsMeHjedJh0
+mxU//a1UHJrCLM1AfnxTkr8mB/LTZmoRh6KhwHPVQ1/H+MDCijBr7lqmsXNybwB4
+-----END RSA PRIVATE KEY-----

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akami
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gyoku
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -119,10 +105,14 @@ files:
 - lib/akami/wsse/signature.rb
 - lib/akami/wsse/verify_signature.rb
 - lib/akami/xpath_helper.rb
+- spec/akami/wsse/certs_spec.rb
 - spec/akami/wsse/signature_spec.rb
 - spec/akami/wsse/verify_signature_spec.rb
 - spec/akami/wsse_spec.rb
 - spec/fixtures/akami/wsse/signature/cert.pem
+- spec/fixtures/akami/wsse/signature/cert2.pem
+- spec/fixtures/akami/wsse/signature/private_key
+- spec/fixtures/akami/wsse/signature/private_key2
 - spec/fixtures/akami/wsse/signature/unsigned.xml
 - spec/fixtures/akami/wsse/verify_signature/invalid_digest_changed.xml
 - spec/fixtures/akami/wsse/verify_signature/invalid_digested_changed.xml
@@ -153,15 +143,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: akami
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Web Service Security
 test_files:
+- spec/akami/wsse/certs_spec.rb
 - spec/akami/wsse/signature_spec.rb
 - spec/akami/wsse/verify_signature_spec.rb
 - spec/akami/wsse_spec.rb
 - spec/fixtures/akami/wsse/signature/cert.pem
+- spec/fixtures/akami/wsse/signature/cert2.pem
+- spec/fixtures/akami/wsse/signature/private_key
+- spec/fixtures/akami/wsse/signature/private_key2
 - spec/fixtures/akami/wsse/signature/unsigned.xml
 - spec/fixtures/akami/wsse/verify_signature/invalid_digest_changed.xml
 - spec/fixtures/akami/wsse/verify_signature/invalid_digested_changed.xml