ovpn-key 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f60d05d50c8ac0dadbeb3d66c42dd89aba6bb8135e52492d1f01762a5a6610d1
-  data.tar.gz: 82a7b940a2b9fa42aead55809a7dcf98cc2a08645b64a0280ad3a630226edffb
+  metadata.gz: 75b4b86d88cbfbac55deafa5ab94d8f306efa10c001e2107bfdb04ac29515969
+  data.tar.gz: bab07249832317c9281f055772f0f33ffeb8474be7200bf477b78e3481dea06b
 SHA512:
-  metadata.gz: ee193d03bddcf4516ee3f7b53029a87ab4c8369263402337ac2282f73eb4d3a7ec75a155717b3bf28ad3e552137921bff18ce7dc685f548fa5dffd09e2fbb6b1
-  data.tar.gz: bea13e65fcdbcb99e707d65917161daa17e205009f7e3719ab8bcfaaf701e514fcf2f7d0e4ce99883d9e33d2bd55463f4299cf59186abd299a75b7bf60fa73df
+  metadata.gz: b28955c734a4f52a445fd278a9de148c64ffc2ed67584364d9466d62ce110981779a8a43d90d3de4d573dd03f2d85a23972d289bcdd2093d2dfb89ac342b1eb9
+  data.tar.gz: a15d392159908b1d8f2a7a9a95e395ea3ebe875a3ca1df255ec0e622d42aa5e6cf6bef73bdd52ce2cfeac3b566ec1eded257e212a1ee1071d095d012515acb81

data/README.md

@@ -12,6 +12,8 @@ It supports encrypting `.key` files with a passphrase (there is an option to dis
 
 It can be used with a non-self signed CA, just place your `ca.key` and `ca.crt` in the keys directory and skip the `--ca` step.
 
+It can be used to manage a non-OpenVPN CA, in that case `--zip` step will be useless, but all others will work.
+
 For now it should be considered experimental and rather undocumented.  
 If you're brave, [let me know](https://github.com/chillum/ovpn-key/issues), where the problems are.
 
@@ -25,10 +27,11 @@ If you're brave, [let me know](https://github.com/chillum/ovpn-key/issues), wher
 1. `ovpn-key --init`
 2. edit `ovpn-key.yml` and `openssl.ini`
 3. `ovpn-key --ca --dh --server --nopass`
-4. add a file with `.ovpn` extension to the directory  
+4. `ovpn-key --client somebody`
+5. `ovpn-key --revoke somebody`
+6. add a file with `.ovpn` extension to the directory  
    it should contain every setting except for `cert` and `key`
-5. `ovpn-key --client somebody`
-6. `ovpn-key --revoke somebody`
+7. `ovpn-key --zip somebody-else`
 
 ### Configuration
 

data/bin/ovpn-key

@@ -34,11 +34,16 @@ OptionParser.new do |opts|
     end
     check_crt(options[:generate_server])
   end
-  opts.on("--client [name]", "Generate a client key and pack it to ZIP") do |v|
+  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)
     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)
+    options[:generate_zip] = v
+  end
   opts.on("--revoke [name]", "Revoke a certificate (using crl.pem) and delete it") do |v|
     abort "Please specify what certificate to revoke" unless v
     options[:revoke] = v
@@ -50,10 +55,14 @@ end.parse!
 if ARGV.length > 0
   abort "Error: invalid args: #{ARGV.join ' '}\nSee `#{File.basename $0} -h` for help"
 end
-unless options[:init] || options[:generate_ca] || options[:generate_dh] \
-  || options[:generate_server] || options[:generate_client] || options[:revoke]
+unless options[:init] || options[:generate_ca] || options[:generate_dh] || options[:generate_server] \
+  || options[:generate_client] || options[:generate_zip] || options[:revoke]
   abort "See `#{File.basename $0} -h` for usage"
 end
+if options[:generate_client] and options[:generate_zip]
+  # I assume that user likely wants one of them and is confused with usage
+  abort "There can be only one: --client or --zip"
+end
 File.umask 0077
 
 if options[:init]
@@ -101,6 +110,10 @@ if options[:generate_server]
   req('server', options[:generate_server], options[:generate_server])
 end
 if options[:generate_client]
+  genrsa('client', options[:generate_client], options[:no_password])
+  req('client', options[:generate_client], options[:generate_client])
+end
+if options[:generate_zip]
   ovpn_files = Dir['*.ovpn']
   case ovpn_files.length
   when 1
@@ -111,17 +124,17 @@ if options[:generate_client]
     abort "More than one .ovpn files in current directory, aborting"
   end
 
-  genrsa('client', options[:generate_client], options[:no_password])
-  req('client', options[:generate_client], options[:generate_client])
+  genrsa('client', options[:generate_zip], options[:no_password])
+  req('client', options[:generate_zip], options[:generate_zip])
 
   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)
   Zip::File.open(zip_file, Zip::File::CREATE) do |zip|
     zip.get_output_stream(ovpn_file) {|f|
       File.open(ovpn_file).each {|line| f.write line}
-      f.write "cert #{options[:generate_client]}.crt\nkey #{options[:generate_client]}.key\n"
+      f.write "cert #{options[:generate_zip]}.crt\nkey #{options[:generate_zip]}.key\n"
     }
-    [ 'ca.crt', "#{options[:generate_client]}.crt", "#{options[:generate_client]}.key"].each {|i|
+    [ 'ca.crt', "#{options[:generate_zip]}.crt", "#{options[:generate_zip]}.key"].each {|i|
       zip.add(i, i)
     }
   end

data/defaults/ovpn-key.yml

@@ -3,4 +3,4 @@ openssl:  openssl
 key_size: 2048
 encrypt:  aes128
 ca_name:  Certification Authority
-details:  /C=US/L=San Francisco/O=Dva Debila/OU=OpenVPN
+details:  /C=US/ST=CA/L=San Francisco/O=Dva Debila/OU=OpenVPN

data/lib/version.rb

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

metadata

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