letsencrypt-rails-heroku 1.1.3 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2e52fe099de5ee4ec2a76f81758b050ab66caf18
-  data.tar.gz: 9b14169c10ca75a1c13528112ac3676b544eba46
+SHA256:
+  metadata.gz: 34bfad9e6385886924b26bed9062f53175f4b1ca1ee7473c2c33828aa2cb34d0
+  data.tar.gz: e27e8e2fea3cdd4ebf9a253cd816c8af307fadae6c77e7535bc1c99baba41c0e
 SHA512:
-  metadata.gz: 493348f0881e833bf90e356dc272a0a4d809da85d50cc7ac753d0a303a5318e30182014be2ffad622beb64bbc278d47b61b8fb287a53153dadd09154940f31dd
-  data.tar.gz: 9832dd1809e3207587c479737db0e6d89f3cce519fa69566153713d298c7037f8fdb09b0dbbc916ddf48b07e1841397d0fa4cff0bcf7373565c474334f70ea3d
+  metadata.gz: cef68fb15ea48913116f1f65aa1f53a50202e9fb31cd53078546655cbd93b9b84b1c1cae8b381ebcfa7417243deedf5e7fcf9e9c8d12c8de0310840f37ee8378
+  data.tar.gz: ae93f4a569b1f40b3bec3c8fe9d19c43790c097570b814e29219d015344a948528268b68513dd047f5a5e5ff576e1c01664ecaf6f4479687f65dd18131ded062

data/CHANGELOG.md

