Skip to content

Purge expired domains that fail the allow_domain check #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 20, 2020
Merged

Purge expired domains that fail the allow_domain check #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions lib/resty/auto-ssl/jobs/renewal.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ local function renew_check_cert_unlock(domain, storage, local_lock, distributed_
end
end

local function delete_cert_if_expired(domain, storage, cert)
-- Give up on renewing this certificate if we didn't manage to renew
-- it before the expiration date
if cert["expiry"] and cert["expiry"] < ngx.now() then
ngx.log(ngx.WARN, "auto-ssl: existing certificate is expired, deleting: ", domain)
storage:delete_cert(domain)
end
end

local function renew_check_cert(auto_ssl_instance, storage, domain)
-- Before issuing a cert, create a local lock to ensure multiple workers
-- don't simultaneously try to register the same cert.
Expand Down Expand Up @@ -138,6 +147,7 @@ local function renew_check_cert(auto_ssl_instance, storage, domain)
local allow_domain = auto_ssl_instance:get("allow_domain")
if not allow_domain(domain, auto_ssl_instance, nil, true) then
ngx.log(ngx.NOTICE, "auto-ssl: domain not allowed, not renewing: ", domain)
delete_cert_if_expired(domain, storage, cert)
renew_check_cert_unlock(domain, storage, local_lock, distributed_lock_value)
return
end
Expand Down Expand Up @@ -175,13 +185,7 @@ local function renew_check_cert(auto_ssl_instance, storage, domain)
local _, issue_err = ssl_provider.issue_cert(auto_ssl_instance, domain)
if issue_err then
ngx.log(ngx.ERR, "auto-ssl: issuing renewal certificate failed: ", issue_err)

-- Give up on renewing this certificate if we didn't manage to renew
-- it before the expiration date
if cert["expiry"] and cert["expiry"] < ngx.now() then
ngx.log(ngx.WARN, "auto-ssl: existing certificate is expired, deleting: ", domain)
storage:delete_cert(domain)
end
delete_cert_if_expired(domain, storage, cert)
end

renew_check_cert_unlock(domain, storage, local_lock, distributed_lock_value)
Expand Down