acme-cli 0.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c369f88a826a9465922871deb4fbd8b3c232414
-  data.tar.gz: c706f4fa29eed7d87f3a3e421e4bcd7cea0fa43c
+SHA256:
+  metadata.gz: c426da565e907b19f9a87cd785aef871d1e9c43bc7ce91380376a459198abb49
+  data.tar.gz: fdecdc6b9a931dc8526fd52b53e7b7c5c2882af978ad6d44f5035877a0e38a4b
 SHA512:
-  metadata.gz: bcd2a95fea94d400d9e118c8c68034e12ddf0dd9f6e768367c33f8e0d454ab2e187502191c593c820d558e34da91be8898ba5b4c03ec0e44b0d11b871eba3218
-  data.tar.gz: c9dec9b4a406dc85135d1d746e0bffde678d3fdcfe4fc354496bc6203104ff0e459daa18b3703977405f2c7e70195ec0ca61ecee85c1aaa5ddc397466d5507df
+  metadata.gz: cf06389946f95ed0b16cfa74101ffee3012be8b0b20618e497bdeeac58998ff28295ab8b00cbefbe47d5fdd63e262f31b78ef495bc0befacfb8f3be408f13487
+  data.tar.gz: a9276b7d8b2aeed105601c626b5e1b5f7db00009f3a483a9f6e176d485f0053d41988b952666d0433e2875c03b05f6aa8d58112aee26221e7d225db240501827

data/acme-cli.gemspec

@@ -10,16 +10,16 @@ Gem::Specification.new do |spec|
   spec.email         = ["stwienert@gmail.com"]
 
   spec.summary       = %q{slim ACME (e. g. letsencrypt) client for quickly authorizing (multiple) domains and issuing certificates}
-  spec.homepage      = "https://github.com/zealot28/acme-cli"
+  spec.homepage      = "https://github.com/zealot28/ruby-acme-cli"
   spec.license       = "MIT"
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.1.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'acme-client', '>= 0.2.4'
+  spec.add_runtime_dependency 'acme-client', '>= 2.0.0'
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'colorize'
 

data/lib/letsencrypt/cli/acme_wrapper.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'acme-client'
 require 'logger'
 require 'colorize'
+require_relative 'support/certificate'
 
 class AcmeWrapper
   def initialize(options)
@@ -22,28 +23,34 @@ class AcmeWrapper
   end
 
   def client
-    @client ||= Acme::Client.new(private_key: account_key, endpoint: endpoint)
+    @client ||= Acme::Client.new(private_key: account_key, directory: directory)
   end
 
-  def authorize(domain)
+  def create_order(domains)
+    log "Creating order for domains #{domains.to_s.blue}"
+    return client.new_order(identifiers: domains)
+  end
+
+  def authorize(authorization)
+    domain = authorization.domain
     FileUtils.mkdir_p(@options[:webroot_path])
     log "Authorizing #{domain.blue}.."
-    authorization = client.authorize(domain: domain)
-
-    challenge = authorization.http01
+    challenge = authorization.http
 
     challenge_file = File.join(@options[:webroot_path], challenge.filename.split('/').last)
     log "Writing challenge to #{challenge_file}", :debug
     File.write(challenge_file, challenge.file_content)
 
-    challenge.request_verification
+    challenge.request_validation
 
-    5.times do
+    10.times do
       log "Checking verification...", :debug
       sleep 1
-      break if challenge.verify_status != 'pending'
+      challenge.reload
+      break if challenge.status != 'pending'
     end
-    if challenge.verify_status == 'valid'
+
+    if challenge.status == 'valid'
       log "Authorization successful for #{domain.green}"
       File.unlink(challenge_file)
       true
@@ -84,7 +91,13 @@ class AcmeWrapper
     csr.version = 2
     csr.public_key = certificate_private_key.public_key
     csr.sign(certificate_private_key, OpenSSL::Digest::SHA256.new)
