opentoken 1.2.1 → 1.2.2

data/.rvmrc

@@ -0,0 +1,5 @@
+rvm use 1.9.3-p0@opentoken --create
+if ! command -v bundle ; then
+  gem install bundler
+  bundle install --local
+fi

data/lib/opentoken.rb

@@ -39,7 +39,7 @@ module OpenToken
       mac << "0x01".hex.chr # OTK version
       mac << cipher.suite.chr
       mac << iv
-      mac << serialized
+      mac << force_encoding(serialized, 'BINARY')
       hash = OpenSSL::HMAC.digest(OpenToken::PasswordKeyGenerator::SHA1_DIGEST, key, mac.join)
 
       token_string = ""
@@ -114,7 +114,7 @@ module OpenToken
 
       unescaped_payload = CGI::unescapeHTML(unparsed_payload)
       puts 'UNESCAPED PAYLOAD', unescaped_payload if debug?
-      token = OpenToken::KeyValueSerializer.deserialize unescaped_payload
+      token = OpenToken::KeyValueSerializer.deserialize force_encoding(unescaped_payload, 'UTF-8')
       puts token.inspect if debug?
       token.validate!
       token
@@ -171,6 +171,9 @@ module OpenToken
         index += 1 
       end
     end
+    def force_encoding(string, encoding)
+      string.respond_to?(:force_encoding) ? string.force_encoding(encoding) : string
+    end
   end
 end
 

data/lib/opentoken/version.rb

@@ -1,3 +1,3 @@
 module OpenToken
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/test/test_opentoken.rb

@@ -85,4 +85,21 @@ class TestOpentoken < Test::Unit::TestCase
       end
     end
   end
+
+  context "encoding token with utf-8 values" do
+    setup do
+      OpenToken.password = "Password1"
+    end
+    context "with aes-128-cbc and subject attribute" do
+      setup do
+          @subject = OpenToken.send(:force_encoding, "Andr\xC3\xA9", 'UTF-8')
+          @attributesIn = { "subject" => @subject, "email" => "john@example.com"}
+          @token = OpenToken.encode @attributesIn, OpenToken::Cipher::AES_128_CBC
+      end
+      should "be decodable" do
+        @attributesOut = OpenToken.decode @token
+        assert_equal @attributesIn, @attributesOut
+      end
+    end
+  end
 end

metadata

@@ -1,112 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: opentoken
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 1.2.2
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 1
-  version: 1.2.1
 platform: ruby
-authors: 
+authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2174041000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
-  requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2174041000
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &2174040480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2174040480
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2174040000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 2
-        - 11
-        - 3
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.11.3
-  requirement: *id003
   type: :development
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2174040000
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &2174039520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.3.5
-  requirement: *id004
   type: :development
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2174039520
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2174039040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  requirement: *id005
   type: :development
+  prerelease: false
+  version_requirements: *2174039040
 description: parse opentoken properties passed for Single Signon requests
-email: 
+email:
 - ryan@socialcast.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .document
 - .gitignore
+- .rvmrc
 - CONTRIBUTORS.txt
 - Gemfile
 - LICENSE.txt
@@ -123,37 +92,34 @@ files:
 - test/test_opentoken.rb
 homepage: http://github.com/socialcast/opentoken
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3830787979922973573
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3830787979922973573
 requirements: []
-
 rubyforge_project: opentoken
-rubygems_version: 1.8.5
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: ruby implementation of the opentoken specification
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_opentoken.rb