easyrsa 0.9.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2db93736f5e5d6b66ed2fab4e7f35645ea795c
-  data.tar.gz: 08f19e69d1f991a99c1e719083c3149e7d506b6d
+  metadata.gz: 43e7206caedd0fc9b919c8a1ab79cf204a1b7b56
+  data.tar.gz: 1715cb46938f410c6e4dc3af2daf75963af01182
 SHA512:
-  metadata.gz: 0f5816c6d68b7fd88095fb7058a70b8e413a023bd9873aff5bee79bf279318fe021ecb3072c1da3de8b5df70d78eb4bd47eb7224487fd89cf104525c89e7a8ef
-  data.tar.gz: 50ad779ab439ac14fd075f28706359878736a40de52ce030591ce4510666e205723a83d6191def02cf5d111f1a1ff7bd12509a1f1d56c1da0687749fb5fa1639
+  metadata.gz: 661f27d18e2a947a8080ac64599103b497681e0c37953847068a9113af74b8429e464b27c5bac1d6cec49a22c649c627616ce19b654f7c47ff2694ae996d3820
+  data.tar.gz: 2e43c53b50b501a65b26588a276683042a8fdf021adc46d211ba4edf3ad7f1c3fb27410aa31ed0261203520425d79fe4e3011e934a1707743ccc3da1f199d273

data/README.md

@@ -95,3 +95,10 @@ g = easyrsa.generate
 puts g
  #=> -----BEGIN DH PARAMETERS-----
 ```
+
+## Credits
+
+Many thanks to:
+
+  - [@chapmajs](https://github.com/chapmajs)
+  - [@esaari](https://github.com/esaari)

data/lib/easyrsa/certificate.rb

@@ -1,24 +1,33 @@
 module EasyRSA
   class Certificate
 
+    Client = 1
+    Server = 2
+
     class UnableToReadCACert < RuntimeError ; end
     class UnableToReadCAKey < RuntimeError ; end
     class BitLengthToWeak < RuntimeError ; end
+    class InvalidCertType < RuntimeError ; end
     class MissingParameter < RuntimeError ; end
 
-    def initialize(ca_crt, ca_key, id=nil, email=nil, bits=4096, &block)
+    def initialize(ca_crt, ca_key, id=nil, email=nil, bits=4096, certtype=EasyRSA::Certificate::Client, &block)
+      if certtype < 1 || certtype > 2
+        raise EasyRSA::Certificate::InvalidCertType,
+          "Please provide a valid Cert Type, either Client or Server"
+      end
+      @certtype = certtype
 
       # ID to generate cert for
       if id.eql? nil
         raise EasyRSA::Certificate::MissingParameter,
-          "Please provide an 'id', also known as a subject, for the certificates' CN field."
+          "Please provide an 'id', also known as a subject, for the certificates' CN field"
       end
       @id = id
 
        # ID to generate cert for
       if email.eql? nil
         raise EasyRSA::Certificate::MissingParameter,
-          "Please provide an 'email', also known as a subject, for the certificates' emailAddress field."
+          "Please provide an 'email', also known as a subject, for the certificates' emailAddress field"
       end
       @email = email
 
@@ -33,9 +42,9 @@ module EasyRSA
             fail EasyRSA::Certificate::UnableToReadCACert,
               'Invalid CA Certificate.'
           end
-        end        
+        end
       end
-      @ca_cert = ca_crt      
+      @ca_cert = ca_crt
 
     # Get cert details if it's in a file
       unless ca_key.is_a? OpenSSL::PKey::RSA
@@ -52,12 +61,12 @@ module EasyRSA
       end
       @ca_key = ca_key
 
-      
+
       # Generate Private Key and new Certificate
       if bits < 2048
         raise EasyRSA::Certificate::BitLengthToWeak,
           "Please select a bit length greater than 2048. Default is 4096. You chose '#{bits}'"
-      end      
+      end
       @key = OpenSSL::PKey::RSA.new(bits)
 
       # Instantiate a new certificate
@@ -67,13 +76,13 @@ module EasyRSA
       @cert.not_before = Time.now
 
       # Set it to version
-      @cert.version = 2     
+      @cert.version = 2
 
       instance_eval(&block) if block_given?
     end
 
-    def generate(validfor=10)
-  
+    def generate(type=Client,validfor=10)
+
       # Set the expiration date
       @cert.not_after = EasyRSA::years_from_now(validfor)
 
@@ -82,7 +91,7 @@ module EasyRSA
 
       # Generate and assign the serial
       @cert.serial = EasyRSA::gen_serial(@id)
-      
+
       # Generate issuer
       @cert.issuer = EasyRSA::gen_issuer
 
@@ -99,6 +108,15 @@ module EasyRSA
 
     end
 
+    def get_extensions
+      extensions = Hash.new
+      cert = OpenSSL::X509::Certificate.new @cert.to_pem
+      cert.extensions.each do |ext|
+        extensions[ext.oid] = ext.value
+      end
+      extensions
+    end
+
     private
 
       # Cert subject for End-User
@@ -122,13 +140,19 @@ module EasyRSA
 
         @cert.extensions = [
           ef.create_extension('basicConstraints', 'CA:FALSE'),
-          ef.create_extension('nsCertType', 'client, objsign'),
-          ef.create_extension('nsComment', 'Easy-RSA Generated Certificate'),
           ef.create_extension('subjectKeyIdentifier', 'hash'),
           ef.create_extension('extendedKeyUsage', 'clientAuth'),
           ef.create_extension('keyUsage', 'digitalSignature')
         ]
 
+        if @certtype.eql? EasyRSA::Certificate::Client
+          @cert.add_extension ef.create_extension('nsComment', 'Easy-RSA Generated Certificate')
+          @cert.add_extension ef.create_extension('nsCertType', 'client, objsign')
+        elsif @certtype.eql? EasyRSA::Certificate::Server
+          @cert.add_extension ef.create_extension('nsComment', 'Easy-RSA Generated Server Certificate')
+          @cert.add_extension ef.create_extension('nsCertType', 'server')
+        end
+
         @cert.add_extension ef.create_extension('authorityKeyIdentifier',
                                                 'keyid,issuer:always')
       end

data/lib/easyrsa/version.rb

@@ -1,3 +1,3 @@
 module EasyRSA
-  VERSION = '0.9.6'
+  VERSION = '1.0.0'
 end

data/spec/easyrsa/02_certificate_spec.rb

@@ -153,4 +153,18 @@ KEY
     expect(r.subject.to_s).to include(@name)
   end
 
+  it 'should be a client cert by default' do
+    easyrsa = EasyRSA::Certificate.new(@ca_cert, @ca_key, 'mike', 'mike@ruby-easyrsa.gem')
+    easyrsa.generate
+    r = easyrsa.get_extensions
+    expect(r['nsCertType']).to include("SSL Client, Object Signing")
+  end
+
+  it 'should be a server certificate if set' do
+    easyrsa = EasyRSA::Certificate.new(@ca_cert, @ca_key, 'mike', 'mike@ruby-easyrsa.gem', 2048, EasyRSA::Certificate::Server)
+    easyrsa.generate
+    r = easyrsa.get_extensions
+    expect(r['nsCertType']).to include("SSL Server")
+  end
+
 end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: easyrsa
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Mike Mackintosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Easily generate OpenVPN certificates without needing the easyrsa packaged
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - Makefile
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: EasyRSA interface for generating OpenVPN certificates