ruby_easy_rsa 0.2.0.pre.5 → 0.2.0.pre.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f12e493c4a02682cc661cdc9dea7a4993ac2670378300444e3b76128aac4ec5
-  data.tar.gz: 611060e3e889a370015d00790cd7a743fa9b7d076569e7bb6bbfaa793fc9f6e2
+  metadata.gz: 83be89f01f04e1303768f190cff9ad9b7547d7a6b02e3ea4bea4b7eec4045ac5
+  data.tar.gz: 6ffd6200e865ba3068a4ecc08dd2206a85c3c0b4a653ebcf4530c2c034313da2
 SHA512:
-  metadata.gz: 2a3ddf4fc58f0a11799a6089c44890b53fe8d0113f54961e3ef398068ab8aab86c1e9508f03b7c4942aa179cc9042f1f13c4f65a65ddb1a030d22f9a07c10fc0
-  data.tar.gz: 4cc309e96127ebb5b06755b775a70104e733fab4ed657526dde1f515333e89514ff5883cfd6e5b0bfa521715aca41b729e0ddb91cbe66b46c9ac7e39e682c17a
+  metadata.gz: 1cfe9fcbf78cdbb22509bf712d55027f90465143c93e476ce17970b997a748136b8a57297dfa86143b4320f887b6fca2bd871702f1cd71ce796ec35378554c3f
+  data.tar.gz: e8112afd40cbd9483480d359d81f189d8d02cdbebd70e6eea782e374fed0fdb8ae98edcc0b46c05ed347af35ad36b375ff348bbfaebbf403f6467b6d5693a02b

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby_easy_rsa (0.2.0.pre.5)
+    ruby_easy_rsa (0.2.0.pre.6)
       lino (= 1.2.0.pre.2)
 
 GEM

data/lib/ruby_easy_rsa/commands/build_ca.rb

@@ -3,25 +3,23 @@ require 'lino'
 require_relative 'base'
 require_relative 'mixins/global_config'
 require_relative 'mixins/ssl_config'
-require_relative 'mixins/algo_config'
+require_relative 'mixins/algorithm_config'
+require_relative 'mixins/encrypt_key_config'
 
 module RubyEasyRSA
   module Commands
     class BuildCA < Base
       include Mixins::GlobalConfig
       include Mixins::SSLConfig
-      include Mixins::AlgoConfig
+      include Mixins::AlgorithmConfig
+      include Mixins::EncryptKeyConfig
 
       def configure_command(builder, opts)
-        batch = opts[:batch]
-        encrypt_key = opts[:encrypt_key].nil? ? true : opts[:encrypt_key]
         sub_ca = opts[:sub_ca]
 
-        builder = super(builder, opts)
-        builder = builder.with_flag('--batch') if batch
         builder = builder.with_subcommand('build-ca')
-        builder = builder.with_argument('nopass') unless encrypt_key
         builder = builder.with_argument('subca') if sub_ca
+        builder = super(builder, opts)
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/build_client_full.rb

@@ -0,0 +1,35 @@
+require 'lino'
+
+require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/algorithm_config'
+require_relative 'mixins/ssl_config'
+require_relative 'mixins/sub_ca_config'
+require_relative 'mixins/copy_extensions_config'
+require_relative 'mixins/extra_extensions_config'
+require_relative 'mixins/netscape_extensions_config'
+require_relative 'mixins/encrypt_key_config'
+
+module RubyEasyRSA
+  module Commands
+    class BuildClientFull < Base
+      include Mixins::GlobalConfig
+      include Mixins::AlgorithmConfig
+      include Mixins::SSLConfig
+      include Mixins::SubCAConfig
+      include Mixins::CopyExtensionsConfig
+      include Mixins::ExtraExtensionsConfig
+      include Mixins::NetscapeExtensionsConfig
+      include Mixins::EncryptKeyConfig
+
+      def configure_command(builder, opts)
+        filename_base = opts[:filename_base]
+
+        builder = builder.with_subcommand('build-client-full')
+        builder = builder.with_argument(filename_base)
+        builder = super(builder, opts)
+        builder
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/build_server_full.rb

@@ -0,0 +1,35 @@
+require 'lino'
+
+require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/algorithm_config'
+require_relative 'mixins/ssl_config'
+require_relative 'mixins/sub_ca_config'
+require_relative 'mixins/copy_extensions_config'
+require_relative 'mixins/extra_extensions_config'
+require_relative 'mixins/netscape_extensions_config'
+require_relative 'mixins/encrypt_key_config'
+
+module RubyEasyRSA
+  module Commands
+    class BuildServerFull < Base
+      include Mixins::GlobalConfig
+      include Mixins::AlgorithmConfig
+      include Mixins::SSLConfig
+      include Mixins::SubCAConfig
+      include Mixins::CopyExtensionsConfig
+      include Mixins::ExtraExtensionsConfig
+      include Mixins::NetscapeExtensionsConfig
+      include Mixins::EncryptKeyConfig
+
+      def configure_command(builder, opts)
+        filename_base = opts[:filename_base]
+
+        builder = builder.with_subcommand('build-server-full')
+        builder = builder.with_argument(filename_base)
+        builder = super(builder, opts)
+        builder
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/gen_req.rb

