easyrsa 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5ada16ef5223870d38d2ba6f8b15382cd4d414
-  data.tar.gz: a2448c4fb8ff79e0df015526ccfa19d961889bb9
+  metadata.gz: 1c2db93736f5e5d6b66ed2fab4e7f35645ea795c
+  data.tar.gz: 08f19e69d1f991a99c1e719083c3149e7d506b6d
 SHA512:
-  metadata.gz: 1d2dc6f51ba0bf59b91db99b3be88c6184235e60054ca252f93fec025e038518d2ff625e00228e94869a8636357c1d31c588bf4d636014afeb91a5d3d69181f0
-  data.tar.gz: 200eef4408acd610ce92ba2773530878b4d3d8a12dc41d87a1bab7a39bc3aa82bb43fb6864f744f709d6830b9710d22c86cd5464222b1ebe6fc71cc47016acf6
+  metadata.gz: 0f5816c6d68b7fd88095fb7058a70b8e413a023bd9873aff5bee79bf279318fe021ecb3072c1da3de8b5df70d78eb4bd47eb7224487fd89cf104525c89e7a8ef
+  data.tar.gz: 50ad779ab439ac14fd075f28706359878736a40de52ce030591ce4510666e205723a83d6191def02cf5d111f1a1ff7bd12509a1f1d56c1da0687749fb5fa1639

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
 /vendor/
 Gemfile.lock
-*.gem
+*.gem
+.idea*

data/Makefile

@@ -0,0 +1,21 @@
+GEM := $(shell which gem)
+BUNDLE := $(shell which bundle)
+
+all: clear build push
+
+clear:
+	rm -rf *.gem
+
+init:
+	$(BUNDLE) install --path=vendor/bundle
+
+build:
+	$(GEM) build easyrsa.gemspec
+
+push: build
+	$(GEM) push *.gem
+
+test:
+	$(BUNDLE) exec rake test
+
+gem: test build push

data/README.md

