ovpn-key 0.7 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b4b86d88cbfbac55deafa5ab94d8f306efa10c001e2107bfdb04ac29515969
-  data.tar.gz: bab07249832317c9281f055772f0f33ffeb8474be7200bf477b78e3481dea06b
+  metadata.gz: da769c59267c3c1bc605a2da314d55b0599e56de6e48dc25ef17ea56ed1af960
+  data.tar.gz: eb106210d91f8e5ba367d20d94e72e74f27e1a53a8abd3cf58cf61fc7580f0fb
 SHA512:
-  metadata.gz: b28955c734a4f52a445fd278a9de148c64ffc2ed67584364d9466d62ce110981779a8a43d90d3de4d573dd03f2d85a23972d289bcdd2093d2dfb89ac342b1eb9
-  data.tar.gz: a15d392159908b1d8f2a7a9a95e395ea3ebe875a3ca1df255ec0e622d42aa5e6cf6bef73bdd52ce2cfeac3b566ec1eded257e212a1ee1071d095d012515acb81
+  metadata.gz: 44b34a49e1730f3c9bff11022fa63e8cf1426c85a6f737c84b68cafa50be8c4e05110202d40dc1e1bfbfda36d29df02003b6ebd07c489fa21a76dcd8afea8d94
+  data.tar.gz: c4370cde04518bc151c64f2fb329718d68eed360080987807ed201103d55f999a84b0fcfd4d96634bc1124e96f419956b2c497046ab9bf957e55590e2882724c

data/bin/ovpn-key

@@ -13,35 +13,26 @@ options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename $0} <options> [--nopass]"
   opts.on("--init [directory]", "Init a CA directory (defaults to current)") do |v|
-    if v
-      options[:init] = v
-    else
-      options[:init] = "."
-    end
+    options[:init] = v ? v : "."
   end
   opts.on("--ca", "Generate a CA (ca.crt)") do |v|
     check_crt('ca')
     options[:generate_ca] = v
   end
   opts.on("--dh", "Generate a DH keyfile (dh.pem)") do |v|
+    # it's safe to rewrite this file
     options[:generate_dh] = v
   end
   opts.on("--server [name]", "Generate a server key (defaults to 'server')") do |v|
-    if v
-      options[:generate_server] = v
-    else
-      options[:generate_server] = "server"
-    end
+    options[:generate_server] = v ? v : "server"
     check_crt(options[:generate_server])
   end
   opts.on("--client [name]", "Generate a client key and sign it") do |v|
-    abort "Error: client should have an alphanumeric name" unless v
-    check_crt(v)
+    check_client(v)
     options[:generate_client] = v
   end
   opts.on("--zip    [name]", "Ditto plus pack it to ZIP with OpenVPN config") do |v|
-    abort "Error: client should have an alphanumeric name" unless v
-    check_crt(v)
+    check_client(v)
     options[:generate_zip] = v
   end
   opts.on("--revoke [name]", "Revoke a certificate (using crl.pem) and delete it") do |v|
@@ -81,6 +72,7 @@ elsif !File.exist? 'ovpn-key.yml'
   begin
     rc = YAML.load_file(File.expand_path '~/.ovpn-key.yml')
   rescue Errno::ENOENT
+    # no configuration file in home directory is not an error
   end
   Dir.chdir File.expand_path(rc['cd']) if rc && rc['cd']
 end
@@ -98,20 +90,18 @@ CN_CA    = settings['ca_name']  || 'Certification Authority'
 REQ      = settings['details']
 
 if options[:generate_ca]
-  genrsa('ca', 'ca', options[:no_password])
-  req('ca', 'ca', CN_CA)
+  gen_key('ca', 'ca', options[:no_password])
+  sign_key('ca', 'ca', CN_CA)
   gen_crl
 end
 if options[:generate_dh]
   exe "#{OPENSSL} dhparam -out dh.pem #{KEY_SIZE}"
 end
 if options[:generate_server]
-  genrsa('server', options[:generate_server], options[:no_password])
-  req('server', options[:generate_server], options[:generate_server])
+  gen_and_sign('server', options[:generate_server], options[:no_password])
 end
 if options[:generate_client]
-  genrsa('client', options[:generate_client], options[:no_password])
-  req('client', options[:generate_client], options[:generate_client])
+  gen_and_sign('client', options[:generate_client], options[:no_password])
 end
 if options[:generate_zip]
   ovpn_files = Dir['*.ovpn']
@@ -124,8 +114,7 @@ if options[:generate_zip]
     abort "More than one .ovpn files in current directory, aborting"
   end
 
-  genrsa('client', options[:generate_zip], options[:no_password])
-  req('client', options[:generate_zip], options[:generate_zip])
+  gen_and_sign('client', options[:generate_zip], options[:no_password])
 
   zip_file = File.join(File.expand_path(ZIP_DIR), "#{File.basename ovpn_file, '.ovpn'}.tblk.zip")
   File.delete(zip_file) if File.exist?(zip_file)

data/lib/functions.rb

@@ -4,11 +4,21 @@ def check_crt filename
   }
 end
 
+def check_client name
+  abort "Error: client should have an alphanumeric name" unless name
+  check_crt(name)
+end
+
 def exe cmd
   system(cmd) or abort "error executing: #{cmd}"
 end
 
-def genrsa type, certname, no_password
+def gen_and_sign type, certname, no_password
+  gen_key(type, certname, no_password)
+  sign_key(type, certname, certname)
+end
+
+def gen_key type, certname, no_password
   if no_password
     exe "#{OPENSSL} genrsa -out '#{certname}.key' #{KEY_SIZE} -config #{SSL_CONF} -extensions ext.#{type}"
   else
@@ -16,7 +26,7 @@ def genrsa type, certname, no_password
   end
 end
 
-def req type, certname, cn
+def sign_key type, certname, cn
   if certname == 'ca'
     exe "#{OPENSSL} req -new -x509 -key '#{certname}.key' -out '#{certname}.crt' -config #{SSL_CONF} -subj '/CN=#{cn}#{REQ}' -extensions ext.#{type}"
   else

data/lib/version.rb

@@ -1 +1 @@
-::Version = '0.7'
+::Version = '0.7.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ovpn-key
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: 0.7.1
 platform: ruby
 authors:
 - Vasily Korytov