@@ -2,26 +2,26 @@ require 'lino'
 
 require_relative 'base'
 require_relative 'mixins/global_config'
+require_relative 'mixins/algorithm_config'
 require_relative 'mixins/ssl_config'
-require_relative 'mixins/algo_config'
+require_relative 'mixins/extra_extensions_config'
+require_relative 'mixins/encrypt_key_config'
 
 module RubyEasyRSA
   module Commands
     class GenReq < Base
       include Mixins::GlobalConfig
+      include Mixins::AlgorithmConfig
       include Mixins::SSLConfig
-      include Mixins::AlgoConfig
+      include Mixins::ExtraExtensionsConfig
+      include Mixins::EncryptKeyConfig
 
       def configure_command(builder, opts)
-        batch = opts[:batch]
         filename_base = opts[:filename_base]
-        encrypt_key = opts[:encrypt_key].nil? ? true : opts[:encrypt_key]
 
-        builder = super(builder, opts)
-        builder = builder.with_flag('--batch') if batch
         builder = builder.with_subcommand('gen-req')
         builder = builder.with_argument(filename_base)
-        builder = builder.with_argument('nopass') unless encrypt_key
+        builder = super(builder, opts)
         builder
       end
     end

data/lib/ruby_easy_rsa/commands/mixins/{algo_config.rb → algorithm_config.rb}

@@ -1,7 +1,7 @@
 module RubyEasyRSA
   module Commands
     module Mixins
-      module AlgoConfig
+      module AlgorithmConfig
         def configure_command(builder, opts)
           algorithm = opts[:algorithm]
           curve = opts[:curve]

data/lib/ruby_easy_rsa/commands/mixins/copy_extensions_config.rb

@@ -0,0 +1,15 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module CopyExtensionsConfig
+        def configure_command(builder, opts)
+          copy_extensions = opts[:copy_extensions]
+
+          builder = super(builder, opts)
+          builder = builder.with_flag('--copy-ext') if copy_extensions
+          builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/mixins/encrypt_key_config.rb

@@ -0,0 +1,15 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module EncryptKeyConfig
+        def configure_command(builder, opts)
+          encrypt_key = opts[:encrypt_key].nil? ? true : opts[:encrypt_key]
+
+          builder = super(builder, opts)
+          builder = builder.with_argument('nopass') unless encrypt_key
+          builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/mixins/extra_extensions_config.rb

@@ -0,0 +1,20 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module ExtraExtensionsConfig
+        def configure_command(builder, opts)
+          extra_extensions = opts[:extra_extensions]
+          subject_alternative_name = opts[:subject_alternative_name]
+
+          builder = super(builder, opts)
+          builder = builder.with_environment_variable(
+              'EASYRSA_EXTRA_EXT', extra_extensions) if extra_extensions
+          builder = builder.with_option(
+              '--subject-alt-name', subject_alternative_name, quoting: '"'
+          ) if subject_alternative_name
+          builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/mixins/global_config.rb

@@ -3,20 +3,29 @@ module RubyEasyRSA
     module Mixins
       module GlobalConfig
         def configure_command(builder, opts)
+          extensions_directory = opts[:extensions_directory]
           openssl_binary = opts[:openssl_binary]
           ssl_configuration = opts[:ssl_configuration]
           safe_configuration = opts[:safe_configuration]
           vars = opts[:vars]
+          batch = opts[:batch]
+          pki_directory = opts[:pki_directory]
 
           builder = super(builder, opts)
           builder = builder.with_environment_variable(
               'EASYRSA_OPENSSL', openssl_binary) if openssl_binary
+          builder = builder.with_environment_variable(
+              'EASYRSA_EXT_DIR', extensions_directory) if extensions_directory
           builder = builder.with_environment_variable(
               'EASYRSA_SSL_CONF', ssl_configuration) if ssl_configuration
           builder = builder.with_environment_variable(
               'EASYRSA_SAFE_CONF', safe_configuration) if safe_configuration
           builder = builder.with_option(
               '--vars', vars) if vars
+          builder = builder.with_flag(
+              '--batch') if batch
+          builder = builder.with_option(
+              '--pki-dir', pki_directory) if pki_directory
           builder
         end
       end

data/lib/ruby_easy_rsa/commands/mixins/netscape_extensions_config.rb

@@ -0,0 +1,21 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module NetscapeExtensionsConfig
+        def configure_command(builder, opts)
+          netscape_extensions_support = opts[:netscape_extensions_support]
+          netscape_extensions_comment = opts[:netscape_extensions_comment]
+
+          builder = super(builder, opts)
+          builder = builder.with_option(
+              '--ns-cert', netscape_extensions_support ? 'yes' : 'no'
+          ) unless netscape_extensions_support.nil?
+          builder = builder.with_option(
+              '--ns-comment', netscape_extensions_comment, quoting: '"'
+          ) if netscape_extensions_comment
+          builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/mixins/ssl_config.rb

