acme-client 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b791acbcafdeb9a0cc7b1fc56977ff235771db
-  data.tar.gz: fcc5bdffc2e7278301de2ad97745a0dd1400915e
+  metadata.gz: 9f9c42703db71639a5e1f5f01ce79d793343bd13
+  data.tar.gz: a6e9dbb2adcd1246db1c67417b8b4ac3e54fbe2c
 SHA512:
-  metadata.gz: 1dda0e5460db94b43231b033513b28c6a88b7af1be4c201bd360b5fda5dab159eb684305177636f6a3327a5ef6b54359045c1f12a87c62312a510dddae3b8345
-  data.tar.gz: c5d7b4f69f4455c56fdeb9611b66757e981ebd870582fca017656a6f9635bfd223cc1c2231c67a159682f66e369dad18e3ed81e259c9d931d4f0f5b11a3972de
+  metadata.gz: 62053ee6b500dbf4d239919f7b6522f47459fa08f78e62395877cde46dccc35ba3de028bdb032e305dd890c90b86de5d2e4b6b2c34f48e517198eca0ac162081
+  data.tar.gz: fca377ddccf602238402cbe0d49febe228690dd68fc4922a135b515d6178c8e0843c08225bb371853723717ce6794b22ca3399c505f804f0cf74a9e16acf9117

data/Gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in acme-client.gemspec
 gemspec
 
 group :development, :test do
   gem 'pry'
+  gem 'ruby-prof', require: false
 end

data/README.md

@@ -18,7 +18,7 @@ private_key = OpenSSL::PKey::RSA.new(2048)
 endpoint = 'https://acme-v01.api.letsencrypt.org/'
 
 # Initialize the client
-require 'acme-client'
+require 'acme/client'
 client = Acme::Client.new(private_key: private_key, endpoint: endpoint)
 
 # If the private key is not known to the server, we need to register it for the first time.
@@ -67,12 +67,12 @@ challenge.verify_status # => 'valid'
 
 # We're going to need a certificate signing request. If not explicitly
 # specified, the first name listed becomes the common name.
-csr = Acme::CertificateRequest.new(names: %w[example.org www.example.org])
+csr = Acme::Client::CertificateRequest.new(names: %w[example.org www.example.org])
 
 # We can now request a certificate, you can pass anything that returns
 # a valid DER encoded CSR when calling to_der on it, for example a
 # OpenSSL::X509::Request too.
-certificate = client.new_certificate(csr) # => #<Acme::Certificate ....>
+certificate = client.new_certificate(csr) # => #<Acme::Client::Certificate ....>
 
 # Save the certificate and key
 File.write("privkey.pem", certificate.request.private_key.to_pem)

data/acme-client.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'acme/version'
+require 'acme/client/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'acme-client'
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 1.6.9'
+  spec.add_development_dependency 'bundler', '~> 1.6', '>= 1.6.9'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.3', '>= 3.3.0'
   spec.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.3'

data/bin/console

@@ -1,14 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "acme-client"
+require 'bundler/setup'
+require 'acme-client'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require 'pry'
+Pry.start

data/bin/setup

@@ -3,5 +3,3 @@ set -euo pipefail
 IFS=$'\n\t'
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/lib/acme-client.rb

@@ -1,4 +1,4 @@
-module Acme; end
+module Acme; class Client; end; end
 
 require 'faraday'
 require 'json'
@@ -7,10 +7,10 @@ require 'openssl'
 require 'digest'
 require 'forwardable'
 
-require 'acme/certificate'
-require 'acme/certificate_request'
-require 'acme/crypto'
+require 'acme/client/certificate'
+require 'acme/client/certificate_request'
+require 'acme/client/crypto'
 require 'acme/client'
-require 'acme/resources'
-require 'acme/faraday_middleware'
-require 'acme/error'
+require 'acme/client/resources'
+require 'acme/client/faraday_middleware'
+require 'acme/client/error'

data/lib/acme/client.rb

@@ -1,3 +1,5 @@
+require "acme-client"
+
 class Acme::Client
   DEFAULT_ENDPOINT = 'http://127.0.0.1:4000'
   DIRECTORY_DEFAULT = {
@@ -21,7 +23,7 @@ class Acme::Client
     }
 
     response = connection.post(@operation_endpoints.fetch('new-reg'), payload)
