xml-kit 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 49fff640520abeb3b244774d156af6e18ee85928
-  data.tar.gz: 92f26fb96366f6a9b8991fa4806f40edeff2d11a
+SHA256:
+  metadata.gz: 541ed54ee3640966ee29ba48f0cfbac4e40e5ced11ea356111cc23fc058964f7
+  data.tar.gz: 24802b75664d6ea143e2b9f2868fd68f5886a45a38f0012db475c76c753d569d
 SHA512:
-  metadata.gz: 000cccaa63a068e24acaa203dfeb80bcd3704f214be8812bb84feacb3d584e920eef7bd1a17d317e6049055a991f9d3c589cf505b4cf9574969a2ed179e19ad7
-  data.tar.gz: 516d4b2f71e2e9e6bd70d09be1f217234d0d10f5649a73ee97ae5100b32b34af24f42e52705465de3047a0d565c9a61f83c117fb1dfe0dc4149e1ff47413c10c
+  metadata.gz: 6615e9d82fa0fbae91f9ef7dde847ce2352931cb9f4590d6262eb79d6115fd728fb4b962e9d52a9cbdd0f8c53f592ea81488eb871a16c7f75cf4859c419fed08
+  data.tar.gz: 9a51a0092a026898a1364a69015426c5ee26cc72304c650d13f1fce567bc2c55506aef6d3c7ad47af420ae02d1c5005091c53d2b0862a2f2c111f39afb7217ca

data/.travis.yml

@@ -1,5 +1,9 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.2.9
+  - 2.3.6
   - 2.4.3
+  - 2.5.0
 before_install: gem install bundler -v 1.16.0
+script: bundle exec rspec

data/README.md

@@ -1,5 +1,10 @@
 # Xml::Kit
 