@@ -3,7 +3,6 @@ module RubyEasyRSA
     module Mixins
       module SSLConfig
         def configure_command(builder, opts)
-          pki_directory = opts[:pki_directory]
           digest = opts[:digest]
           key_size_in_bits = opts[:key_size_in_bits]
           expires_in_days = opts[:expires_in_days]
@@ -17,8 +16,6 @@ module RubyEasyRSA
           email = opts[:email]
 
           builder = super(builder, opts)
-          builder = builder.with_option(
-              '--pki-dir', pki_directory) if pki_directory
           builder = builder.with_option(
               '--digest', digest) if digest
           builder = builder.with_option(

data/lib/ruby_easy_rsa/commands/mixins/sub_ca_config.rb

@@ -0,0 +1,16 @@
+module RubyEasyRSA
+  module Commands
+    module Mixins
+      module SubCAConfig
+        def configure_command(builder, opts)
+          sub_ca_length = opts[:sub_ca_length]
+
+          builder = super(builder, opts)
+          builder = builder.with_option(
+              '--subca-len', sub_ca_length) if sub_ca_length
+          builder
+        end
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands/sign_req.rb

@@ -0,0 +1,35 @@
+require 'lino'
+
+require_relative 'base'
+require_relative 'mixins/global_config'
+require_relative 'mixins/algorithm_config'
+require_relative 'mixins/ssl_config'
+require_relative 'mixins/sub_ca_config'
+require_relative 'mixins/copy_extensions_config'
+require_relative 'mixins/extra_extensions_config'
+require_relative 'mixins/netscape_extensions_config'
+
+module RubyEasyRSA
+  module Commands
+    class SignReq < Base
+      include Mixins::GlobalConfig
+      include Mixins::AlgorithmConfig
+      include Mixins::SSLConfig
+      include Mixins::SubCAConfig
+      include Mixins::CopyExtensionsConfig
+      include Mixins::ExtraExtensionsConfig
+      include Mixins::NetscapeExtensionsConfig
+
+      def configure_command(builder, opts)
+        type = opts[:type]
+        filename_base = opts[:filename_base]
+
+        builder = super(builder, opts)
+        builder = builder.with_subcommand('sign-req')
+        builder = builder.with_argument(type)
+        builder = builder.with_argument(filename_base)
+        builder
+      end
+    end
+  end
+end

data/lib/ruby_easy_rsa/commands.rb

@@ -2,6 +2,9 @@ require_relative 'commands/init_pki'
 require_relative 'commands/build_ca'
 require_relative 'commands/gen_dh'
 require_relative 'commands/gen_req'
+require_relative 'commands/sign_req'
+require_relative 'commands/build_client_full'
+require_relative 'commands/build_server_full'
 
 module RubyEasyRSA
   module Commands

data/lib/ruby_easy_rsa/version.rb

@@ -1,3 +1,3 @@
 module RubyEasyRSA
-  VERSION = '0.2.0.pre.5'
+  VERSION = '0.2.0.pre.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_easy_rsa
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.5
+  version: 0.2.0.pre.6
 platform: ruby
 authors:
 - Toby Clemson
@@ -138,6 +138,7 @@ files:
 - ".git-crypt/keys/default/0/AAE932B730C2BA697FFDFAE05DA390873E38358B.gpg"
 - ".gitattributes"
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -159,12 +160,20 @@ files:
 - lib/ruby_easy_rsa/commands.rb
 - lib/ruby_easy_rsa/commands/base.rb
 - lib/ruby_easy_rsa/commands/build_ca.rb
+- lib/ruby_easy_rsa/commands/build_client_full.rb
+- lib/ruby_easy_rsa/commands/build_server_full.rb
 - lib/ruby_easy_rsa/commands/gen_dh.rb
 - lib/ruby_easy_rsa/commands/gen_req.rb
 - lib/ruby_easy_rsa/commands/init_pki.rb
-- lib/ruby_easy_rsa/commands/mixins/algo_config.rb
+- lib/ruby_easy_rsa/commands/mixins/algorithm_config.rb
+- lib/ruby_easy_rsa/commands/mixins/copy_extensions_config.rb
+- lib/ruby_easy_rsa/commands/mixins/encrypt_key_config.rb
+- lib/ruby_easy_rsa/commands/mixins/extra_extensions_config.rb
 - lib/ruby_easy_rsa/commands/mixins/global_config.rb
+- lib/ruby_easy_rsa/commands/mixins/netscape_extensions_config.rb
 - lib/ruby_easy_rsa/commands/mixins/ssl_config.rb
+- lib/ruby_easy_rsa/commands/mixins/sub_ca_config.rb
+- lib/ruby_easy_rsa/commands/sign_req.rb
 - lib/ruby_easy_rsa/version.rb
 - ruby_easy_rsa.gemspec
 - scripts/ci/common/configure-git.sh