easyrsa 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f50650da31006752f7576b6a88f5dfc81bad51
-  data.tar.gz: 3bf1c9fcc5a2990421bba0d946ef27362966a8d5
+  metadata.gz: 24a09b13312931ca57653b0a7329b2a12ceca314
+  data.tar.gz: 9698fee089060bdb3573c2673b237960ae650187
 SHA512:
-  metadata.gz: 56d791565ebcf487aaedd3c60c28e568b5f306b71ed21987cb87e210d232f39061be0093d1a32222c1d4f8750be55aa57bc006b3e4309d8619b8274853686fd2
-  data.tar.gz: ce70a1553c80fb0b8bcbb35cb4d6b16667206d3c075ae2dc4facdce2f6d40ca80394278d895e31f6d4464a3973f09dd31d7b529e7fe4ff3938aed30ef89df3c8
+  metadata.gz: 9f93737435287cae5065f7b3d497e36a37e09f1ab7e5886ed4d17119ec7d29f3833f7f2d732e6a0ff6a6229bdcc328e97ba4c0cac1edbe3f4a29c0483a12a847
+  data.tar.gz: 59547ffbf6d306bc9184454bfe8fea06afd90e30b0c567c0a1f6bc715ddd49088cd0065f38000f8367c1c5b96afe56ff95e599a954d3e91ba2c1b8d122de10f1

data/lib/easyrsa/certificate.rb

@@ -22,21 +22,36 @@ module EasyRSA
       end
       @email = email
 
-      # Validate the existence of the ca_cert file
-      unless File.exist? ca_crt
-        raise EasyRSA::Certificate::UnableToReadCACert,
-          "Certificate Authority Certificate does not exist or is not readable: '#{ca_crt}'. " +
-          "Please check it's existence and permissions"
+    # Get cert details if it's in a file
+      unless ca_crt.is_a? OpenSSL::X509::Certificate
+        if ca_crt.include?('BEGIN CERTIFICATE')
+          ca_crt = OpenSSL::X509::Certificate.new ca_crt
+        else
+          begin
+            ca_crt = OpenSSL::X509::Certificate.new File.read ca_crt
+          rescue
+            fail EasyRSA::Certificate::UnableToReadCACert,
+              'Invalid CA Certificate.'
+          end
+        end        
       end
-      @ca_cert = OpenSSL::X509::Certificate.new File.read ca_crt
-
-      # Validate the existence of the ca_key file
-      unless File.exist? ca_key
-        raise EasyRSA::Certificate::UnableToReadCAKey,
-          "Certificate Authority Key does not exist or is not readable: '#{ca_key}'. " +
-          "Please check it's existence and permissions"
+      @ca_cert = ca_crt      
+
+    # Get cert details if it's in a file
+      unless ca_key.is_a? OpenSSL::PKey::RSA
+        if ca_key.include?('BEGIN RSA PRIVATE KEY')
+          ca_key = OpenSSL::PKey::RSA.new ca_key
+        else
+          begin
+            ca_key = OpenSSL::PKey::RSA.new File.read ca_key
+          rescue
+            fail EasyRSA::Certificate::UnableToReadCAKey,
+              'This is not a valid CA Private key file.'
+          end
+        end
       end
-      @ca_key = OpenSSL::PKey::RSA.new File.read ca_key
+      @ca_key = ca_key
+
       
       # Generate Private Key and new Certificate
       if bits < 2048

data/lib/easyrsa/version.rb

@@ -1,3 +1,3 @@
 module EasyRSA
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/easyrsa/02_certificate_spec.rb

@@ -31,10 +31,60 @@ describe EasyRSA::Certificate, 'Should' do
   end
 
   it 'throw error when invalid ca key is passed' do
