openid_connect 0.0.16 → 0.0.17

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby
+  - ree

data/Gemfile

@@ -1,4 +1,10 @@
 source "http://rubygems.org"
 
+group :test do
+  platforms :jruby do
+    gem 'jruby-openssl', '>= 0.7'
+  end
+end
+
 # Specify your gem's dependencies in openid_connect.gemspec
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.15)
+    openid_connect (0.0.16)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)
@@ -15,19 +15,27 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activesupport (3.0.10)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     addressable (2.2.6)
     attr_required (0.0.3)
-    builder (2.1.2)
+    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.0-java)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.0)
     crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     httpclient (2.2.1)
-    i18n (0.5.0)
-    json (1.5.3)
+    i18n (0.6.0)
+    jruby-openssl (0.7.4)
+      bouncy-castle-java
+    json (1.5.4)
+    json (1.5.4-java)
     jwt (0.1.3)
       json (>= 1.2.4)
     mail (2.3.0)
@@ -35,6 +43,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    multi_json (1.0.3)
     polyglot (0.3.2)
     rack (1.3.2)
     rack-oauth2 (0.9.2)
@@ -46,6 +55,7 @@ GEM
       rack (>= 1.1)
     rake (0.9.2)
     rcov (0.9.10)
+    rcov (0.9.10-java)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -69,14 +79,16 @@ GEM
       mail (>= 2.2.5)
     validate_url (0.2.0)
       activemodel (>= 3.0.0)
-    webmock (1.7.4)
-      addressable (> 2.2.5, ~> 2.2)
+    webmock (1.7.5)
+      addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  jruby-openssl (>= 0.7)
   openid_connect!
   rake (>= 0.8)
   rcov (>= 0.9)

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/lib/openid_connect/response_object/id_token.rb

@@ -25,8 +25,30 @@ module OpenIDConnect
         JWT.encode as_json, key, algorithm
       end
 
-      def self.from_jwt(jwt_string, key)
-        new JWT.decode(jwt_string, key).with_indifferent_access
+      class << self
+        def from_jwt(jwt_string, key_or_client)
+          attributes = case key_or_client
+          when Client
+            resource_request do
+              HTTPClient.new.post key_or_client.check_session_uri, :id_token => jwt_string
+            end
+          else
+            JWT.decode(jwt_string, key).with_indifferent_access
+          end
+          new attributes
+        end
+
+        def resource_request
+          res = yield
+          case res.status
+          when 200
+            JSON.parse(res.body).with_indifferent_access
+          when 400
+            raise BadRequest.new('Check Session Faild', res)
+          else
+            raise HttpError.new(res.status, 'Unknown HttpError', res)
+          end
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -12,5 +12,5 @@ def public_key
 end
 
 def private_key
-  @private_key ||= OpenSSL::PKey::RSA.new rsa.export(OpenSSL::Cipher::Cipher.new('aes256'), 'pass-phrase'), 'pass-phrase'
+  @private_key ||= OpenSSL::PKey::RSA.new rsa.export(OpenSSL::Cipher::Cipher.new('aes-256-cbc'), 'pass-phrase'), 'pass-phrase'
 end

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -167,6 +167,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -254,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: OpenID Connect Server & Client Library