omniauth-idcard 0.2.0 → 0.2.1

data/.gitignore

@@ -2,3 +2,7 @@
 .bundle
 Gemfile.lock
 pkg/*
+coverage/*
+tmp/*
+.DS_Store
+spec/certificates/*

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format nested

data/Gemfile

@@ -2,3 +2,11 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in omniauth-idcard.gemspec
 gemspec
+
+group :development, :test do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-bundler'
+  gem 'growl'
+  gem 'rb-fsevent'
+end

data/Guardfile

@@ -0,0 +1,10 @@
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch(/^.+\.gemspec/)
+end

data/Rakefile

@@ -1 +1,9 @@
+#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new

data/lib/omniauth-idcard/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Idcard
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/omniauth/strategies/idcard.rb

@@ -55,13 +55,19 @@ module OmniAuth
 
       def parse_client_certificate(data)
         cert = OpenSSL::X509::Certificate.new(data)
-        subject_dn = unescape(cert.subject.to_s).unpack("C*").pack("U*").scan(/./mu) {|s| s[0].chr }
-
+        
+        # from 2011-07-01 Common Name is encoded in UTF-8        
+        subject_dn = if cert.not_before.to_date >= Date.parse('2011-07-01')
+          unescape(cert.subject.to_s).force_encoding('UTF-8')
+        else
+          unescape(cert.subject.to_s).unpack("C*").pack("U*").scan(/./mu) {|s| s[0].chr }.gsub("\u0000", '')
+        end
+        
         debug "Subject DN: #{subject_dn}"
-
-        subject_dn.mb_chars.split('/').inject(Hash.new) do |memo, part|
+                
+        subject_dn.split('/').inject(Hash.new) do |memo, part|
           item = part.split('=')
-          memo[item.first.to_s] = item.last
+          memo[item.first.to_s] = item.last if item.last
           memo
         end
       end

data/omniauth-idcard.gemspec

@@ -19,4 +19,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'omniauth-oauth', '~> 1.0'
+  
+  s.add_development_dependency 'rspec', '~> 2.12.0'
+  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rack-test'  
 end

data/spec/omniauth/strategies/idcard_spec.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Idcard do
+  subject do
+    OmniAuth::Strategies::Idcard.new({})
+  end
+   
+  context '#parse_client_certificate' do
+    before do
+      @hash = subject.parse_client_certificate(File.read(File.join('spec', 'certificates', "#{ssl_client_cert}.pem")))
+    end
+    
+    let(:ssl_client_cert) { '' }
+    
+    context 'UCS2' do
+      let(:ssl_client_cert) {'UCS2'}
+      
+      it 'parses lastname' do
+        @hash['SN'].should == 'JÄRV'
+      end
+    end    
+
+    context 'UTF-8' do
+      let(:ssl_client_cert) {'UTF8'}
+      
+      it 'parses firstname' do
+        @hash['GN'].should == 'ÜLLE'
+      end
+    end    
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+require 'simplecov'
+SimpleCov.start
+require 'rspec'
+require 'rack/test'
+require 'webmock/rspec'
+require 'omniauth'
+require 'omniauth-oauth'
+require 'omniauth-idcard'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true    
+  
+  config.mock_with :rspec
+  config.include WebMock::API
+  config.include Rack::Test::Methods
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-idcard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth
@@ -27,6 +27,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OmniAuth strategy for Estonian ID-Card
 email:
 - tarmo.talu@gmail.com
@@ -35,12 +99,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
+- Guardfile
 - Rakefile
 - lib/omniauth-idcard.rb
 - lib/omniauth-idcard/version.rb
 - lib/omniauth/strategies/idcard.rb
 - omniauth-idcard.gemspec
+- spec/omniauth/strategies/idcard_spec.rb
+- spec/spec_helper.rb
 homepage: http://github.com/tarmotalu/omniauth-idcard
 licenses: []
 post_install_message: 
@@ -65,4 +133,6 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for Estonian ID-Card
-test_files: []
+test_files:
+- spec/omniauth/strategies/idcard_spec.rb
+- spec/spec_helper.rb