certificate_authority 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e413d44d788e07a95a90b5849298f41796dbd57dce8fe08a0713191ae812798c
-  data.tar.gz: '059b6bee928fdcc1cebd04c6dff6890f7179d66094d6af17c549db7ef1811e56'
+  metadata.gz: e7b36863eef01f5f0a6d07681219864193c4b56cd3d8629bcba95bd974928e24
+  data.tar.gz: 589aaed317f1daecf32a85c4dbefcdb6aacf21e38d9dbd722fc8a7c556c342c6
 SHA512:
-  metadata.gz: 718978b7b52352cee16da1e555a0b0e71d0c68543bc627ef94869b45ff43dd259ce49a19b194105f96700848535a5397e039e86fd8733de899e5b61865eac2a8
-  data.tar.gz: b5998a5cfe29679198f4d57995e3f3e03f0694cc238e5fbc6f75a3a65b2ab80bfe3f86caac09616cb27f64832c0b83cddd87f3aaaa8e642e817429e3ecad0b7d
+  metadata.gz: 885dda3f5b5735fc7c80f733e731b02a9fcd7f15cd2d777d311c92872c829191632a6044836c76015b727fdc9ce82674ed483a4c0bf86b1f0aab0b9fee1421be
+  data.tar.gz: ba21e1934c3211da294a485f5411ffd5713e828d0a85ed7f9b45c99298fb16f0f571428ea87abcb0c2cdcb41420de45d71b9b89f24d43ab3dc7a9b4ce9ee8879

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version:
+          - '3.1'
+          - '3.0'
+          - '2.7'
+          - '2.6'
+          - '2.5'
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run tests
+      run: bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    certificate_authority (1.0.0)
+    certificate_authority (1.1.0)
 
 GEM
   remote: https://rubygems.org/
@@ -26,7 +26,7 @@ GEM
       method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)

data/lib/certificate_authority/certificate.rb

@@ -75,11 +75,6 @@ module CertificateAuthority
       openssl_cert.subject = self.distinguished_name.to_x509_name
       openssl_cert.issuer = parent.distinguished_name.to_x509_name
 
-      require 'tempfile'
-      t = Tempfile.new("bullshit_conf")
-      ## The config requires a file even though we won't use it
-      openssl_config = OpenSSL::Config.new(t.path)
-
       factory = OpenSSL::X509::ExtensionFactory.new
       factory.subject_certificate = openssl_cert
 
@@ -90,14 +85,7 @@ module CertificateAuthority
         factory.issuer_certificate = parent.openssl_body
       end
 
-      self.extensions.keys.each do |k|
-        config_extensions = extensions[k].config_extensions
-        openssl_config = merge_options(openssl_config,config_extensions)
-      end
-
-      # p openssl_config.sections
-
-      factory.config = openssl_config
+      factory.config = build_openssl_config
 
       # Order matters: e.g. for self-signed, subjectKeyIdentifier must come before authorityKeyIdentifier
       self.extensions.keys.sort{|a,b| b<=>a}.each do |k|
@@ -114,8 +102,6 @@ module CertificateAuthority
       end
 
       self.openssl_body = openssl_cert.sign(parent.key_material.private_key, digest)
-    ensure
-      t.close! if t # We can get rid of the ridiculous temp file
     end
 
     def is_signing_entity?
@@ -224,6 +210,55 @@ module CertificateAuthority
       extension_hash
     end
 
+    def build_openssl_config
+      OpenSSL::Config.parse(openssl_config_string)
+    end
+
+    def openssl_config_string
+      lines = openssl_config_without_multi_value + openssl_config_with_multi_value
+      return '' if lines.empty?
+      (["[extensions]" ]+ lines).join("\n")
+    end
+
+    def openssl_config_without_multi_value
+      no_multi_value_keys = self.extensions.keys.select { |k| extensions[k].config_extensions.empty? }
+
+      lines = no_multi_value_keys.map do |k|
+        value = extensions[k].to_s
+        value.empty? ? '' : "#{k} = #{value}"
+      end.reject(&:empty?)
+      lines
+    end
+
+    def openssl_config_with_multi_value
+      multi_value_keys = self.extensions.keys.reject { |k| extensions[k].config_extensions.empty? }
+      sections = {}
+
+      entries = multi_value_keys.map do |k|
+        sections.merge!(extensions[k].config_extensions)
+        value = comma_terminate(extensions[k]) + section_ref_str(extensions[k].config_extensions.keys)
+        "#{k} = #{value}"
+      end.reject(&:empty?)
+
+      section_lines = sections.keys.flat_map do |k|
+        section_lines(k, sections[k])
+      end 
+      entries + [''] + section_lines
+    end
+
+    def comma_terminate(val)
+      s = val.to_s
+      s.empty? ? s : "#{s},"
+    end
+
+    def section_ref_str(section_names)
+      section_names.map { |n| "@#{n}"}.join(',')
+    end
+
+    def section_lines(section_name, value_hash)
+      ["[#{section_name}]"] + value_hash.keys.map { |k| "#{k} = #{value_hash[k]}"} + ['']
+    end
+
     def merge_options(config,hash)
       hash.keys.each do |k|
         config[k] = hash[k]

data/lib/certificate_authority/version.rb

@@ -1,3 +1,3 @@
 module CertificateAuthority
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certificate_authority
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Chandler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -80,16 +80,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - squanderingtime@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -117,7 +117,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/cchandler/certificate_authority
   source_code_uri: https://github.com/cchandler/certificate_authority
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,8 +132,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby gem for managing the core functions outlined in RFC-3280 for PKI
 test_files: []

data/.travis.yml

@@ -1,11 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install: gem install bundler
-script:
-  - bundle exec rake