-    ::Acme::Resources::Registration.new(self, response)
+    ::Acme::Client::Resources::Registration.new(self, response)
   end
 
   def authorize(domain:)
@@ -34,7 +36,7 @@ class Acme::Client
     }
 
     response = connection.post(@operation_endpoints.fetch('new-authz'), payload)
-    ::Acme::Resources::Authorization.new(self, response)
+    ::Acme::Client::Resources::Authorization.new(self, response)
   end
 
   def new_certificate(csr)
@@ -44,9 +46,30 @@ class Acme::Client
     }
 
     response = connection.post(@operation_endpoints.fetch('new-cert'), payload)
-    ::Acme::Certificate.new(OpenSSL::X509::Certificate.new(response.body), fetch_chain(response), csr)
+    ::Acme::Client::Certificate.new(OpenSSL::X509::Certificate.new(response.body), fetch_chain(response), csr)
+  end
+
+  def revoke_certificate(certificate)
+    payload = { resource: 'revoke-cert', certificate: Base64.urlsafe_encode64(certificate.to_der) }
+    endpoint = @operation_endpoints.fetch('revoke-cert')
+    response = connection.post(endpoint, payload)
+    response.success?
+  end
+
+  def self.revoke_certificate(certificate, *arguments)
+    client = new(*arguments)
+    client.revoke_certificate(certificate)
+  end
+
+  def connection
+    @connection ||= Faraday.new(@endpoint) do |configuration|
+      configuration.use Acme::Client::FaradayMiddleware, client: self
+      configuration.adapter Faraday.default_adapter
+    end
   end
 
+  private
+
   def fetch_chain(response, limit=10)
     if limit == 0 || response.headers["link"].nil? || response.headers["link"]["up"].nil?
       []
@@ -56,13 +79,6 @@ class Acme::Client
     end
   end
 
-  def connection
-    @connection ||= Faraday.new(@endpoint) do |configuration|
-      configuration.use Acme::FaradayMiddleware, client: self
-      configuration.adapter Faraday.default_adapter
-    end
-  end
-
   def load_directory!
     @operation_endpoints = if @directory_uri
       response = connection.get(@directory_uri)

data/lib/acme/{certificate.rb → client/certificate.rb}

@@ -1,4 +1,4 @@
-class Acme::Certificate
+class Acme::Client::Certificate
   extend Forwardable
 
   attr_reader :x509, :x509_chain, :request

data/lib/acme/{certificate_request.rb → client/certificate_request.rb}

@@ -1,4 +1,4 @@
-class Acme::CertificateRequest
+class Acme::Client::CertificateRequest
   extend Forwardable
 
   DEFAULT_KEY_LENGTH = 2048
@@ -21,7 +21,7 @@ class Acme::CertificateRequest
     "L"  => OpenSSL::ASN1::UTF8STRING
   }.freeze
 
-  attr_reader :csr, :private_key, :common_name, :names, :subject
+  attr_reader :private_key, :common_name, :names, :subject
 
   def_delegators :csr, :to_pem, :to_der
 
@@ -43,8 +43,10 @@ class Acme::CertificateRequest
 
     @subject[SUBJECT_KEYS[:common_name]] ||= @common_name
     validate_subject
+  end
 
-    @csr = generate
+  def csr
+    @csr ||= generate
   end
 
   private

data/lib/acme/{crypto.rb → client/crypto.rb}

@@ -1,4 +1,4 @@
-class Acme::Crypto
+class Acme::Client::Crypto
   attr_reader :private_key
 
   def initialize(private_key)
@@ -13,19 +13,21 @@ class Acme::Crypto
     jwt.to_json(syntax: :flattened)
   end
 
-  def jwk
-    @jwk ||= JSON::JWK.new(public_key)
-  end
-
   def thumbprint
     jwk.thumbprint
   end
 
-  def public_key
-    @public_key ||= private_key.public_key
-  end
-
   def digest
     OpenSSL::Digest::SHA256.new
   end
+
+  private
+
+  def jwk
+    @jwk ||= JSON::JWK.new(public_key)
+  end
+
+  def public_key
+    @public_key ||= private_key.public_key
+  end
 end

data/lib/acme/client/error.rb

