json-jwt 0.6.1 → 0.7.0.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfafaeda298c56aa5cd5f1056f33b31ed7b31bb8
-  data.tar.gz: fe6fd7d8d776f0b197add6a79f2b11a03afc9af7
+  metadata.gz: de4af966b0dc54f6caf14149295dbb7f8bccd856
+  data.tar.gz: 2a93fc7d1d35b3fc7319f31a2fed23392c0ed7d8
 SHA512:
-  metadata.gz: f0ead0b472adcf5fab5203765d2b83ea4afeb131510d4765b0f884867de2affeac688d72c8bbc64626498680e0b6c55a1f351d9fcd07fde418342be7ef9ab92c
-  data.tar.gz: adca33ab7ec94e4a92a70585cf3c3e441f2f22c56701071adc79f1d5ecd6a0bc28fbb9cbb13ce74b9869c8dfe274c3da1d65b49621e5fbe1ce944e1c6204caab
+  metadata.gz: d7424823b6791844548cc154beaa9569672c1f7f439770d21f3effed0a3b9a7007de394c2bc2aee627907e97d2a080e48ff51d578a2a0f82ce34979aabcacf08
+  data.tar.gz: bbdd062cc11dfc58af47d27969ee42a1c940e7a1646a818458a69d8cbac25b869bd14123f63bf4326913c2b3af3db6b21c30b69d46203db82f91b507dcdffd6a

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.7.0.alpha

data/json-jwt.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "securecompare"
   gem.add_development_dependency "rake", ">= 0.8"
   gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "rspec", ">= 2"
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency 'rspec-its'
 end

data/lib/json/jwe.rb

@@ -118,7 +118,7 @@ module JSON
     end
 
     def sha_digest
-      OpenSSL::Digest::Digest.new "SHA#{sha_size}"
+      OpenSSL::Digest.new "SHA#{sha_size}"
     end
 
     def derive_encryption_and_mac_keys_cbc!

data/lib/json/jwk.rb

@@ -12,19 +12,6 @@ module JSON
 
     private
 
-    def ecdsa_curve_name(ecdsa_key)
-      case ecdsa_key.group.curve_name
-      when 'secp256k1'
-        :'P-256'
-      when 'secp384r1'
-        :'P-384'
-      when 'secp521r1'
-        :'P-521'
-      else
-        raise UnknownAlgorithm.new('Unknown ECDSA Curve')
-      end
-    end
-
     def ecdsa_coodinates(ecdsa_key)
       unless @ecdsa_coodinates
         hex = ecdsa_key.public_key.to_bn.to_s(16)
@@ -33,8 +20,8 @@ module JSON
         hex_x =  hex[2, data_len/2]
         hex_y = hex[2+data_len/2, data_len/2]
         @ecdsa_coodinates = {
-          :x => hex_x,
-          :y => hex_y,
+          :x => [hex_x].pack("H*"),
+          :y => [hex_y].pack("H*")
         }
       end
       @ecdsa_coodinates
@@ -51,7 +38,7 @@ module JSON
       when OpenSSL::PKey::EC
         {
           :kty => :EC,
-          :crv => ecdsa_curve_name(public_key),
+          :crv => self.class.ecdsa_curve_identifier_for(public_key.group.curve_name),
           :x   => UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:x].to_s),
           :y   => UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:y].to_s),
         }
@@ -62,6 +49,32 @@ module JSON
     end
 
     class << self
+      def ecdsa_curve_name_for(curve_identifier)
+        case curve_identifier.to_s
+        when 'P-256'
+          'prime256v1'
+        when 'P-384'
+          'secp384r1'
+        when 'P-521'
+          'secp521r1'
+        else
+          raise UnknownAlgorithm.new('Unknown ECDSA Curve')
+        end
+      end
+
+      def ecdsa_curve_identifier_for(curve_name)
+        case curve_name
+        when 'prime256v1'
+          :'P-256'
+        when 'secp384r1'
+          :'P-384'
+        when 'secp521r1'
+          :'P-521'
+        else
+          raise UnknownAlgorithm.new('Unknown ECDSA Curve')
+        end
+      end
+
       def decode(jwk)
         jwk = jwk.with_indifferent_access
         case jwk[:kty].to_s
