xml-kit 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf597e61009dcd52e6c3be804169a1ca885f8ae74f03831f5b5257681166309
-  data.tar.gz: d28d3d23d4cef12e86c699b39cd353c34608a1a934c65bdd56dac5ebc77c4d94
+  metadata.gz: 763d302952d50ea00aad995aed62996708732c266e32e3fafeea3cc4e9db6c05
+  data.tar.gz: 537a44ee7c79ba0edd4a32d850320845395aa4d1499b2c7138891d20dfe71970
 SHA512:
-  metadata.gz: cc040ed426706033521a32f1bd68d5d52c6dee40c5f0424cd6089e14c0e72c0cd7f04db54b07961358007346e7decd260dd06d09de8e8499fef29953692112d5
-  data.tar.gz: cfea279707e9244bd1c1cba4a214ccfc75005d85e66f3edfd22ab4343968001c5541056aef260c5500194bc5786adc2d1545ff1476485648fd0da3d81092dc17
+  metadata.gz: '01894af70c7d56882b04968eec80650acc3263e98633a8a04f4727d434b860197d6d39bf266f1750b13f8b66aebdc94c4bd3e917244c9def16f55f73e1d296d9'
+  data.tar.gz: ecf023714655c4293064ce8656aa6e65e115b264be25f2d240ddfe5e37f3a2e532fa13f2137d99c6473350b3a98325491e307e42f52a10cf47c1eb0495e6646c

data/lib/xml/kit/certificate.rb

@@ -90,24 +90,43 @@ module Xml
         KeyPair.new(x509.to_pem, private_key.to_s, passphrase, use)
       end
 
-      def self.to_x509(value)
-        value = Base64.decode64(strip(value)) if base64?(value)
-        return value if value.is_a?(OpenSSL::X509::Certificate)
-        OpenSSL::X509::Certificate.new(value)
+      def expired?(time = Time.now)
+        x509.not_after <= time
       end
 
-      def self.base64?(value)
-        return unless value.is_a?(String)
+      def active?(time = Time.now)
+        x509.not_before <= time && !expired?(time)
+      end
+
+      def not_after
+        x509.not_after
+      end
 
-        sanitized_value = strip(value)
-        !!sanitized_value.match(BASE64_FORMAT)
+      def not_before
+        x509.not_before
       end
 
-      def self.strip(value)
-        value.
-          gsub(BEGIN_CERT, '').
-          gsub(END_CERT, '').
-          gsub(/[\r\n]|\\r|\\n|\s/, "")
+      class << self
+        def to_x509(value)
+          return value if value.is_a?(OpenSSL::X509::Certificate)
+
+          value = Base64.decode64(strip(value)) if base64?(value)
+          OpenSSL::X509::Certificate.new(value)
+        end
+
+        def base64?(value)
+          return unless value.is_a?(String)
+
+          sanitized_value = strip(value)
+          !!sanitized_value.match(BASE64_FORMAT)
+        end
+
+        def strip(value)
+          value.
+            gsub(BEGIN_CERT, '').
+            gsub(END_CERT, '').
+            gsub(/[\r\n]|\\r|\\n|\s/, "")
+        end
       end
     end
   end

data/lib/xml/kit/self_signed_certificate.rb

@@ -1,7 +1,7 @@
 module Xml
   module Kit
     class SelfSignedCertificate
-      SUBJECT="/C=CA/ST=Alberta/L=Calgary/O=XmlKit/OU=XmlKit/CN=XmlKit"
+      SUBJECT="/C=CA/ST=AB/L=Calgary/O=XmlKit/OU=XmlKit/CN=XmlKit"
 
       def create(algorithm: 'AES-256-CBC', passphrase: nil, key_pair: OpenSSL::PKey::RSA.new(2048))
         certificate = certificate_for(key_pair.public_key)

data/lib/xml/kit/version.rb

@@ -1,5 +1,5 @@
 module Xml
   module Kit
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml-kit
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - mo khan