@@ -1,3 +1,50 @@
+# 2.0.2
+
+ - Include OpenSSL::SSL::SSLError as a valid error we retry for when waiting
+   for the app to come back up.
+
+# 2.0.1
+
+ - Fixed a typo that broke renewals with existing certificates
+
+# 2.0.0 
+
+Thanks to [@mashedkeyboard](https://github.com/mashedkeyboard) for their
+work on ACME v2, saving registration, and DNS-based validation.
+
+ - *BREAKING* You must indicate your acceptance of Let's Encrypt's terms
+   and conditions by setting the `ACME_TERMS_AGREED` configuration variable.
+ - *BREAKING* Removed `ACME_ENDPOINT` environment variable reference. We never
+   documented that we support alternative endpoints, and we never tested it,
+   and the gem is called *letsencrypt*-rails-heroku, so let's not pretend.
+   Please get in touch if you were using this configuration variable, we'd
+   like to hear from you! Psst; you can still set `acme_directory` when
+   configuring the gem in an initializer.
+ - Use version 2 of the ACME API, paving the way for DNS validation.
+ - Save private key & key ID variables after registering with Let's Encrypt.
+   This will create two new permanent environment variables, `ACME_PRIVATE_KEY`
+   and `ACME_KEY_ID`.
+
+# 1.2.1
+
+ - Update `rack` and `nokogiri` dependencies due to reported vulnerabilities
+   in those libraries. Note that these don't affect letsencrypt-rails-heroku
+   directly.
+   [CVE-2018-16471](https://nvd.nist.gov/vuln/detail/CVE-2018-16471),
+   [CVE-2016-4658](https://nvd.nist.gov/vuln/detail/CVE-2016-4658),
+   [CVE-2017-5029](https://nvd.nist.gov/vuln/detail/CVE-2017-5029),
+   [CVE-2018-14404](https://nvd.nist.gov/vuln/detail/CVE-2018-14404),
+   [CVE-2017-18258](https://nvd.nist.gov/vuln/detail/CVE-2017-18258),
+   [CVE-2017-9050](https://nvd.nist.gov/vuln/detail/CVE-2017-9050).
+
+ - Stop using [jalada/platform-api](https://github.com/jalada/platform-api) 
+   because the newer version of the official version supports the API endpoints
+   we need now.
+
+# 1.2.0
+
+ - Support SSL Endpoint configuration, as well as the default SNI.
+
 # 1.1.3
 
  - 1.1.1 wasn't a correct fix for catching redirects during polling, this

data/Gemfile

@@ -1,9 +1,7 @@
 source "https://rubygems.org"
 
-gem 'acme-client', '~> 0.4.0'
-# SNI endpoints not supported yet:
-# <https://github.com/heroku/platform-api/issues/49>
-gem 'platform-api', github: 'jalada/platform-api', branch: 'master'
+gem 'acme-client', '~> 2.0'
+gem 'platform-api', '~> 2.2'
 
 group :development do
   gem "shoulda", ">= 0"

data/Gemfile.lock

@@ -1,15 +1,7 @@
-GIT
-  remote: git://github.com/jalada/platform-api.git
-  revision: 45ddb3c1a7e2c7f85d979c0791db18e99affb237
-  branch: master
-  specs:
-    platform-api (0.8.0)
-      heroics (~> 0.0.17)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (0.4.1)
+    acme-client (2.0.3)
       faraday (~> 0.9, >= 0.9.1)
     activesupport (5.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -23,7 +15,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
     erubis (2.7.0)
-    excon (0.51.0)
+    excon (0.62.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     git (1.3.0)
@@ -34,15 +26,14 @@ GEM
       hashie (>= 3.4)
       oauth2 (~> 1.0)
     hashie (3.4.6)
-    heroics (0.0.17)
+    heroics (0.0.25)
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
-      netrc
     highline (1.7.8)
     i18n (0.7.0)
-    json (1.8.3)
+    json (1.8.6)
     juwelier (2.1.3)
       builder
       bundler (>= 1.13)
@@ -54,22 +45,24 @@ GEM
       rdoc
       semver
     jwt (1.5.6)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.4.0)
     minitest (5.9.0)
-    moneta (0.8.0)
-    multi_json (1.12.1)
+    moneta (1.0.0)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    netrc (0.11.0)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    rack (2.0.1)
+    platform-api (2.2.0)
+      heroics (~> 0.0.25)
+      moneta (~> 1.0.0)
+    rack (2.0.7)
     rake (12.0.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -93,13 +86,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  acme-client (~> 0.4.0)
+  acme-client (~> 2.0)
   bundler (~> 1.0)
   juwelier (~> 2.1.0)
-  platform-api!
+  platform-api (~> 2.2)
   rdoc (~> 3.12)
   shoulda
   simplecov
 
 BUNDLED WITH
-   1.13.6
+   1.16.6

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Pixie Labs
+Copyright (c) 2020 Pixie Labs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,5 +1,8 @@
 # LetsEncrypt & Rails & Heroku
 
+### Deprecated: Heroku now support [free automated SSL certificates for paid dynos](https://devcenter.heroku.com/articles/automated-certificate-management), you should use that instead of this gem unless your situation is covered by the [known limitations](https://devcenter.heroku.com/articles/automated-certificate-management#known-limitations) of ACM, e.g. your app runs in Heroku Private Spaces.
+
+
 [![Gem Version](https://badge.fury.io/rb/letsencrypt-rails-heroku.svg)](https://badge.fury.io/rb/letsencrypt-rails-heroku)
 
 This gem is a complete solution for securing your Ruby on Rails application
@@ -14,7 +17,9 @@ repository.
 
 ## Requirements
 
- - You must be using hobby or professional dynos to use free SNI-based SSL. Find out more on [Heroku's documentation page about SSL](https://devcenter.heroku.com/articles/ssl).
+ - You must be using hobby or professional dynos to use free SNI-based SSL.
+   Find out more on [Heroku's documentation page about
+   SSL](https://devcenter.heroku.com/articles/ssl).
 
  - You should have already configured your app DNS as per [Heroku's
    documentation](https://devcenter.heroku.com/articles/custom-domains).
@@ -24,10 +29,6 @@ repository.
 Add the gem to your Gemfile:
 
 ```
-# Until the new API calls are generally available, you must manually specify my fork
-# of the Heroku API gem:
-gem 'platform-api', git: 'https://github.com/jalada/platform-api', branch: 'master'
-
 gem 'letsencrypt-rails-heroku', group: 'production'
 ```
 
@@ -60,19 +61,27 @@ end
 
 ## Configuring
 
-By default the gem will try to use the following set of configuration variables,
-which you should set.
+By default the gem will try to use the following set of configuration
+variables. You must set:
+
+ * `ACME_EMAIL`: Your email address, should be valid.
+ * `ACME_TERMS_AGREED`: Existence of this environment variable represents your
+   agreement to [Let's Encrypt's terms of service](https://letsencrypt.org/repository/).
+ * `HEROKU_TOKEN`: An API token for this app. See below
+ * `HEROKU_APP`: Name of Heroku app e.g. bottomless-cavern-7173
+
+You can also set:
 
  * `ACME_DOMAIN`: Comma separated list of domains for which you want
    certificates, e.g. `example.com,www.example.com`. Your Heroku app should be
-   configured to answer to all these domains, because LetsEncrypt will make a
+   configured to answer to all these domains, because Let's Encrypt will make a
    request to verify ownership.
 
    If you leave this blank, the gem will try and use the Heroku API to get a 
    list of configured domains for your app, and verify all of them.
- * `ACME_EMAIL`: Your email address, should be valid.
- * `HEROKU_TOKEN`: An API token for this app. See below
- * `HEROKU_APP`: Name of Heroku app e.g. bottomless-cavern-7173
+ * `SSL_TYPE`: Optional: One of `sni` or `endpoint`, defaults to `sni`.
+   `endpoint` requires your app to have an
+   [SSL endpoint addon](https://elements.heroku.com/addons/ssl) configured.
 
 The gem itself will temporarily create additional environment variables during
 the challenge / validation process:
@@ -80,6 +89,14 @@ the challenge / validation process:
  * `ACME_CHALLENGE_FILENAME`: The path of the file LetsEncrypt will request.
  * `ACME_CHALLENGE_FILE_CONTENT`: The content of that challenge file.
 
+It will also create two permanent environment variables after the first run:
+
+ * `ACME_PRIVATE_KEY`: Private key used to create requests for certificates.
+ * `ACME_KEY_ID`: Key ID assigned to your private key by Let's Encrypt.
+
+If you remove these, a new account will be created and new environment
+variables will be set.
+
 ## Creating a Heroku token
 
 Use the `heroku-oauth` toolbelt plugin to generate an access token suitable
@@ -123,10 +140,13 @@ You can see these details by typing `heroku domains`.
 
 ## Adding a scheduled task
 
-You should add a scheduled task on Heroku to renew the certificate. The
-scheduled task should be configured to run `rake letsencrypt:renew` as often
-as you want to renew your certificate. Letsencrypt certificates are valid for
-90 days, but there's no harm renewing them more frequently than that.
+You should add a scheduled task on Heroku to renew the certificate. If you 
+are unfamiliar with how to do this, take a look at [Heroku's documentation
+on their scheduler addon](https://devcenter.heroku.com/articles/scheduler).
+
+The scheduled task should be configured to run `rake letsencrypt:renew` as
+often as you want to renew your certificate. Letsencrypt certificates are valid
+for 90 days, but there's no harm renewing them more frequently than that.
 
 Heroku Scheduler only lets you run a task as infrequently as once a day, but
 you don't want to renew your SSL certificate every day (you will hit
@@ -135,7 +155,7 @@ run less frequently using a shell control statement. For example to renew your
 certificate on the 1st day of every month:
 
 ```
-if [ "$(date +%d)" = 01 ]; then rake letsencrypt:renew; fi
+if [ "$(date +%d)" = 01 ]; then bundle exec rake letsencrypt:renew; fi
 ```
 
 Source: [blog.dbrgn.ch](https://blog.dbrgn.ch/2013/10/4/heroku-schedule-weekly-monthly-tasks/)
@@ -145,12 +165,13 @@ Source: [blog.dbrgn.ch](https://blog.dbrgn.ch/2013/10/4/heroku-schedule-weekly-m
 Suggestions and pull requests are welcome in improving the situation with the
 following security considerations:
 
- - When configuring this gem you must add a non-expiring Heroku API token
-   into your application environment. Your collaborators could use this
-   token to impersonate the account it was created with when accessing
-   the Heroku API. This is important if your account has access to other apps
-   that your collaborators don’t. Additionally, if your application environment was
-   leaked this would give the attacker access to the Heroku API as your user account. 
+ - When configuring this gem you must add a non-expiring Heroku API token into
+   your application environment. Your collaborators could use this token to
+   impersonate the account it was created with when accessing the Heroku API.
+   This is important if your account has access to other apps that your
+   collaborators don’t. Additionally, if your application environment was
+   leaked this would give the attacker access to the Heroku API as your user
+   account. 
    [More information about Heroku’s API and oAuth](https://devcenter.heroku.com/articles/oauth#direct-authorization).
 
    You should create the API token from a suitably locked-down account.
@@ -167,21 +188,19 @@ following security considerations:
 
 ### Common name invalid errors (security certificate is from *.herokuapp.com)
 
-Your domain is still configured as a CNAME or ALIAS to `your-app.herokuapp.com`. Check the output of `heroku domains` matches your DNS configuration. When you add an SNI cert to an app for the first time [the DNS target changes](https://devcenter.heroku.com/articles/custom-domains#view-existing-domains).
+Your domain is still configured as a CNAME or ALIAS to
+`your-app.herokuapp.com`. Check the output of `heroku domains` matches your DNS
+configuration. When you add an SNI cert to an app for the first time
+[the DNS target changes](https://devcenter.heroku.com/articles/custom-domains#view-existing-domains).
 
 ## To-do list
 
 - Persist account key, or at least give the option of using an existing one, so
   we don’t register with LetsEncrypt over and over.
 
-- Stop using a fork of the `platform-api` gem once it supports the SNI endpoint
-  API calls. [See issue #49 of the platform-api gem](https://github.com/heroku/platform-api/issues/49).
-
-- Provide instructions for running the gem decoupled from the app it is 
+- Provide instructions for running the gem decoupled from the app it is
   securing, for the paranoid.
 
-- Support non-SNI Heroku SSL too.
-
 ## Contributing
 
 - Check out the latest master to make sure the feature hasn't been implemented
@@ -201,4 +220,5 @@ Your domain is still configured as a CNAME or ALIAS to `your-app.herokuapp.com`.
 
 1. Bump the version: `rake version:bump:{major,minor,patch}`.
 2. Update `CHANGELOG.md` & commit.
-3. Use `rake release` to regenerate gemspec, push a tag to git, and push a new `.gem` to rubygems.org
+3. Use `rake release` to regenerate gemspec, push a tag to git, and push a new
+   `.gem` to rubygems.org.

data/VERSION

@@ -1 +1 @@
-1.1.3
+2.0.2

data/letsencrypt-rails-heroku.gemspec

@@ -2,19 +2,20 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: letsencrypt-rails-heroku 1.1.3 ruby lib
+# stub: letsencrypt-rails-heroku 2.0.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "letsencrypt-rails-heroku"
-  s.version = "1.1.3"
+  s.name = "letsencrypt-rails-heroku".freeze
+  s.version = "2.0.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Pixie Labs", "David Somers", "Abigail McPhillips"]
-  s.date = "2017-02-28"
-  s.description = "This gem automatically handles creation, renewal, and applying SSL certificates from LetsEncrypt to your Heroku account."
-  s.email = "team@pixielabs.io"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Pixie Labs".freeze, "David Somers".freeze, "Abigail McPhillips".freeze]
+  s.date = "2020-07-24"
+  s.description = "This gem automatically handles creation, renewal, and applying SSL certificates from LetsEncrypt to your Heroku account.".freeze
+  s.email = "team@pixielabs.io".freeze
   s.extra_rdoc_files = [
+    "CHANGELOG.md",
     "LICENSE.txt",
     "README.md"
   ]
@@ -35,39 +36,39 @@ Gem::Specification.new do |s|
     "lib/letsencrypt-rails-heroku/railtie.rb",
     "lib/tasks/letsencrypt.rake"
   ]
-  s.homepage = "https://github.com/pixielabs/letsencrypt-rails-heroku"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Automatic LetsEncrypt certificates in your Rails app on Heroku"
+  s.homepage = "https://github.com/pixielabs/letsencrypt-rails-heroku".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "3.0.8".freeze
+  s.summary = "Automatic LetsEncrypt certificates in your Rails app on Heroku".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<acme-client>, ["~> 0.4.0"])
-      s.add_runtime_dependency(%q<platform-api>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<juwelier>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_runtime_dependency(%q<acme-client>.freeze, ["~> 2.0"])
+      s.add_runtime_dependency(%q<platform-api>.freeze, ["~> 2.2"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<acme-client>, ["~> 0.4.0"])
-      s.add_dependency(%q<platform-api>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<acme-client>.freeze, ["~> 2.0"])
+      s.add_dependency(%q<platform-api>.freeze, ["~> 2.2"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+      s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<acme-client>, ["~> 0.4.0"])
-    s.add_dependency(%q<platform-api>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<acme-client>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<platform-api>.freeze, ["~> 2.2"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.0"])
+    s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
   end
 end
 

data/lib/letsencrypt-rails-heroku/exceptions.rb

@@ -1,12 +1,16 @@
 module Letsencrypt
   module Error
-    # Exception raised when LetsEncrypt encounters an issue verifying the challenge.
+    # LetsEncrypt encountered an issue verifying the challenge.
     class VerificationError < StandardError; end
-    # Exception raised when challenge URL is not available.
+    # LetsEncrypt encountered an issue finalizing the order.
+    class FinalizationError < StandardError; end
+    # Challenge URL is not available.
     class ChallengeUrlError < StandardError; end
-    # Exception raised on timeout of challenge verification.
+    # Domain verification took longer than we'd like.
     class VerificationTimeoutError < StandardError; end
-    # Exception raised when an error occurs adding the certificate to Heroku.
+    # Order finalization took longer than we'd like.
+    class FinalizationTimeoutError < StandardError; end
+    # Error adding the certificate to Heroku.
     class HerokuCertificateError < StandardError; end
   end
 end

data/lib/letsencrypt-rails-heroku/letsencrypt.rb

@@ -14,24 +14,36 @@ module Letsencrypt
       configuration.acme_challenge_file_content
   end
 
+  def self.registered?
+    configuration.acme_private_key && configuration.acme_key_id
+  end
+
   class Configuration
-    attr_accessor :heroku_token, :heroku_app, :acme_email, :acme_domain, :acme_endpoint
+    attr_accessor :heroku_token, :heroku_app, :acme_email, :acme_domain,
+      :acme_directory, :ssl_type, :acme_terms_agreed
     
     # Not settable by user; part of the gem's behaviour.
-    attr_reader :acme_challenge_filename, :acme_challenge_file_content
+    attr_reader :acme_challenge_filename, :acme_challenge_file_content,
+      :acme_private_key, :acme_key_id
 
     def initialize
       @heroku_token = ENV["HEROKU_TOKEN"]
       @heroku_app = ENV["HEROKU_APP"]
       @acme_email = ENV["ACME_EMAIL"]
       @acme_domain = ENV["ACME_DOMAIN"]
-      @acme_endpoint = ENV["ACME_ENDPOINT"] || 'https://acme-v01.api.letsencrypt.org/'
+      @acme_directory = 'https://acme-v02.api.letsencrypt.org/directory'
+      @acme_terms_agreed = ENV["ACME_TERMS_AGREED"]
+      @ssl_type = ENV["SSL_TYPE"] || 'sni'
+
       @acme_challenge_filename = ENV["ACME_CHALLENGE_FILENAME"]
       @acme_challenge_file_content = ENV["ACME_CHALLENGE_FILE_CONTENT"]
+
+      @acme_private_key = ENV["ACME_PRIVATE_KEY"]
+      @acme_key_id = ENV["ACME_KEY_ID"]
     end
 
     def valid?
-      heroku_token && heroku_app && acme_email
+      heroku_token && heroku_app && acme_email && acme_terms_agreed
     end
   end
 end

data/lib/tasks/letsencrypt.rake

@@ -8,24 +8,48 @@ namespace :letsencrypt do
   desc 'Renew your LetsEncrypt certificate'
   task :renew do
     # Check configuration looks OK
-    abort "letsencrypt-rails-heroku is configured incorrectly. Are you missing an environment variable or other configuration? You should have a heroku_token, heroku_app and acme_email configured either via a `Letsencrypt.configure` block in an initializer or as environment variables." unless Letsencrypt.configuration.valid?
+    abort "letsencrypt-rails-heroku is configured incorrectly. Are you missing an environment variable or other configuration? You should have heroku_token, heroku_app, acme_email and acme_terms_agreed configured either via a `Letsencrypt.configure` block in an initializer or as environment variables." unless Letsencrypt.configuration.valid?
 
     # Set up Heroku client
     heroku = PlatformAPI.connect_oauth Letsencrypt.configuration.heroku_token
     heroku_app = Letsencrypt.configuration.heroku_app
 
-    # Create a private key
-    print "Creating account key..."
-    private_key = OpenSSL::PKey::RSA.new(4096)
-    puts "Done!"
+    if Letsencrypt.registered?
+      puts "Using existing registration details"
+      private_key = OpenSSL::PKey::RSA.new(Letsencrypt.configuration.acme_private_key)
+      key_id = Letsencrypt.configuration.acme_key_id
+    else
+      # Create a private key
+      print "Creating account key..."
+      private_key = OpenSSL::PKey::RSA.new(4096)
+      puts "Done!"
 
-    client = Acme::Client.new(private_key: private_key, endpoint: Letsencrypt.configuration.acme_endpoint, connection_options: { request: { open_timeout: 5, timeout: 5 } })
+      client = Acme::Client.new(private_key: private_key,
+                                directory: Letsencrypt.configuration.acme_directory,
+                                connection_options: { 
+                                  request: { 
+                                    open_timeout: 5,
+                                    timeout: 5
+                                  }
+                                })
 
-    print "Registering with LetsEncrypt..."
-    registration = client.register(contact: "mailto:#{Letsencrypt.configuration.acme_email}")
+      print "Registering with LetsEncrypt..."
+      account = client.new_account(contact: "mailto:#{Letsencrypt.configuration.acme_email}",
+                                   terms_of_service_agreed: true)
 
-    registration.agree_terms
-    puts "Done!"
+      key_id = account.kid
+      puts "Done!"
+      print "Saving account details as configuration variables..."
+      heroku.config_var.update(heroku_app,
+                               'ACME_PRIVATE_KEY' => private_key.to_pem,
+                               'ACME_KEY_ID' => account.kid)
+      puts "Done!"
+    end
+
+    # Make a new Acme::Client with whichever private_key & key_id we ended up with.
+    client = Acme::Client.new(private_key: private_key,
+                              directory: Letsencrypt.configuration.acme_directory,
+                              kid: key_id)
 
     domains = []
     if Letsencrypt.configuration.acme_domain
@@ -36,11 +60,12 @@ namespace :letsencrypt do
       puts "Using #{domains.length} configured Heroku domain(s) for this app..."
     end
 
-    domains.each do |domain|
-      puts "Performing verification for #{domain}:"
+    order = client.new_order(identifiers: domains)
 
-      authorization = client.authorize(domain: domain)
-      challenge = authorization.http01
+    order.authorizations.each do |authorization|
+      puts "Performing verification for #{authorization.domain}:"
+
+      challenge = authorization.http
 
       print "Setting config vars on Heroku..."
       heroku.config_var.update(heroku_app, {
@@ -62,7 +87,7 @@ namespace :letsencrypt do
 
       begin
         open("http://#{hostname}/#{challenge.filename}").read
-      rescue OpenURI::HTTPError, RuntimeError => e
+      rescue OpenSSL::SSL::SSLError, OpenURI::HTTPError, RuntimeError => e
         raise e if e.is_a?(RuntimeError) && !e.message.include?("redirection forbidden")
         if Time.now - start_time <= 60
           puts "Error fetching challenge, retrying... #{e.message}"
@@ -78,24 +103,23 @@ namespace :letsencrypt do
 
       print "Giving LetsEncrypt some time to verify..."
       # Once you are ready to serve the confirmation request you can proceed.
-      challenge.request_verification # => true
-      challenge.verify_status # => 'pending'
+      challenge.request_validation
 
       start_time = Time.now
-
-      while challenge.verify_status == 'pending'
+      while challenge.status == 'pending'
         if Time.now - start_time >= 30
           failure_message = "Failed - timed out waiting for challenge verification."
           raise Letsencrypt::Error::VerificationTimeoutError, failure_message
         end
-        sleep(3)
+        sleep(2)
+        challenge.reload
       end
 
       puts "Done!"
 
-      unless challenge.verify_status == 'valid'
+      unless challenge.status == 'valid'
         puts "Problem verifying challenge."
-        failure_message = "Status: #{challenge.verify_status}, Error: #{challenge.error}"
+        failure_message = "Status: #{challenge.status}, Error: #{challenge.error}"
         raise Letsencrypt::Error::VerificationError, failure_message
       end
 
@@ -110,30 +134,61 @@ namespace :letsencrypt do
     })
 
     # Create CSR
-    csr = Acme::Client::CertificateRequest.new(names: domains)
+    csr_private_key = OpenSSL::PKey::RSA.new 4096
+    csr = Acme::Client::CertificateRequest.new(names: domains,
+                                               private_key: csr_private_key)
 
+    print "Asking LetsEncrypt to finalize our certificate order..."
     # Get certificate
-    certificate = client.new_certificate(csr) # => #<Acme::Client::Certificate ....>
+    order.finalize(csr: csr)
+
+    # Wait for order to process
+    start_time = Time.now
+    while order.status == 'processing'
+      if Time.now - start_time >= 30
+        failure_message = "Failed - timed out waiting for order finalization"
+        raise Letsencrypt::Error::FinalizationTimeoutError, failure_message
+      end
+      sleep(2)
+      order.reload
+    end
+
+    puts "Done!"
+
+    unless order.status == 'valid'
+      failure_message = "Problem finalizing order - status: #{order.status}"
+      raise Letsencrypt::Error::FinalizationError, failure_message
+    end
+
+    certificate = order.certificate # => PEM-formatted certificate
 
     # Send certificates to Heroku via API
 
-    # First check for existing certificates:
-    certificates = heroku.sni_endpoint.list(heroku_app)
+    endpoint = case Letsencrypt.configuration.ssl_type
+               when 'sni'
+                 heroku.sni_endpoint
+               when 'endpoint'
+                 heroku.ssl_endpoint
+               end
+
+    certificate_info = {
+      certificate_chain: certificate,
+      private_key: csr_private_key.to_pem
+    }
+
+    # Fetch existing certificate from Heroku (if any). We just use the first
+    # one; if someone has more than one, they're probably not actually using
+    # this gem. Could also be an error?
+    existing_certificate = endpoint.list(heroku_app)[0]
 
     begin
-      if certificates.any?
-        print "Updating existing certificate #{certificates[0]['name']}..."
-        heroku.sni_endpoint.update(heroku_app, certificates[0]['name'], {
-          certificate_chain: certificate.fullchain_to_pem,
-          private_key: certificate.request.private_key.to_pem
-        })
+      if existing_certificate
+        print "Updating existing certificate #{existing_certificate['name']}..."
+        endpoint.update(heroku_app, existing_certificate['name'], certificate_info)
         puts "Done!"
       else
         print "Adding new certificate..."
-        heroku.sni_endpoint.create(heroku_app, {
-          certificate_chain: certificate.fullchain_to_pem,
-          private_key: certificate.request.private_key.to_pem
-        })
+        endpoint.create(heroku_app, certificate_info)
         puts "Done!"
       end
     rescue Excon::Error::UnprocessableEntity => e

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: letsencrypt-rails-heroku
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 2.0.2
 platform: ruby
 authors:
 - Pixie Labs
 - David Somers
 - Abigail McPhillips
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acme-client
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: platform-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ email: team@pixielabs.io
 executables: []
 extensions: []
 extra_rdoc_files:
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 files:
@@ -138,7 +139,7 @@ homepage: https://github.com/pixielabs/letsencrypt-rails-heroku
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -153,9 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Automatic LetsEncrypt certificates in your Rails app on Heroku
 test_files: []