+    cert = <<CERTIFICATE
+-----BEGIN CERTIFICATE-----
+MIIC4TCCAkqgAwIBAgIJANYWnRgYyYmsMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
+BAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazEYMBYGA1UEChMPTWlrZSBNYWNraW50
+b3NoMRkwFwYDVQQLExBSdWJ5IEVhc3lSU0EgR2VtMB4XDTE1MDQwODAzMjYxOVoX
+DTI1MDQwNTAzMjYxOVowVTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3Jr
+MRgwFgYDVQQKEw9NaWtlIE1hY2tpbnRvc2gxGTAXBgNVBAsTEFJ1YnkgRWFzeVJT
+QSBHZW0wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANN0bDqnyWMKNsLgC9Sf
+QW/3mZHrAnuptkYaGcj3b3MHqVbtijYyCD9EtbSsFKftFjJeXNJiRQuWTvEfGl2C
+c8wZMDfrA19TpXyfeLYOFfnZb1U3TK1a6tDvrHjbhhiPAQDTfS1mr9bgeac40EiJ
+kYtptF4vcphyCOUC2QOi/nhZAgMBAAGjgbgwgbUwHQYDVR0OBBYEFAJpK6ilbgsM
+NM38fl/HSlCBr9njMIGFBgNVHSMEfjB8gBQCaSuopW4LDDTN/H5fx0pQga/Z46FZ
+pFcwVTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMRgwFgYDVQQKEw9N
+aWtlIE1hY2tpbnRvc2gxGTAXBgNVBAsTEFJ1YnkgRWFzeVJTQSBHZW2CCQDWFp0Y
+GMmJrDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHOVU2vP1a+E/DOf
+Jy0UUTuK5hPO1IaT1byN5rWaTFRftpHLsFLnZLTeJkXKd7IcYkwvRFYmUHDHlm7O
+4WQiErwmstW967IZbCuUoYKYBEtFlGGzoy2tHdhPVCT8egjqQMs99HaMObNa3kgh
+UMxNUqagZQTruqWTDUOXycX/7QXA
+-----END CERTIFICATE-----
+CERTIFICATE
+
+    key = <<KEY
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDTdGw6p8ljCjbC4AvUn0Fv95mR6wJ7qbZGGhnI929zB6lW7Yo2
+Mgg/RLW0rBSn7RYyXlzSYkULlk7xHxpdgnPMGTA36wNfU6V8n3i2DhX52W9VN0yt
+WurQ76x424YYjwEA030tZq/W4HmnONBIiZGLabReL3KYcgjlAtkDov54WQIDAQAB
+AoGAB6c7E5RnEZKZEMyTIQryj17izAk5echWtIrVTBTIj91DH8ZRLkz5R3DxMqzX
+wowuNXx815B+90BlcwyxI5lJH5Ug5ClUDUhATsrLEnGR+Eg5NLG5K4oXgnQUGTN7
+t7MKVUTzRWPc8p9V9Z7asIOMXax+cyaEGVixz9JJfYP8pEECQQDuleHAjZtWA/X/
+UhOY3RjYdSSsb5MkDtpPo5WovAgH/7Ek6hx90/FKw5YynGTeskqDvlXlLEMKT1Cl
+9s05kCq1AkEA4uOWQAWsNuA54SMMJ+cWTF1h30a7wD5VNmx5C2e5dRX/5Oknc512
+m0Ky0zpu3bfWLL8+lJvTYHoQQD/p10hJlQJBAOptlUvJGGeVLsK4WA8suDwAJo/U
+dgTJH1N/Tg9k6pNJdzrpWiN8/CtVMSD7sNVs5HC8tdOgASOBOaJJde9oq70CQGp/
+fUUr5HwVn9VniAsq0zKhGpGdN/+ywni7Tc3msAyfeO/P6O7B2KxkEGBJq0RzSBrU
+4eELi5pbcUlXNsIQckkCQCVQSfWFNkgax/tHFSALdOUkZl+Gy84bGmXPgw4TzQTr
+49egzjRvMks+Ej0vO1m8+Zff+9s8qPpeiQI78aY4VLI=
+-----END RSA PRIVATE KEY-----
+KEY
 
     expect {
       EasyRSA::Certificate.new('ca.crt', 'ca.key', 'blah', 'blah@blah')
     }.to raise_error(EasyRSA::Certificate::UnableToReadCACert)
+    
+    expect {
+      EasyRSA::Certificate.new(cert, 'ca.key', 'blah', 'blah@blah')
+    }.to raise_error(EasyRSA::Certificate::UnableToReadCAKey)
+    
+    expect {
+      EasyRSA::Certificate.new(cert, key, 'blah', 'blah@blah')
+    }.to_not raise_error
+
+    expect {
+      EasyRSA::Certificate.new(cert, @ca_key, 'blah', 'blah@blah')
+    }.to_not raise_error
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easyrsa
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Mike Mackintosh