@@ -36,8 +36,10 @@ First, set your issuer configuration like so:
 ```ruby
 EasyRSA.configure do |issuer|
   issuer.email = 'support@company.com'
+  issuer.name = 'MrKickass'
   issuer.server = 'vpnserver.company.com'
   issuer.country = 'US'
+  issuer.state = 'NY'
   issuer.city = 'New York'
   issuer.company = 'My Company'
   issuer.orgunit = 'IT'
@@ -92,4 +94,4 @@ easyrsa = EasyRSA::DH.new
 g = easyrsa.generate
 puts g
  #=> -----BEGIN DH PARAMETERS-----
-```
+```

data/Rakefile

@@ -1,5 +1,5 @@
 #encoding: utf-8 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 task default: :test

data/easyrsa.gemspec

@@ -8,17 +8,17 @@ Gem::Specification.new do |s|
 
   s.name        = 'easyrsa'
   s.version     = EasyRSA::VERSION
-  s.date        = '2015-04-29'
-  s.summary     = "EasyRSA interface for generating OpenVPN certificates"
-  s.description = "Easily generate OpenVPN certificates without needing the easyrsa packaged scripts"
-  s.authors     = ["Mike Mackintosh"]
+  s.date        = Time.now.to_s.split(' ').first
+  s.summary     = 'EasyRSA interface for generating OpenVPN certificates'
+  s.description = 'Easily generate OpenVPN certificates without needing the easyrsa packaged scripts'
+  s.authors     = ['Mike Mackintosh']
   s.email       = 'm@zyp.io'
   s.homepage    =
     'http://github.com/mikemackintosh/ruby-easyrsa'
 
   s.license       = 'MIT'
   
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
   s.files         = `git ls-files -z`.split("\x0")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'paint'
   s.add_dependency 'methadone'
 
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
 end

data/lib/easyrsa.rb

@@ -33,16 +33,22 @@ module EasyRSA
 
 # Helper for issuer details
   def gen_issuer
-    OpenSSL::X509::Name.parse("/C=#{EasyRSA::Config.country}/" \
-      "L=#{EasyRSA::Config.city}/O=#{EasyRSA::Config.company}/OU=#{EasyRSA::Config.orgunit}/" \
-      "CN=#{EasyRSA::Config.server}/" \
-      "emailAddress=#{EasyRSA::Config.email}")
+    name = "/C=#{EasyRSA::Config.country}"
+    name += "/ST=#{EasyRSA::Config.state}" unless !EasyRSA::Config.state || EasyRSA::Config.state.empty?
+    name += "/L=#{EasyRSA::Config.city}"
+    name += "/O=#{EasyRSA::Config.company}"
+    name += "/OU=#{EasyRSA::Config.orgunit}"
+    name += "/CN=#{EasyRSA::Config.server}"
+    name += "/name=#{EasyRSA::Config.name}" unless !EasyRSA::Config.name || EasyRSA::Config.name.empty?
+    name += "/emailAddress=#{EasyRSA::Config.email}"
+
+    OpenSSL::X509::Name.parse(name)
   end
 
 # Helper for generating serials
   def gen_serial(id)
     # Must always be unique, so we do date and id's chars
-    "#{Time.now.strftime("%Y%m%d%H%M%S")}#{id.unpack('c*').join.to_i}".to_i
+    "#{Time.now.strftime('%Y%m%d%H%M%S')}#{id.unpack('c*').join.to_i}".to_i
   end
 
 end

data/lib/easyrsa/ca.rb

@@ -69,10 +69,17 @@ module EasyRSA
 
     # Cert issuer details
       def gen_issuer
-        @ca_cert.issuer = OpenSSL::X509::Name.parse("/C=#{EasyRSA::Config.country}/" \
-          "L=#{EasyRSA::Config.city}/O=#{EasyRSA::Config.company}/OU=#{EasyRSA::Config.orgunit}/" \
-          "CN=#{EasyRSA::Config.server}/name=#{EasyRSA::Config.orgunit}/" \
-          "emailAddress=#{EasyRSA::Config.email}")
+        name = "/C=#{EasyRSA::Config.country}"
+        name += "/ST=#{EasyRSA::Config.state}" unless !EasyRSA::Config.state || EasyRSA::Config.state.empty?
+        name += "/L=#{EasyRSA::Config.city}"
+        name += "/O=#{EasyRSA::Config.company}"
+        name += "/OU=#{EasyRSA::Config.orgunit}"
+        name += "/CN=#{EasyRSA::Config.server}"
+        name += "/name=#{EasyRSA::Config.name}" unless !EasyRSA::Config.name || EasyRSA::Config.name.empty?
+        name += "/name=#{EasyRSA::Config.orgunit}" if !EasyRSA::Config.name || EasyRSA::Config.name.empty?
+        name += "/emailAddress=#{EasyRSA::Config.email}"
+
+        @ca_cert.issuer = OpenSSL::X509::Name.parse(name)
       end
 
     # Add Extensions needed
@@ -93,4 +100,4 @@ module EasyRSA
       end
 
   end
-end
+end

data/lib/easyrsa/certificate.rb

@@ -103,9 +103,16 @@ module EasyRSA
 
       # Cert subject for End-User
       def gen_subject
-        @cert.subject = OpenSSL::X509::Name.parse("/C=#{EasyRSA::Config.country}/" \
-          "L=#{EasyRSA::Config.city}/O=#{EasyRSA::Config.company}/OU=#{EasyRSA::Config.orgunit}/CN=#{@id}/" \
-          "emailAddress=#{@email}")
+        subject_name = "/C=#{EasyRSA::Config.country}"
+        subject_name += "/ST=#{EasyRSA::Config.state}" unless !EasyRSA::Config.state || EasyRSA::Config.state.empty?
+        subject_name += "/L=#{EasyRSA::Config.city}"
+        subject_name += "/O=#{EasyRSA::Config.company}"
+        subject_name += "/OU=#{EasyRSA::Config.orgunit}"
+        subject_name += "/CN=#{@id}"
+        subject_name += "/name=#{EasyRSA::Config.name}" unless !EasyRSA::Config.name || EasyRSA::Config.name.empty?
+        subject_name += "/emailAddress=#{@email}"
+
+        @cert.subject = OpenSSL::X509::Name.parse(subject_name)
       end
 
       def add_extensions

data/lib/easyrsa/config.rb

@@ -5,7 +5,7 @@ module EasyRSA
     
     extend self
 
-    attr_accessor :email, :server, :country, :city, :company, :orgunit
+    attr_accessor :email, :server, :country, :city, :company, :orgunit, :name, :state
 
     # Configure easyrsa from a hash. This is usually called after parsing a
     # yaml config file such as easyrsa.yaml.
@@ -34,4 +34,4 @@ module EasyRSA
       end
     end
   end
-end
+end

data/lib/easyrsa/version.rb

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

data/spec/easyrsa/01_config_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe EasyRSA::Config, 'Should' do
-  include_context "shared environment"
+  include_context 'shared environment'
 
   it 'should throw error when missing required configure parameters' do
 

data/spec/easyrsa/02_certificate_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe EasyRSA::Certificate, 'Should' do
-  include_context "shared environment"
+  include_context 'shared environment'
 
   before do
     EasyRSA.configure do |issuer|
@@ -73,11 +73,11 @@ 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
@@ -102,7 +102,7 @@ KEY
     g = easyrsa.generate
 
     expect(g[:key]).to include('BEGIN RSA PRIVATE KEY')
-    expect(g[:crt]).to include('BEGIN CERTIFICATE')    
+    expect(g[:crt]).to include('BEGIN CERTIFICATE')
 
   end
 
@@ -116,7 +116,7 @@ KEY
     end
 
     expect(g[:key]).to include('BEGIN RSA PRIVATE KEY')
-    expect(g[:crt]).to include('BEGIN CERTIFICATE')    
+    expect(g[:crt]).to include('BEGIN CERTIFICATE')
 
   end
 
@@ -125,9 +125,32 @@ KEY
     g = easyrsa.generate
     r = OpenSSL::X509::Certificate.new g[:crt]
     expect("#{r.serial}").to include("#{Time.now.year}")
-  end  
+  end
 
-end
+  before do
+    EasyRSA.configure do |issuer|
+      issuer.email = @email
+      issuer.server = @server
+      issuer.country = @country
+      issuer.state = @state
+      issuer.city = @city
+      issuer.company = @company
+      issuer.name = @name
+    end
+  end
+
+  it 'should allow optional state' do
+    easyrsa = EasyRSA::Certificate.new(@ca_cert, @ca_key, 'mike', 'mike@ruby-easyrsa.gem')
+    g = easyrsa.generate
+    r = OpenSSL::X509::Certificate.new g[:crt]
+    expect(r.subject.to_s).to include(@state)
+  end
 
-@client_id = "sexyhorse"
-    @client_email = "sexyhorse@zyp.io"
+  it 'should allow optional name' do
+    easyrsa = EasyRSA::Certificate.new(@ca_cert, @ca_key, 'mike', 'mike@ruby-easyrsa.gem')
+    g = easyrsa.generate
+    r = OpenSSL::X509::Certificate.new g[:crt]
+    expect(r.subject.to_s).to include(@name)
+  end
+
+end

data/spec/easyrsa/03_ca_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe EasyRSA::CA, 'Should' do
-  include_context "shared environment"
+  include_context 'shared environment'
 
   before do
     EasyRSA.configure do |issuer|
@@ -31,14 +31,14 @@ describe EasyRSA::CA, 'Should' do
   it 'throw error when bit length is too weak' do
 
     expect {
-      EasyRSA::CA.new("CN=ca/DC=example", 512)
+      EasyRSA::CA.new('CN=ca/DC=example', 512)
     }.to raise_error(EasyRSA::CA::BitLengthToWeak)
 
   end
 
   it 'return keys successfully' do
 
-    easyrsa = EasyRSA::CA.new("CN=ca/DC=example")
+    easyrsa = EasyRSA::CA.new('CN=ca/DC=example')
     g = easyrsa.generate
 
     expect(g[:key]).to include('BEGIN RSA PRIVATE KEY')

data/spec/easyrsa/04_revocation_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), '..', 'spec_helper')
 
 describe EasyRSA::Revoke, 'Should' do
-  include_context "shared environment"
+  include_context 'shared environment'
 
   before do
     EasyRSA.configure do |issuer|

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'easyrsa')
 # Create the share API context
 # so we can pass stuff between
 # the different tests
-RSpec.shared_context "shared environment", :a => :b do
+RSpec.shared_context 'shared environment', :a => :b do
 
   before(:all) do
 
@@ -13,15 +13,17 @@ RSpec.shared_context "shared environment", :a => :b do
     @server = 'easyrsa-gem-test'
     @country = 'US'
     @city = 'New York'
+    @state = 'New York'
     @company = 'Mike Mackintosh'
     @orgunit = 'EasyRSA Gem Test'
+    @name = 'Your mom'
 
     @ca_key = File.join(File.dirname(__FILE__), 'cakey.pem')
     @ca_key_pass = 'aaaa'
     @ca_cert = File.join(File.dirname(__FILE__), 'cacert.pem')
 
-    @client_id = "sexyhorse"
-    @client_email = "sexyhorse@zyp.io"
+    @client_id = 'sexyhorse'
+    @client_email = 'sexyhorse@zyp.io'
 
   end
 
@@ -33,4 +35,4 @@ end
     config.color = true
     config.formatter = :documentation
   end
-#end
+#end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easyrsa
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - Mike Mackintosh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-29 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -88,9 +88,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rock.yml
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - easyrsa.gemspec

data/.rock.yml

@@ -1,5 +0,0 @@
-runtime: ruby21
-build_gem: |
-  rm -rf *.gem
-  gem build easyrsa.gemspec
-  gem push *.gem