aptible-auth 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601ef2879f9405a59fabd7f46b2d7590f13789c5
-  data.tar.gz: 21659073f5e655cc2ea986c7c5f8accfc585012c
+  metadata.gz: 944d38b34bbc1c213f954760d6ff5b7a580a4f0a
+  data.tar.gz: a7fc6914293f4f159e8e0f3192736355812f1b95
 SHA512:
-  metadata.gz: d54de93252131c3f19929525db1e37b502608e7adecc65cb17668f0aa790ccdeb33ce8e6f76356c8a33bd841484d6772b068aaa739a95a265adfd249760c3eaa
-  data.tar.gz: 9f92c097443b77c9128f1a49f64eca35539b512152927cd8694881ff847596416ddfd88bf356e0ade75a26037f14c1c7ca6b86a4279358607917b6bf919ea6a9
+  metadata.gz: 3ff9d46b6e646a2ed567eb90b90e64ad2f6a248d299c06d175bc64ae4cfa8942ea0718f914d63704712cc2aab563e50d65507e7cf54d115e63ebfd2393641957
+  data.tar.gz: 785dbffe0912ee10277e64576a5945d1eca5218cd4964ad94c9dee5e95d1450c7a1149b40dcad6ebfeb417831e80fc73b208dca03bb2126030dac93844f5548c

data/lib/aptible/auth/token.rb

@@ -23,7 +23,10 @@ module Aptible
 
       def authenticate_client(id, secret, user, options = {})
         options[:scope] ||= 'manage'
-        response = client.assertion.get_token(id, secret, user, options)
+        response = client.assertion.get_token({
+          iss: id,
+          sub: user
+        }.merge(signing_params_from_secret(secret).merge(options)))
         parse_oauth_response(response)
       end
 
@@ -45,6 +48,32 @@ module Aptible
         @refresh_token = response.refresh_token
         @expires_at = Time.at(response.expires_at)
       end
+
+      def signing_params_from_secret(secret)
+        private_key = parse_private_key(secret)
+        {
+          private_key: private_key,
+          algorithm:  "RS#{key_length(private_key) / 2}"
+        }
+      end
+
+      def parse_private_key(string)
+        if string =~ /\A-----/
+          OpenSSL::PKey::RSA.new(string)
+        else
+          formatted_string = <<PRIVATE_KEY
+-----BEGIN RSA PRIVATE KEY-----
+#{string.scan(/.{1,64}/).join("\n")}
+-----END RSA PRIVATE KEY-----
+PRIVATE_KEY
+          OpenSSL::PKey::RSA.new(formatted_string)
+        end
+      end
+
+      def key_length(private_key)
+        # http://stackoverflow.com/questions/13747212
+        private_key.n.num_bytes * 8
+      end
     end
   end
 end

data/lib/aptible/auth/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Auth
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/spec/aptible/auth/token_spec.rb

@@ -60,18 +60,30 @@ describe Aptible::Auth::Token do
   describe '#authenticate_client' do
     let(:args) { %w(id secret user@example.com) }
 
+    before do
+      subject.stub(:signing_params_from_secret) { { algorithm: 'foobar' } }
+    end
     before { subject.stub(:client) { client } }
     before { client.stub_chain(:assertion, :get_token) { response } }
 
     it 'should use the assertion strategy' do
-      params = { scope: 'manage' }
-      expect(client.assertion).to receive(:get_token).with(*(args + [params]))
+      expect(client.assertion).to receive(:get_token).with(
+        iss: 'id',
+        sub: 'user@example.com',
+        algorithm: 'foobar',
+        scope: 'manage'
+      )
       subject.authenticate_client(*args)
     end
 
     it 'should allow the token scope to be specified' do
       args << { scope: 'read' }
-      expect(client.assertion).to receive(:get_token).with(*args)
+      expect(client.assertion).to receive(:get_token).with(
+        iss: 'id',
+        sub: 'user@example.com',
+        algorithm: 'foobar',
+        scope: 'read'
+      )
       subject.authenticate_client(*args)
     end
 
@@ -81,4 +93,30 @@ describe Aptible::Auth::Token do
       expect(subject.access_token).to eq 'access_token'
     end
   end
+
+  describe '#signing_params_from_secret' do
+    let(:private_key_string) { OpenSSL::PKey::RSA.new(512).to_s }
+
+    subject do
+      lambda do |secret|
+        described_class.new.send(:signing_params_from_secret, secret)
+      end
+    end
+
+    it 'should return a correct :algorithm' do
+      params = subject.call(private_key_string)
+      expect(params[:algorithm]).to eq 'RS256'
+    end
+
+    it 'should return a correct :private_key for header/footer keys' do
+      params = subject.call(private_key_string)
+      expect(params[:private_key]).to be_a OpenSSL::PKey::RSA
+    end
+
+    it 'should return a correct :private_key for Base64-only keys' do
+      stripped_key = private_key_string.gsub(/^-.*-$/, '').gsub("\n", '')
+      params = subject.call(stripped_key)
+      expect(params[:private_key]).to be_a OpenSSL::PKey::RSA
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-auth
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config