diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-30 21:08:07 +0300 |
commit | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (patch) | |
tree | e489b6e87557d3f6d8a94f2e7d4d47e633d646b5 /lib/gitlab/lets_encrypt | |
parent | 4e9acbfba3682c552b3de707c535e6257ef41054 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/lets_encrypt')
-rw-r--r-- | lib/gitlab/lets_encrypt/challenge.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/lets_encrypt/order.rb | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/gitlab/lets_encrypt/challenge.rb b/lib/gitlab/lets_encrypt/challenge.rb index 136268c974b..7775cbd0360 100644 --- a/lib/gitlab/lets_encrypt/challenge.rb +++ b/lib/gitlab/lets_encrypt/challenge.rb @@ -7,7 +7,7 @@ module Gitlab @acme_challenge = acme_challenge end - delegate :token, :file_content, :status, :request_validation, to: :acme_challenge + delegate :token, :file_content, :status, :request_validation, :error, to: :acme_challenge private diff --git a/lib/gitlab/lets_encrypt/order.rb b/lib/gitlab/lets_encrypt/order.rb index 9c2365f98a8..656964f77f9 100644 --- a/lib/gitlab/lets_encrypt/order.rb +++ b/lib/gitlab/lets_encrypt/order.rb @@ -8,7 +8,6 @@ module Gitlab end def new_challenge - authorization = @acme_order.authorizations.first challenge = authorization.http ::Gitlab::LetsEncrypt::Challenge.new(challenge) end @@ -22,11 +21,19 @@ module Gitlab acme_order.finalize(csr: csr) end + def challenge_error + authorization.challenges.first&.error + end + delegate :url, :status, :expires, :certificate, to: :acme_order private attr_reader :acme_order + + def authorization + @acme_order.authorizations.first + end end end end |