@@ -0,0 +1,12 @@
+class Acme::Client::Error < StandardError
+  class NotFound < Acme::Client::Error; end
+  class BadCSR < Acme::Client::Error; end
+  class BadNonce < Acme::Client::Error; end
+  class Connection < Acme::Client::Error; end
+  class Dnssec < Acme::Client::Error; end
+  class Malformed < Acme::Client::Error; end
+  class ServerInternal < Acme::Client::Error; end
+  class Acme::Tls < Acme::Client::Error; end
+  class Unauthorized < Acme::Client::Error; end
+  class UnknownHost < Acme::Client::Error; end
+end

data/lib/acme/{faraday_middleware.rb → client/faraday_middleware.rb}

@@ -1,4 +1,4 @@
-class Acme::FaradayMiddleware < Faraday::Middleware
+class Acme::Client::FaradayMiddleware < Faraday::Middleware
   attr_reader :env, :response, :client
 
   def initialize(app, client:)
@@ -13,7 +13,7 @@ class Acme::FaradayMiddleware < Faraday::Middleware
   end
 
   def on_complete(env)
-    raise Acme::Error::NotFound, env.url.to_s if env.status == 404
+    raise Acme::Client::Error::NotFound, env.url.to_s if env.status == 404
 
     nonces << env.response_headers['replay-nonce']
 
@@ -27,7 +27,7 @@ class Acme::FaradayMiddleware < Faraday::Middleware
       link_header = env.response_headers['Link']
       links = link_header.split(', ').map do |entry|
         link = entry.match(/<(.*?)>;/).captures.first
-        name = entry.match(/rel="([\w_-]+)"/).captures.first
+        name = entry.match(/rel="([\w-]+)"/).captures.first
         [name, link]
       end
 
@@ -37,10 +37,10 @@ class Acme::FaradayMiddleware < Faraday::Middleware
     return if env.success?
 
     error_name = env.body['type'].gsub('urn:acme:error:', '').classify
-    error_class = if Acme::Error.qualified_const_defined?(error_name)
-      "Acme::Error::#{error_name}".constantize
+    error_class = if Acme::Client::Error.qualified_const_defined?(error_name)
+      "Acme::Client::Error::#{error_name}".constantize
     else
-      Acme::Error
+      Acme::Client::Error
     end
 
     message = if env.body.is_a? Hash
@@ -49,7 +49,7 @@ class Acme::FaradayMiddleware < Faraday::Middleware
       "Error message: #{env.body}"
     end
 
-    raise error_class, env.body['detail']
+    raise error_class, message
   end
 
   private
@@ -76,6 +76,6 @@ class Acme::FaradayMiddleware < Faraday::Middleware
   end
 
   def crypto
-    @crypto ||= Acme::Crypto.new(private_key)
+    @crypto ||= Acme::Client::Crypto.new(private_key)
   end
 end

data/lib/acme/client/resources.rb

@@ -0,0 +1,5 @@
+module Acme::Client::Resources; end
+
+require 'acme/client/resources/registration'
+require 'acme/client/resources/challenges'
+require 'acme/client/resources/authorization'

data/lib/acme/{resources → client/resources}/authorization.rb

@@ -1,6 +1,6 @@
-class Acme::Resources::Authorization
-  HTTP01 = Acme::Resources::Challenges::HTTP01
-  DNS01 = Acme::Resources::Challenges::DNS01
+class Acme::Client::Resources::Authorization
+  HTTP01 = Acme::Client::Resources::Challenges::HTTP01
+  DNS01 = Acme::Client::Resources::Challenges::DNS01
 
   attr_reader :domain, :status, :http01, :dns01
 

data/lib/acme/client/resources/challenges.rb

@@ -0,0 +1,5 @@
+module Acme::Client::Resources::Challenges; end
+
+require 'acme/client/resources/challenges/base'
+require 'acme/client/resources/challenges/http01'
+require 'acme/client/resources/challenges/dns01'

data/lib/acme/{resources → client/resources}/challenges/base.rb

@@ -1,4 +1,4 @@
-class Acme::Resources::Challenges::Base
+class Acme::Client::Resources::Challenges::Base
 
   attr_reader :client, :status, :uri, :token, :error
 
