zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 17:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Catch PKI errors

Browse source
This commit is contained in:
Martin Lensment 2015-05-25 11:50:00 +03:00
parent f6c7dd48db
commit 27a71f02a3
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/registrant/sessions_controller.rb
View file

@ -12,7 +12,8 @@ class Registrant::SessionsController < Devise::SessionsController
logger.error request.env['SSL_CLIENT_S_DN'] logger.error request.env['SSL_CLIENT_S_DN']
logger.error request.env['SSL_CLIENT_S_DN'].encoding logger.error request.env['SSL_CLIENT_S_DN'].encoding
@user = RegistrantUser.find_or_create_by_idc_data(request.env['SSL_CLIENT_S_DN']) logger.error request.env['SSL_CLIENT_I_DN_O']
@user = RegistrantUser.find_or_create_by_idc_data(request.env['SSL_CLIENT_S_DN'], request.env['SSL_CLIENT_I_DN_O'])
if @user if @user
sign_in(@user, event: :authentication) sign_in(@user, event: :authentication)
redirect_to registrant_root_url redirect_to registrant_root_url

2
app/models/api_user.rb
View file

@ -46,6 +46,7 @@ class ApiUser < User
end end
def registrar_pki_ok?(crt, cn) def registrar_pki_ok?(crt, cn)
return false if crt.blank? || cn.blank?
crt = crt.split(' ').join("\n") crt = crt.split(' ').join("\n")
crt.gsub!("-----BEGIN\nCERTIFICATE-----\n", "-----BEGIN CERTIFICATE-----\n") crt.gsub!("-----BEGIN\nCERTIFICATE-----\n", "-----BEGIN CERTIFICATE-----\n")
crt.gsub!("\n-----END\nCERTIFICATE-----", "\n-----END CERTIFICATE-----") crt.gsub!("\n-----END\nCERTIFICATE-----", "\n-----END CERTIFICATE-----")
@ -55,6 +56,7 @@ class ApiUser < User
end end
def api_pki_ok?(crt, cn) def api_pki_ok?(crt, cn)
return false if crt.blank? || cn.blank?
crt = crt.split(' ').join("\n") crt = crt.split(' ').join("\n")
crt.gsub!("-----BEGIN\nCERTIFICATE-----\n", "-----BEGIN CERTIFICATE-----\n") crt.gsub!("-----BEGIN\nCERTIFICATE-----\n", "-----BEGIN CERTIFICATE-----\n")
crt.gsub!("\n-----END\nCERTIFICATE-----", "\n-----END CERTIFICATE-----") crt.gsub!("\n-----END\nCERTIFICATE-----", "\n-----END CERTIFICATE-----")

3
app/models/registrant_user.rb
View file

@ -11,8 +11,9 @@ class RegistrantUser < User
end end
class << self class << self
def find_or_create_by_idc_data(idc_data) def find_or_create_by_idc_data(idc_data, issuer_organization)
return false if idc_data.blank? return false if idc_data.blank?
return false if issuer_organization != 'AS Sertifitseerimiskeskus'
idc_data.force_encoding('UTF-8') idc_data.force_encoding('UTF-8')
logger.error(idc_data) logger.error(idc_data)