@@ -73,7 +86,13 @@ module JSON
           key.n = n
           key
         when 'EC'
-          raise NotImplementedError.new('Not Implemented Yet')
+          key = OpenSSL::PKey::EC.new ecdsa_curve_name_for(jwk[:crv])
+          x, y = [jwk[:x], jwk[:y]].collect do |decoded|
+            UrlSafeBase64.decode64(decoded).unpack('H*').first
+          end
+          key_bn = OpenSSL::BN.new ['04', x, y].join, 16
+          key.public_key = OpenSSL::PKey::EC::Point.new key.group, key_bn
+          key
         else
           raise UnknownAlgorithm.new('Unknown Algorithm')
         end

data/lib/json/jws.rb

@@ -24,7 +24,7 @@ module JSON
     private
 
     def digest
-      OpenSSL::Digest::Digest.new "SHA#{algorithm.to_s[2, 3]}"
+      OpenSSL::Digest.new "SHA#{algorithm.to_s[2, 3]}"
     end
 
     def hmac?
@@ -84,7 +84,7 @@ module JSON
     def verify_ecdsa_group!(key)
       group_name = case digest.digest_length * 8
       when 256
-        :secp256k1
+        :prime256v1
       when 384
         :secp384r1
       when 512

data/spec/fixtures/ecdsa/256/private_key.pem

@@ -1,5 +1,5 @@
 -----BEGIN EC PRIVATE KEY-----
-MHQCAQEEIAm5+R4izRn6OHBl59IL9ow1txjto6gD21IDdDyhXmOWoAcGBSuBBAAK
-oUQDQgAElSHlYujXQEFMiiuZ1Gb91eXwxTGvTKbBFmzOxTtf0w8CCk1UB6G750Br
-xiIbllGmVmkoiuWKVkxnB9X9nccJtw==
+MHcCAQEEIHo5LvIgMVpOlEKjjZiE5n+xYtTxLm4Eumx7FRMgICyDoAoGCCqGSM49
+AwEHoUQDQgAEsaPyrO4Lh9kh2FxrF9y1QVmZznWnRRJwpr12UHqzrVYwzPhb3POq
+WsmGqv4nKum+WdogjJlAToN+uA+TEwDDUw==
 -----END EC PRIVATE KEY-----

data/spec/fixtures/ecdsa/256/public_key.pem

@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAElSHlYujXQEFMiiuZ1Gb91eXwxTGvTKbB
-FmzOxTtf0w8CCk1UB6G750BrxiIbllGmVmkoiuWKVkxnB9X9nccJtw==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEsaPyrO4Lh9kh2FxrF9y1QVmZznWn
+RRJwpr12UHqzrVYwzPhb3POqWsmGqv4nKum+WdogjJlAToN+uA+TEwDDUw==
 -----END PUBLIC KEY-----

data/spec/json/jwk_spec.rb