@@ -28,6 +28,6 @@ class Acme::Resources::Challenges::Base
   end
 
   def crypto
-    @crypto ||= Acme::Crypto.new(@client.private_key)
+    @crypto ||= Acme::Client::Crypto.new(@client.private_key)
   end
 end

data/lib/acme/{resources → client/resources}/challenges/dns01.rb

@@ -1,6 +1,6 @@
-class Acme::Resources::Challenges::DNS01 < Acme::Resources::Challenges::Base
-  RECORD_NAME = '_acme-challenge'
-  RECORD_TYPE = 'TXT'
+class Acme::Client::Resources::Challenges::DNS01 < Acme::Client::Resources::Challenges::Base
+  RECORD_NAME = '_acme-challenge'.freeze
+  RECORD_TYPE = 'TXT'.freeze
 
   def record_name
     RECORD_NAME

data/lib/acme/{resources → client/resources}/challenges/http01.rb

@@ -1,5 +1,5 @@
-class Acme::Resources::Challenges::HTTP01 < Acme::Resources::Challenges::Base
-  CONTENT_TYPE = 'text/plain'
+class Acme::Client::Resources::Challenges::HTTP01 < Acme::Client::Resources::Challenges::Base
+  CONTENT_TYPE = 'text/plain'.freeze
 
   def content_type
     CONTENT_TYPE

data/lib/acme/{resources → client/resources}/registration.rb

@@ -1,4 +1,4 @@
-class Acme::Resources::Registration
+class Acme::Client::Resources::Registration
   attr_reader :id, :key, :contact, :uri, :next_uri, :recover_uri, :term_of_service_uri
 
   def initialize(client, response)

data/lib/acme/{version.rb → client/version.rb}

@@ -1,5 +1,5 @@
 module Acme
   class Client
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: acme-client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Charles Barbier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.9
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.9
@@ -156,20 +162,20 @@ files:
 - bin/console
 - bin/setup
 - lib/acme-client.rb
-- lib/acme/certificate.rb
-- lib/acme/certificate_request.rb
 - lib/acme/client.rb
-- lib/acme/crypto.rb
-- lib/acme/error.rb
-- lib/acme/faraday_middleware.rb
-- lib/acme/resources.rb
-- lib/acme/resources/authorization.rb
-- lib/acme/resources/challenges.rb
-- lib/acme/resources/challenges/base.rb
-- lib/acme/resources/challenges/dns01.rb
-- lib/acme/resources/challenges/http01.rb
-- lib/acme/resources/registration.rb
-- lib/acme/version.rb
+- lib/acme/client/certificate.rb
+- lib/acme/client/certificate_request.rb
+- lib/acme/client/crypto.rb
+- lib/acme/client/error.rb
+- lib/acme/client/faraday_middleware.rb
+- lib/acme/client/resources.rb
+- lib/acme/client/resources/authorization.rb
+- lib/acme/client/resources/challenges.rb
+- lib/acme/client/resources/challenges/base.rb
+- lib/acme/client/resources/challenges/dns01.rb
+- lib/acme/client/resources/challenges/http01.rb
+- lib/acme/client/resources/registration.rb
+- lib/acme/client/version.rb
 homepage: http://github.com/unixcharles/acme-client
 licenses:
 - MIT

data/lib/acme/error.rb

@@ -1,12 +0,0 @@
-class Acme::Error < StandardError
-  class NotFound < Acme::Error; end
-  class BadCSR < Acme::Error; end
-  class BadNonce < Acme::Error; end
-  class Connection < Acme::Error; end
-  class Dnssec < Acme::Error; end
-  class Malformed < Acme::Error; end
-  class ServerInternal < Acme::Error; end
-  class Acme::Tls < Acme::Error; end
-  class Unauthorized < Acme::Error; end
-  class UnknownHost < Acme::Error; end
-end

data/lib/acme/resources.rb

@@ -1,4 +0,0 @@
-module Acme::Resources; end
-require 'acme/resources/registration'
-require 'acme/resources/challenges'
-require 'acme/resources/authorization'

data/lib/acme/resources/challenges.rb

@@ -1,4 +0,0 @@
-module Acme::Resources::Challenges; end
-require 'acme/resources/challenges/base'
-require 'acme/resources/challenges/http01'
-require 'acme/resources/challenges/dns01'