aggcat 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01641fbe96bead5bc86b7402eab8390c0fdd0dce
-  data.tar.gz: ead27f7fae30610e910d654a77c0e546950155ed
+  metadata.gz: 172de361ab101826185ef380d9bedb25dc49625f
+  data.tar.gz: 5329c6ec211c0c579cc42d2462fdff121329febd
 SHA512:
-  metadata.gz: e49815f6255d7cbe96c0e2d98ffc37b8390b00871285447f79200f55ea60165332b5f74d7f9acfc8bffde592065f4d04e1fc42d493424d347de2afbcc9a407d7
-  data.tar.gz: bab45121780df51e5072f6afcfd42ec7677ac0c001237549be886d097896352b890a33ced5530a715bf0ecd9f46da8c8e1f5e169c4a842c3777a1db1715e2320
+  metadata.gz: 8870135366674d325a409cdc391af4ae5545da5245c22876d00288b2d43e225c4a588579e9ed8062837ef3e44251708eb800e5915aca198ba833012a4a2c6c93
+  data.tar.gz: 67ba0e628d8aacb31d7569dd333802fd6829cf0aceb4b3249c12702a8cff97d15eb7dc11abda949c7fd69a107d70d122ab7fd33a52c80e6372a81d99dd0b6126

data/Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rake'
-
 group :test do
+  gem 'rake'
   gem 'minitest'
   gem 'test-unit'
   gem 'simplecov', :require => false

data/README.md

@@ -36,6 +36,10 @@ Aggcat.configure do |config|
   config.consumer_key = 'your consumer key'
   config.consumer_secret = 'your consumer secret'
   config.certificate_path = '/path/to/your/certificate/key'
+  # if your certificate is a string, instead of specify the path you can set the value like so
+  # Note certificate_value takes precedence over certificate_path
+  # Also make sure your certificate has newline characters as appropriate
+  config.certificate_value = "-----BEGIN RSA PRIVATE KEY-----\nasdf123FOO$BAR\n...\n-----END RSA PRIVATE KEY-----"
 end
 
 # alternatively, specify configuration options when instantiating an Aggcat::Client
@@ -43,7 +47,7 @@ client = Aggcat::Client.new(
   issuer_id: 'your issuer id',
   consumer_key: 'your consumer key',
   consumer_secret: 'your consumer secret',
-  certificate_path: '/path/to/your/certificate/key',
+  certificate_path: '/path/to/your/certificate/key', # OR certificate_value: "--BEGIN RSA KEY--..."
   customer_id: 'scope for all requests'
 )
 

data/aggcat.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'builder', '>= 3.0'
   spec.add_dependency 'activesupport', '>= 3.2'
 
-  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'bundler'
 end

data/lib/aggcat/base.rb

@@ -73,13 +73,17 @@ module Aggcat
       assertion = %[<saml2:Assertion xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" ID="_#{reference_id}" IssueInstant="#{iso8601(now)}" Version="2.0"><saml2:Issuer>#{@issuer_id}</saml2:Issuer><saml2:Subject><saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified">#{user_id}</saml2:NameID><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"></saml2:SubjectConfirmation></saml2:Subject><saml2:Conditions NotBefore="#{iso8601(now-5*60)}" NotOnOrAfter="#{iso8601(now+10*60)}"><saml2:AudienceRestriction><saml2:Audience>#{@issuer_id}</saml2:Audience></saml2:AudienceRestriction></saml2:Conditions><saml2:AuthnStatement AuthnInstant="#{iso8601(now)}" SessionIndex="_#{reference_id}"><saml2:AuthnContext><saml2:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified</saml2:AuthnContextClassRef></saml2:AuthnContext></saml2:AuthnStatement></saml2:Assertion>]
       digest = Base64.encode64(OpenSSL::Digest::SHA1.digest(assertion)).strip
       signed_info = %[<ds:SignedInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI="#_#{reference_id}"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>#{digest}</ds:DigestValue></ds:Reference></ds:SignedInfo>]
-      key = OpenSSL::PKey::RSA.new(File.read(@certificate_path))
+      key = OpenSSL::PKey::RSA.new(certificate)
       signature_value = Base64.encode64(key.sign(OpenSSL::Digest::SHA1.new(nil), signed_info)).gsub(/\n/, '')
       signature = %[<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference URI="#_#{reference_id}"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>#{digest}</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>#{signature_value}</ds:SignatureValue></ds:Signature>]
       assertion_with_signature = assertion.sub(/saml2:Issuer\>\<saml2:Subject/, "saml2:Issuer>#{signature}<saml2:Subject")
       Base64.encode64(assertion_with_signature)
     end
 
+    def certificate
+      @certificate_value ||= File.read(@certificate_path)
+    end
+
     def iso8601(time)
       time.strftime(TIME_FORMAT)
     end

data/lib/aggcat/configurable.rb

@@ -1,9 +1,9 @@
 module Aggcat
   module Configurable
 
-    attr_writer :issuer_id, :consumer_key, :consumer_secret, :certificate_path, :customer_id, :open_timeout, :read_timeout, :verbose
+    KEYS = [:issuer_id, :consumer_key, :consumer_secret, :certificate_value, :certificate_path, :customer_id, :open_timeout, :read_timeout, :verbose]
 
-    KEYS = [:issuer_id, :consumer_key, :consumer_secret, :certificate_path, :customer_id, :open_timeout, :read_timeout, :verbose]
+    attr_writer *KEYS
 
     def configure
       yield self

data/lib/aggcat/version.rb

@@ -1,3 +1,3 @@
 module Aggcat
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

data/test/aggcat/aggcat_test.rb

@@ -27,6 +27,24 @@ class AggcatTest < Test::Unit::TestCase
     assert_equal 30, configurable.instance_variable_get(:'@read_timeout')
   end
 
+  def test_configure_certificate_by_value
+    cert_value = File.read("#{fixture_path}/cert.key")
+    configurable = Aggcat.configure do |config|
+      config.issuer_id = 'issuer_id'
+      config.consumer_key = 'consumer_key'
+      config.consumer_secret = 'consumer_secret'
+      config.certificate_value = cert_value
+      config.open_timeout = 5
+      config.read_timeout = 30
+    end
+    assert_equal 'issuer_id', configurable.instance_variable_get(:'@issuer_id')
+    assert_equal 'consumer_key', configurable.instance_variable_get(:'@consumer_key')
+    assert_equal 'consumer_secret', configurable.instance_variable_get(:'@consumer_secret')
+    assert_equal cert_value, configurable.instance_variable_get(:'@certificate_value')
+    assert_equal 5, configurable.instance_variable_get(:'@open_timeout')
+    assert_equal 30, configurable.instance_variable_get(:'@read_timeout')
+  end
+
   def test_scope
     client1 = Aggcat.scope('1')
     assert_true client1.is_a?(Aggcat::Client)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aggcat
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Gene Drabkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement