From 4388be15d61db0b7de4331dd144d54912e047e6a Mon Sep 17 00:00:00 2001
From: Martin Lensment <mlensment@gmail.com>
Date: Fri, 24 Apr 2015 17:16:38 +0300
Subject: [PATCH] Better error on signing csr twice

---
 app/models/certificate.rb | 9 +++++++--
 config/locales/en.yml     | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/certificate.rb b/app/models/certificate.rb
index c55f0fe77..600a66710 100644
--- a/app/models/certificate.rb
+++ b/app/models/certificate.rb
@@ -55,11 +55,16 @@ class Certificate < ActiveRecord::Base
       self.crt = crt_file.read
       save!
     else
-      errors.add(:base, I18n.t('failed_to_create_certificate'))
       logger.error('FAILED TO CREATE CLIENT CERTIFICATE')
+      if err.match(/TXT_DB error number 2/)
+        errors.add(:base, I18n.t('failed_to_create_crt_csr_already_signed'))
+        logger.error('CSR ALREADY SIGNED')
+      else
+        errors.add(:base, I18n.t('failed_to_create_certificate'))
+      end
       logger.error(err)
       # rubocop:disable Rails/Output
-      puts "Certificate sign issue: #{err.inspect}" if Rails.env.test? 
+      puts "Certificate sign issue: #{err.inspect}" if Rails.env.test?
       # rubocop:enable Rails/Output
       return false
     end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dcaa69043..8fe589f77 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -732,3 +732,4 @@ en:
   you_have_a_new_invoice: 'You have a new invoice.'
   sincerely: 'Sincerely'
   expiry: 'Expiry'
+  failed_to_create_crt_csr_already_signed: 'Failed to create certificate: CSR is already signed'