@@ -27,16 +27,16 @@ describe JSON::JWK do
     let(:expected_coodinates) do
       {
         256 => {
-          x: 'OTUyMUU1NjJFOEQ3NDA0MTRDOEEyQjk5RDQ2NkZERDVFNUYwQzUzMUFGNENBNkMxMTY2Q0NFQzUzQjVGRDMwRg',
-          y: 'MDIwQTRENTQwN0ExQkJFNzQwNkJDNjIyMUI5NjUxQTY1NjY5Mjg4QUU1OEE1NjRDNjcwN0Q1RkQ5REM3MDlCNw'
+          x: 'saPyrO4Lh9kh2FxrF9y1QVmZznWnRRJwpr12UHqzrVY',
+          y: 'MMz4W9zzqlrJhqr-JyrpvlnaIIyZQE6DfrgPkxMAw1M'
         },
         384 => {
-          x: 'QTY1Q0MwQTcyMTY3MkJCQUIzODYwRTU3OUM4NjVCMTYzREExNjY4MUY2NTVEOTc4RjkxMTY2RUMzOUVDMzRDMUJEQjcyQUFCQTVGQUI2NDcyOERGMjgwMDVCNzA1NDZE',
-          y: 'OEIxMDczN0RGODY0RERGNzFCOTlFOEE5MThCOTJGNDAxMzQyQ0RFMzY2RTkwMkY3ODRFNTEzMUZBMjA1MDczMzhCRDE4RUM3QjA2NEU4QTRENEQzQjI5MkUzOTYyQkRC'
+          x: 'plzApyFnK7qzhg5XnIZbFj2hZoH2Vdl4-RFm7DnsNMG9tyqrpfq2RyjfKABbcFRt',
+          y: 'ixBzffhk3fcbmeipGLkvQBNCzeNm6QL3hOUTH6IFBzOL0Y7HsGTopNTTspLjlivb'
         },
         512 => {
-          x: 'MDFDMzAyMEZFNkI0NkJBQUU3MTNENEVGMEI0OThFQTg1RkMzMTk3NDYwRTU4REUyNERCRTFFMUNEQzEzOUI2OTAzRUEyQkEzQzdEMzNGN0ZDNzdGMTQ2MUVCRDBFODY5QUIzMTI3RTJCNjBGNjE5QTJFMUFDNkM4M0M0ODBCRDJBRkZG',
-          y: 'MDE0MkQ4MTFERjI1RjlCNTdGMDQ4REJDRjVBN0IzODUyMkQ5RDUxMEM1REE1QjYwMENGMTMyRjU4RUQ4QjZBNjFBRTFDMjVDQTYyQ0IzNTQzMzI5NUQ2QzAxQTdBNzIzODNBNEQ3MjBEOTI4NTZCNTU3NjYxMzc4RDM4OEExQkI4MjM2'
+          x: 'AcMCD-a0a6rnE9TvC0mOqF_DGXRg5Y3iTb4eHNwTm2kD6iujx9M_f8d_FGHr0OhpqzEn4rYPYZouGsbIPEgL0q__',
+          y: 'AULYEd8l-bV_BI289aezhSLZ1RDF2ltgDPEy9Y7YtqYa4cJcpiyzVDMpXWwBp6cjg6TXINkoVrVXZhN404ihu4I2'
         }
       }
     end
@@ -121,14 +121,12 @@ NrqoxoakrPo1NI1u+ET8oWGmnjB/nJFAPwIDAQAB
 
     context 'when ECDSA' do
       it do
-        expect do
-          JSON::JWK.decode(
-            kty: :EC,
-            crv: 'crv',
-            x: 'x',
-            y: 'y'
-          )
-        end.to raise_error NotImplementedError
+        JSON::JWK.decode(
+          kty: :EC,
+          crv: 'P-256',
+          x: 'MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4',
+          y: '4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM'
+        ).should be_instance_of OpenSSL::PKey::EC
       end
     end
 

data/spec/json/jwt_spec.rb

@@ -67,7 +67,7 @@ describe JSON::JWT do
 
       context 'when no signature nor public_key_or_secret given' do
         it do
-          jwt.verify(signature_base_string).should be_true
+          jwt.verify(signature_base_string).should == true
         end
       end
 

data/spec/spec_helper.rb

@@ -5,7 +5,14 @@ SimpleCov.start do
 end
 
 require 'rspec'
+require 'rspec/its'
 require 'json/jwt'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
 require 'helpers/sign_key_fixture_helper'
 require 'helpers/nimbus_spec_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0.alpha
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -114,14 +114,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  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'
 description: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption
   and JSON Web Key) in Ruby
 email:
@@ -178,12 +192,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and