+[![Gem Version](https://badge.fury.io/rb/xml-kit.svg)](https://rubygems.org/gems/xml-kit)
+[![Code Climate](https://codeclimate.com/github/saml-kit/xml-kit.svg)](https://codeclimate.com/github/saml-kit/xml-kit)
+[![Build Status](https://travis-ci.org/saml-kit/xml-kit.svg)](https://travis-ci.org/saml-kit/xml-kit)
+[![Security](https://hakiri.io/github/saml-kit/xml-kit/master.svg)](https://hakiri.io/github/saml-kit/xml-kit/master)
+
 Xml::Kit is a toolkit for working with XML. It supports adding [XML
 Digital Signatures](https://www.w3.org/TR/xmldsig-core/)
 and [XML Encryption](https://www.w3.org/TR/2002/REC-xmlenc-core-20021210/Overview.html).

data/lib/xml/kit/fingerprint.rb

@@ -2,7 +2,7 @@ module Xml
   module Kit
     # This generates a fingerprint for an X509 Certificate.
     #
-    #   certificate, _ = Xml::Kit::SelfSignedCertificate.new("password").create
+    #   certificate, _ = Xml::Kit::SelfSignedCertificate.new.create
     #
     #   puts Xml::Kit::Fingerprint.new(certificate).to_s
     #   # B7:AB:DC:BD:4D:23:58:65:FD:1A:99:0C:5F:89:EA:87:AD:F1:D7:83:34:7A:E9:E4:88:12:DD:46:1F:38:05:93

data/lib/xml/kit/key_pair.rb

@@ -1,23 +1,21 @@
 module Xml
   module Kit
     class KeyPair # :nodoc:
-      attr_reader :certificate, :private_key, :use
+      attr_reader :certificate
+      attr_reader :private_key
+      attr_reader :public_key
 
       def initialize(certificate, private_key, passphrase, use)
-        @use = use
         @certificate = ::Xml::Kit::Certificate.new(certificate, use: use)
         @private_key = OpenSSL::PKey::RSA.new(private_key, passphrase)
+        @public_key = @private_key.public_key
       end
 
       # Returns true if the key pair is the designated use.
       #
       # @param use [Symbol] Can be either `:signing` or `:encryption`.
       def for?(use)
-        @use == use
-      end
-
-      def public_key
-        certificate.public_key
+        certificate.for?(use)
       end
 
       # Returns a generated self signed certificate with private key.
@@ -27,7 +25,7 @@ module Xml
       # @param algorithm [String] the symmetric algorithm to use for encrypting the private key.
       def self.generate(use:, passphrase: SecureRandom.uuid, algorithm: ::Xml::Kit::Crypto::SymmetricCipher::DEFAULT_ALGORITHM)
         algorithm = ::Xml::Kit::Crypto::SymmetricCipher::ALGORITHMS[algorithm]
-        certificate, private_key = ::Xml::Kit::SelfSignedCertificate.new(passphrase).create(algorithm)
+        certificate, private_key = ::Xml::Kit::SelfSignedCertificate.new.create(algorithm: algorithm, passphrase: passphrase)
         new(certificate, private_key, passphrase, use)
       end
     end

data/lib/xml/kit/self_signed_certificate.rb

@@ -3,24 +3,32 @@ module Xml
     class SelfSignedCertificate
       SUBJECT="/C=CA/ST=Alberta/L=Calgary/O=XmlKit/OU=XmlKit/CN=XmlKit"
 
-      def initialize(passphrase)
-        @passphrase = passphrase
+      def create(algorithm: 'AES-256-CBC', passphrase: nil, key_pair: OpenSSL::PKey::RSA.new(2048))
+        certificate = certificate_for(key_pair.public_key)
+        certificate.sign(key_pair, OpenSSL::Digest::SHA256.new)
+        [ certificate.to_pem, export(key_pair, algorithm, passphrase) ]
       end
 
-      def create(algorithm = 'AES-256-CBC')
-        rsa_key = OpenSSL::PKey::RSA.new(2048)
+      private
+
+      def export(key_pair, algorithm, passphrase)
+        if passphrase.present?
+          cipher = OpenSSL::Cipher.new(algorithm)
+          key_pair.export(cipher, passphrase)
+        else
+          key_pair.export
+        end
+      end
+
+      def certificate_for(public_key)
         certificate = OpenSSL::X509::Certificate.new
         certificate.subject = certificate.issuer = OpenSSL::X509::Name.parse(SUBJECT)
-        certificate.not_before = Time.now.to_i
-        certificate.not_after = (Date.today + 30).to_time.to_i
-        certificate.public_key = rsa_key.public_key
+        certificate.not_before = Time.now
+        certificate.not_after = certificate.not_before + 30 * 24 * 60 * 60 # 30 days
+        certificate.public_key = public_key
         certificate.serial = 0x0
         certificate.version = 2
-        certificate.sign(rsa_key, OpenSSL::Digest::SHA256.new)
-        [
-          certificate.to_pem,
-          rsa_key.to_pem(OpenSSL::Cipher.new(algorithm), @passphrase)
-        ]
+        certificate
       end
     end
   end

data/lib/xml/kit/version.rb

@@ -1,5 +1,5 @@
 module Xml
   module Kit
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/xml-kit.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{A simple toolkit for working with XML.}
   spec.description   = %q{A simple toolkit for working with XML.}
-  spec.homepage      = "http://www.mokhan.ca"
+  spec.homepage      = "https://github.com/saml-kit/xml-kit"
   spec.license       = "MIT"
   spec.required_ruby_version = '>= 2.2.0'
 
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activemodel", ">= 4.2.0"
   spec.add_dependency "builder", "~> 3.2"
-  spec.add_dependency "nokogiri", "~> 1.8"
+  spec.add_dependency "nokogiri", ">= 1.8.1"
   spec.add_dependency "tilt", "~> 2.0"
   spec.add_dependency "xmldsig", "~> 0.6"
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - mo khan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -42,16 +42,16 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ files:
 - lib/xml/kit/templates/signature.builder
 - lib/xml/kit/version.rb
 - xml-kit.gemspec
-homepage: http://www.mokhan.ca
+homepage: https://github.com/saml-kit/xml-kit
 licenses:
 - MIT
 metadata:
@@ -213,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A simple toolkit for working with XML.