acme-client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ee8283817ef99669367cba5c6e5d62095aa5015
-  data.tar.gz: 62f8588bfd710561c626064825b7bd0a678b3a49
+  metadata.gz: fb284f691ef7182e7aa9ca56ff950373d92380b6
+  data.tar.gz: 542ef5706c8265fecf34c3841742c673df8eb4fc
 SHA512:
-  metadata.gz: 4cd8d3dcdeb48bd21acc1212bc04f65fb0a37ce797d3553d63dc3730370bce723a68e5683fcf7745eb14916be610dd8009e284c911f75d50d76a7be0135a1dcf
-  data.tar.gz: 7bb4ff248144d4cbc9f43b752cca79773b6529a0140c81db433cdb2c8653d063ee7933287c0071fdb50daa0817b105c930e4f51a80e6eddcc7d98c3b2898cc14
+  metadata.gz: 3453c7ea55e3b646eb313bee04277f14259197c6c7817924848e0635992c8b3a7edb17f176c4da64bdae26c51bf4f341380071b51721a71f144e3903dc759cda
+  data.tar.gz: da85a2dc373d4b7eb361f1fe97b7cb0f3c77b52bae6862c3e7e11328e3a505e75536f3fcf5b5db5c53094cd0fcecc58eebf87a5f0c2e9274f367d04c87f48f5a

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
   - 2.1
   - 2.2

data/README.md

@@ -15,7 +15,7 @@ require 'openssl'
 private_key = OpenSSL::PKey::RSA.new(2048)
 
 # We need an ACME server to talk to, see github.com/letsencrypt/boulder
-endpoint = 'https://acme-staging.api.letsencrypt.org'
+endpoint = 'https://acme-v01.api.letsencrypt.org/'
 
 # Initialize the client
 require 'acme-client'

data/acme-client.gemspec

@@ -22,6 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock', '~> 1.21', '>= 1.21.0'
 
   spec.add_runtime_dependency 'faraday', '~> 0.9', '>= 0.9.1'
-  spec.add_runtime_dependency 'url_safe_base64', '~> 0.2', '>= 0.2.2'
   spec.add_runtime_dependency 'json-jwt', '~> 1.2', '>= 1.2.3'
 end

data/lib/acme-client.rb

@@ -1,6 +1,5 @@
 module Acme; end
 
-require 'url_safe_base64'
 require 'faraday'
 require 'json'
 require 'json/jwt'

data/lib/acme/certificate.rb

@@ -14,7 +14,11 @@ class Acme::Certificate
     x509_chain.map(&:to_pem).join
   end
 
+  def x509_fullchain
+    [x509, *x509_chain]
+  end
+
   def fullchain_to_pem
-    [*x509_chain, x509].map(&:to_pem).join
+    x509_fullchain.map(&:to_pem).join
   end
 end

data/lib/acme/client.rb

@@ -40,11 +40,11 @@ class Acme::Client
   def new_certificate(csr)
     payload = {
       resource: 'new-cert',
-      csr: UrlSafeBase64.encode64(csr.to_der)
+      csr: Base64.urlsafe_encode64(csr.to_der)
     }
 
     response = connection.post(@operation_endpoints.fetch('new-cert'), payload)
-    ::Acme::Certificate.new(OpenSSL::X509::Certificate.new(response.body), fetch_chain(response).reverse)
+    ::Acme::Certificate.new(OpenSSL::X509::Certificate.new(response.body), fetch_chain(response))
   end
 
   def fetch_chain(response, limit=10)

data/lib/acme/crypto.rb

@@ -6,31 +6,15 @@ class Acme::Crypto
   end
 
   def generate_signed_jws(header:, payload:)
-    protection_header = generate_protection_header(header)
-    payload = encode64(JSON.dump(payload))
-
-    JSON.dump(
-      {
-        header: { alg: :RS256, jwk: jwk },
-        protected: protection_header,
-        payload: payload,
-        signature: generate_signature(protection_header, payload)
-      }
-    )
-  end
-
-  def generate_signature(protection_header, payload)
-    input = "#{protection_header}.#{payload}"
-    signature = private_key.sign(digest, input)
-    encode64(signature)
-  end
-
-  def generate_protection_header(header)
-    encode64(JSON.dump(header))
+    jwt = JSON::JWT.new(payload || {})
+    jwt.header.merge!(header || {})
+    jwt.header[:jwk] = jwk
+    jwt.signature = jwt.sign(private_key, :RS256).signature
+    jwt.to_json(syntax: :flattened)
   end
 
   def jwk
-    JSON::JWK.new(public_key)
+    @jwk ||= JSON::JWK.new(public_key)
   end
 
   def thumbprint
@@ -38,14 +22,10 @@ class Acme::Crypto
   end
 
   def public_key
-    private_key.public_key
+    @public_key ||= private_key.public_key
   end
 
   def digest
     OpenSSL::Digest::SHA256.new
   end
-
-  def encode64(input)
-    UrlSafeBase64.encode64(input)
-  end
 end

data/lib/acme/version.rb

@@ -1,5 +1,5 @@
 module Acme
   class Client
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acme-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Charles Barbier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,26 +118,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
-- !ruby/object:Gem::Dependency
-  name: url_safe_base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement