acme-client 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 056d35b4c628c93ad60a134ab46044cdbc5f9e38
-  data.tar.gz: d90a2d072631c7f68e9ea783e1a8878bc844314f
+  metadata.gz: 5bcc6e2a6458b03064bb7021971717fd63dc0f2a
+  data.tar.gz: 626fa36167c44f46612a9008a600a0e48a599e3d
 SHA512:
-  metadata.gz: e8b93b207b8016d1464f9e9f4fa20e7e303554eee08ac01eed069de34db084318dfb440e78d1ef07978bbd91ae385c8eaae3350b18b5f806c8a170d6bb776a0a
-  data.tar.gz: a23f0b2e33d7434abfe4e77bcb51e4d4d867cff629781f820704a484c89c0a6abfab028099542936c539b81c0e11d0abd9a05da4a96485425a91cb1034847ba0
+  metadata.gz: 3c4334775f5f2085dc8c5d9f93814204bc31f1fa16a887618f76f15711945ad065d87fd937ab03bdeda0f8a55326cee36768a90338b8ec5fdd58f559771f4020
+  data.tar.gz: 64beae8555a63fdccbadd33d7c0d09a06f6ec705e692fdb05b8d5984259010a8d956a6190d0715bfa6b5c92c0323ac2c551ffe2b3584a41ca8e3fa476550eec6

data/README.md

@@ -37,8 +37,8 @@ private_key = OpenSSL::PKey::RSA.new(4096)
 endpoint = 'https://acme-v01.api.letsencrypt.org/'
 
 # Initialize the client
-require 'acme/client'
-client = Acme::Client.new(private_key: private_key, endpoint: endpoint)
+require 'acme-client'
+client = Acme::Client.new(private_key: private_key, endpoint: endpoint, connection_options: { request: { open_timeout: 5, timeout: 5 } })
 
 # If the private key is not known to the server, we need to register it for the first time.
 registration = client.register(contact: 'mailto:contact@example.com')

data/lib/acme-client.rb

@@ -1,5 +1,3 @@
-module Acme; class Client; end; end
-
 require 'faraday'
 require 'json'
 require 'json/jwt'
@@ -7,11 +5,13 @@ require 'openssl'
 require 'digest'
 require 'forwardable'
 
+module Acme; end
+
+require 'acme/client'
 require 'acme/client/certificate'
 require 'acme/client/certificate_request'
 require 'acme/client/self_sign_certificate'
 require 'acme/client/crypto'
-require 'acme/client'
 require 'acme/client/resources'
 require 'acme/client/faraday_middleware'
 require 'acme/client/error'

data/lib/acme/client.rb

@@ -1,5 +1,3 @@
-require 'acme-client'
-
 class Acme::Client
   DEFAULT_ENDPOINT = 'http://127.0.0.1:4000'.freeze
   DIRECTORY_DEFAULT = {
@@ -9,8 +7,8 @@ class Acme::Client
     'revoke-cert' => '/acme/revoke-cert'
   }.freeze
 
-  def initialize(private_key:, endpoint: DEFAULT_ENDPOINT, directory_uri: nil)
-    @endpoint, @private_key, @directory_uri = endpoint, private_key, directory_uri
+  def initialize(private_key:, endpoint: DEFAULT_ENDPOINT, directory_uri: nil, connection_options: {})
+    @endpoint, @private_key, @directory_uri, @connection_options = endpoint, private_key, directory_uri, connection_options
     @nonces ||= []
     load_directory!
   end
@@ -46,7 +44,7 @@ class Acme::Client
     }
 
     response = connection.post(@operation_endpoints.fetch('new-cert'), payload)
-    ::Acme::Client::Certificate.new(OpenSSL::X509::Certificate.new(response.body), fetch_chain(response), csr)
+    ::Acme::Client::Certificate.new(OpenSSL::X509::Certificate.new(response.body), response.headers['location'], fetch_chain(response), csr)
   end
 
   def revoke_certificate(certificate)
@@ -62,7 +60,7 @@ class Acme::Client
   end
 
   def connection
-    @connection ||= Faraday.new(@endpoint) do |configuration|
+    @connection ||= Faraday.new(@endpoint, **@connection_options) do |configuration|
       configuration.use Acme::Client::FaradayMiddleware, client: self
       configuration.adapter Faraday.default_adapter
     end

data/lib/acme/client/certificate.rb

@@ -1,12 +1,13 @@
 class Acme::Client::Certificate
   extend Forwardable
 
-  attr_reader :x509, :x509_chain, :request, :private_key
+  attr_reader :x509, :x509_chain, :request, :private_key, :url
 
   def_delegators :x509, :to_pem, :to_der
 
-  def initialize(certificate, chain, request)
+  def initialize(certificate, url, chain, request)
     @x509 = certificate
+    @url = url
     @x509_chain = chain
     @request = request
   end

data/lib/acme/client/error.rb

@@ -9,4 +9,7 @@ class Acme::Client::Error < StandardError
   class Acme::Tls < Acme::Client::Error; end
   class Unauthorized < Acme::Client::Error; end
   class UnknownHost < Acme::Client::Error; end
+  class Timeout < Acme::Client::Error; end
+  class RateLimited < Acme::Client::Error; end
+  class RejectedIdentifier < Acme::Client::Error; end
 end

data/lib/acme/client/faraday_middleware.rb

@@ -10,6 +10,8 @@ class Acme::Client::FaradayMiddleware < Faraday::Middleware
     @env = env
     @env.body = crypto.generate_signed_jws(header: { nonce: pop_nonce }, payload: env.body)
     @app.call(env).on_complete { |response_env| on_complete(response_env) }
+  rescue Faraday::TimeoutError
+    raise Acme::Client::Error::Timeout
   end
 
   def on_complete(env)

data/lib/acme/client/version.rb

@@ -1,5 +1,5 @@
 module Acme
   class Client
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.3.2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acme-client
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Charles Barbier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Client for the ACME protocol.