-    certificate = client.new_certificate(csr)
+    order = create_order(domains)
+    order.finalize(csr: csr)
+    while order.status == 'processing'
+      sleep(1)
+      order.reload
+    end
+    certificate = Certificate.new(order.certificate)
     File.write(@options[:fullchain_path], certificate.fullchain_to_pem)
     File.write(@options[:chain_path], certificate.chain_to_pem)
     File.write(@options[:certificate_path], certificate.to_pem)
@@ -114,7 +127,7 @@ class AcmeWrapper
       return false
     end
     cert = OpenSSL::X509::Certificate.new(File.read(path))
-    if client.revoke_certificate(cert)
+    if client.revoke(certificate: cert)
       log "Certificate '#{path}' was revoked", :info
     end
     true
@@ -147,14 +160,14 @@ class AcmeWrapper
       exit 2
     end
 
-    false 
+    false
   end
 
-  def endpoint
+  def directory
     if @options[:test]
-      "https://acme-staging.api.letsencrypt.org"
+      "https://acme-staging-v02.api.letsencrypt.org/directory"
     else
-      "https://acme-v01.api.letsencrypt.org"
+      "https://acme-v02.api.letsencrypt.org/directory"
     end
   end
 

data/lib/letsencrypt/cli/app.rb

@@ -20,8 +20,7 @@ module Letsencrypt
           wrapper.log "not an email", :fatal
           exit 1
         end
-        registration = wrapper.client.register(contact: "mailto:" + email)
-        registration.agree_terms
+        registration = wrapper.client.new_account(contact: "mailto:" + email, terms_of_service_agreed: true)
         wrapper.log "Account created, Terms accepted"
       end
 
@@ -38,8 +37,9 @@ module Letsencrypt
       method_option :webroot_path, desc: "Path to mapped .well-known/acme-challenge folder (no subdirs will be created)", aliases: '-w', required: true
       def authorize(*domains)
         rc = 0
-        domains.each do |domain|
-          if !wrapper.authorize(domain)
+        order = wrapper.create_order(domains)
+        order.authorizations.each do |authorization|
+          if !wrapper.authorize(authorization)
             rc = 1
           end
         end

data/lib/letsencrypt/cli/support/certificate.rb

@@ -0,0 +1,29 @@
+class Certificate
+  extend Forwardable
+
+  attr_reader :x509, :x509_chain
+
+  def_delegators :x509, :to_pem, :to_der
+
+  def initialize(fullchain_certificate)
+    fullchain_array = fullchain_certificate.strip.split("\n\n")
+    @x509 = OpenSSL::X509::Certificate.new(fullchain_array.first)
+    @x509_chain = fullchain_array[1..-1].map { |cert| OpenSSL::X509::Certificate.new(cert) }
+  end
+
+  def chain_to_pem
+    x509_chain.map(&:to_pem).join("\n")
+  end
+
+  def x509_fullchain
+    [x509, *x509_chain]
+  end
+
+  def fullchain_to_pem
+    x509_fullchain.map(&:to_pem).join("\n")
+  end
+
+  def common_name
+    x509.subject.to_a.find { |name, _, _| name == 'CN' }[1]
+  end
+end

data/lib/letsencrypt/cli/version.rb

@@ -1,5 +1,5 @@
 module Letsencrypt
   module Cli
-    VERSION = "0.6.1"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acme-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -203,8 +203,9 @@ files:
 - lib/letsencrypt/cli.rb
 - lib/letsencrypt/cli/acme_wrapper.rb
 - lib/letsencrypt/cli/app.rb
+- lib/letsencrypt/cli/support/certificate.rb
 - lib/letsencrypt/cli/version.rb
-homepage: https://github.com/zealot28/acme-cli
+homepage: https://github.com/zealot28/ruby-acme-cli
 licenses:
 - MIT
 metadata: {}
@@ -216,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -224,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: slim ACME (e. g. letsencrypt) client for quickly authorizing (multiple) domains