letscert 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81459818c78f3836b106c632ae5befa99dcacf82
-  data.tar.gz: 1fce468a7511a75b84f584ff1fd8b5455db48065
+  metadata.gz: b1c7540da4fdf5cbdc335d39e2bbe3ddbdf1c626
+  data.tar.gz: 677697d448f263b70b20cea1d8b63e6a26a4db6b
 SHA512:
-  metadata.gz: 3b4ce524f540fbb291c6c88f13d32bfa27a501c2105d8c5002ff98ef9d4c808802cdaecd7cbffad6e53695792b84ed180517d16facd079af245f960f9cce100a
-  data.tar.gz: 2149c9cd3a620ecebf9d1ec2bdaaeef2f7f92944127c25f4351ecc42424503526c9fbf2d8498ad19b54277f76b301fe3a838eb96a3a7562745f69e08c60c4077
+  metadata.gz: fe59f20eabe2f24f06d64613668146bb18280fc0e78b1cb24560eff2eb6dce9a19319dea8806f1f4e06d1abf15338f67bd513be74a53650e66c7fe45d3e69424
+  data.tar.gz: 2bdc561629f525bea12e80ca1d5cace8ac851529be690ed8836dcd539c49e1243be9d0f745a8a9454b38431ad607cfe5e8cd11721975b7da6581c3ced2d41b13

data/lib/letscert/io_plugin.rb

@@ -70,11 +70,13 @@ module LetsCert
     end
 
     # @abstract This method must be overriden in subclasses
+    # Load data from disk
     def load
       raise NotImplementedError
     end
 
     # @abstract This method must be overriden in subclasses
+    # Save data to disk
     def save
       raise NotImplementedError
     end

data/lib/letscert/io_plugins/account_key.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # Account key IO plugin

data/lib/letscert/io_plugins/cert_file.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # Cert file plugin

data/lib/letscert/io_plugins/chain_file.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # Chain file plugin

data/lib/letscert/io_plugins/file_io_plugin_mixin.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # Mixin for IOPmugin subclasses that handle files
@@ -11,7 +32,7 @@ module LetsCert
 
       begin
         content = File.read(@name)
-      rescue Errno::ENOENT => ex
+      rescue Errno::ENOENT
         logger.info { "no #{@name} file" }
         return self.class.empty_data
       end
@@ -29,6 +50,7 @@ module LetsCert
     # Save data to file +#name+
     # @param [Hash] data
     # @return [void]
+    # @raise [Error] IO error
     def save_to_file(data)
       return if data.nil?
 

data/lib/letscert/io_plugins/full_chain_file.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # Fullchain file plugin
@@ -21,16 +42,14 @@ module LetsCert
         chain = data[:chain]
       end
 
-      { account_key: data[:account_key], key: data[:key], cert: cert,
-        chain: chain }
+      { cert: cert, chain: chain }
     end
 
     # Save fullchain.
     # @param [Hash] data
     # @return [void]
     def save(data)
-      super(account_key: data[:account_key], key: data[:key], cert: nil,
-            chain: [data[:cert]] + data[:chain])
+      super(cert: nil, chain: [data[:cert]] + data[:chain])
     end
 
   end

data/lib/letscert/io_plugins/jwk_io_plugin_mixin.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 require 'base64'
 
 module LetsCert
@@ -17,12 +38,19 @@ module LetsCert
     # @param [String] data
     # @return [String]
     def urlsafe_decode64(data)
-      Base64.urlsafe_decode64(data.sub(/[\s=]*\z/, ''))
+      # Ruby < 2.3.0 urlsafe_decode64 use struct_decode64. So the string
+      # is rejected if padding is removed (which JWK do)
+      # So, we have to reinject padding
+      if !data.end_with?("=") && data.length % 4 != 0
+        data = data.ljust((data.length + 3) & ~3, "=")
+      end
+      Base64.urlsafe_decode64(data)
     end
 
     # Load crypto data from JSON-encoded file
     # @param [String] data JSON-encoded data
-    # @return [OpenSSL::PKey::PKey]
+    # @return [OpenSSL::PKey::PKey,nil]
+    # @raise [Error] unsupported key type
     def load_jwk(data)
       return nil if data.empty?
 
@@ -45,12 +73,14 @@ module LetsCert
     # Dump crypto data (key) to a JSON-encoded string
     # @param [OpenSSL::PKey] key
     # @return [String]
+    # @raise [Error] unsupported key type
     def dump_jwk(key)
-      return {}.to_json if key.nil?
+      h = {}
+      return h.to_json if key.nil?
 
-      h = { 'kty' => 'RSA' }
       case key
       when OpenSSL::PKey::RSA
+        h['kty'] = 'RSA'
         h['e'] = urlsafe_encode64(key.e.to_s(2)) if key.e
         h['n'] = urlsafe_encode64(key.n.to_s(2)) if key.n
         if key.private?

data/lib/letscert/io_plugins/key_file.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # Key file plugin

data/lib/letscert/io_plugins/openssl_io_plugin.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
 
   # OpenSSL IOPlugin
@@ -9,6 +30,7 @@ module LetsCert
 
     # @param [String] name filename
     # @param [:pem,:der] type
+    # @raise [ArgumentError] unsupported type
     def initialize(name, type)
       case type
       when :pem

data/lib/letscert/runner/logger_formatter.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
   class Runner
 

data/lib/letscert/runner/valid_time.rb

@@ -1,3 +1,24 @@
+# The MIT License (MIT)
+#
+# Copyright (c) 2016 Sylvain Daubert
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 module LetsCert
   class Runner
 

data/lib/letscert/version.rb

@@ -1,6 +1,6 @@
 module LetsCert
 
   # Letscert version number
-  VERSION = '0.4.2'.freeze
+  VERSION = '0.4.3'.freeze
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: letscert
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Sylvain Daubert
@@ -31,7 +31,7 @@ cert_chain:
   dMi8WSKt03lfzyxIqZseBwVYYn+XMlzCcJLXCUgZXHcBRRRDH5wGDqOqXjL25b2O
   6m3JJngqkCFrOw==
   -----END CERTIFICATE-----
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client