Skip to content

fix(ssl): honor updated le-mail on certificate renewal #497

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

Open
mrrobot47 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

fix(ssl): honor updated le-mail on certificate renewal #497

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41ee4c2
fix(ssl): honor updated le-mail on certificate renewal
mrrobot47 Jun 30, 2026
47bc870
fix(ssl): use the caller's le-mail for renewal CSR
mrrobot47 Sep 24, 2026
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
12 changes: 8 additions & 4 deletions src/helper/Site_Letsencrypt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public function request( $domain, $altNames = [], $email, $force = false ) {
if ( $this->hasValidCertificate( $domain, $alternativeNames ) ) {
\EE::debug( "Certificate found for $domain, executing renewal" );

return $this->executeRenewal( $domain, $alternativeNames, $force );
return $this->executeRenewal( $domain, $alternativeNames, $email, $force );
}

\EE::debug( "No certificate found, executing first request for $domain" );
Expand Down Expand Up @@ -573,9 +573,10 @@ public function isRenewalNecessary( $domain ) {
*
* @param string $domain
* @param array $alternativeNames
* @param string $email
* @param bool $force
*/
private function executeRenewal( $domain, array $alternativeNames, $force = false ) {
private function executeRenewal( $domain, array $alternativeNames, $email, $force = false ) {
try {
// Check expiration date to avoid too much renewal
\EE::log( "Loading current certificate for $domain" );
Expand Down Expand Up @@ -615,7 +616,7 @@ private function executeRenewal( $domain, array $alternativeNames, $force = fals

// Distinguished name
\EE::debug( 'Loading domain distinguished name...' );
$distinguishedName = $this->getOrCreateDistinguishedName( $domain, $alternativeNames, \EE\Utils\get_config_value( 'le-mail' ) );
$distinguishedName = $this->getOrCreateDistinguishedName( $domain, $alternativeNames, $email );

// Order
$domains = array_merge( [ $domain ], $alternativeNames );
Expand Down Expand Up @@ -691,14 +692,17 @@ private function getOrCreateDistinguishedName( $domain, array $alternativeNames,
if ( $this->repository->hasDomainDistinguishedName( $domain ) ) {
$original = $this->repository->loadDomainDistinguishedName( $domain );

// Honor an updated le-mail on renewal; fall back to stored email only when none is passed.
$email_address = ! empty( $email ) ? $email : $original->getEmailAddress();

$distinguishedName = new DistinguishedName(
$domain,
$original->getCountryName(),
$original->getStateOrProvinceName(),
$original->getLocalityName(),
$original->getOrganizationName(),
$original->getOrganizationalUnitName(),
$original->getEmailAddress(),
$email_address,
$alternativeNames
);
} else {
Expand Down
Loading