omniauth-idcard 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9706d1ada842ba4b5a294b5d4e1b6dc59d0d5939
-  data.tar.gz: 741bc273f260e6aa50a1751bf309723231e5a0fd
+  metadata.gz: b6d5775a04d6025ad5c6a177fb2ffd17e938eb7b
+  data.tar.gz: 49c787e62f460df73fe2066afbaf6dcdbaa1b019
 SHA512:
-  metadata.gz: 2e7cad1d5b14fa96d215ccc11409ba5b3e1def243dedf722c374c39bd064824467885dd24603d3228c9a65e4964801a8d803b814060940e979987880fadcebb4
-  data.tar.gz: 4e0f7f7ac43b6e420f5558d3c1355f770160db58b3836fc5aed541de9821d87d0889fd4f63be197069f15d74226647a2c2e601e34ace4f613720ff071354f510
+  metadata.gz: 9c82c0a3df2bf69eea29dcce2d36d585ddef3c6400cf186b07e0f4591f2e0a11c030272800af5ff41d13c71f013eb90fe6001f55cdd80840ce6ad8269b9ac8e6
+  data.tar.gz: 20c5c25385826271e0b93af02dfb4dcfcbdf3b6eabe93a6bdad3a3f0677a62b48b2367ab1e17e8926119084bdc3537493368421aa2ab88ed00a758d58c993cdc

data/lib/omniauth-idcard/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Idcard
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/omniauth/strategies/idcard.rb

@@ -25,11 +25,13 @@ module OmniAuth
       end
 
       def request_phase
-        if @env[cert_variable] && @env[cert_variable] != ''
+        client_cert = @env[cert_variable]
+
+        if client_cert && client_cert != ''
           debug "Start authentication with ID-Card. Got certificate from request #{cert_variable}:"
-          debug @env[cert_variable]
+          debug client_cert
 
-          @user_data = parse_client_certificate(@env[cert_variable])
+          @user_data = parse_client_certificate(client_cert)
           @env['REQUEST_METHOD'] = 'GET'
           @env['omniauth.auth'] = info
           @env['PATH_INFO'] = "#{OmniAuth.config.path_prefix}/#{name}/callback"
@@ -56,7 +58,24 @@ module OmniAuth
       end
 
       def parse_client_certificate(data)
-        cert = OpenSSL::X509::Certificate.new(data)
+        cert_data = ''
+
+        # Try to avoid ASN1 parsing errors by concating PEM certificate again
+        data.split(' ').each_with_index do |line, index|
+          if line.index('-')
+            cert_data << "#{line}"
+
+            if line.end_with?('-')
+              cert_data << "\n"
+            else
+              cert_data << " "
+            end
+          else
+            cert_data << "#{line}\n"
+          end
+        end
+
+        cert = OpenSSL::X509::Certificate.new(cert_data)
 
         # from 2011-07-01 Common Name is encoded in UTF-8
         subject_dn = if cert.not_before.to_date >= Date.parse('2011-07-01')

data/spec/omniauth/strategies/idcard_spec.rb

@@ -5,28 +5,36 @@ 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    
+    end
 
     context 'UTF-8' do
       let(:ssl_client_cert) {'UTF8'}
-      
+
       it 'parses firstname' do
         @hash['GN'].should == 'ÜLLE'
       end
-    end    
+    end
+
+    context 'UTF-8' do
+      let(:ssl_client_cert) {'UTF8_asn1'}
+
+      it 'parses firstname' do
+        @hash['GN'].should == 'TARMO'
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-idcard
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tarmo Talu