Skip to content

temporarily revert internal sans use - #10508

Closed
bmw wants to merge 2 commits into
mainfrom
test-revert-internal-sans
Closed

bmw wants to merge 2 commits into
mainfrom
test-revert-internal-sans

Conversation

@bmw

@bmw bmw commented Dec 8, 2025 •

Copy link
Copy Markdown
Member

this PR temporarily reverts #10468 in response to #10506

the reversion is pretty clean, but there were some merge conflicts:

diff --cc certbot/src/certbot/_internal/main.py
index 6aea12f1f,9d3fe59cf..000000000
--- a/certbot/src/certbot/_internal/main.py
+++ b/certbot/src/certbot/_internal/main.py
@@@ -1062,16 -1058,8 +1058,18 @@@ def _install_cert(config: configuration
                           configuration.NamespaceConfig] = lineage if lineage else config
      assert path_provider.cert_path is not None
  
++<<<<<<< HEAD
 +    domains, ip_addresses = san.split(sans)
 +    if len(ip_addresses) > 0:
 +        # Our apache and nginx plugins are currently relying on this check for a user friendly error
 +        # message about their lack of support for IP certificates. If you're removing this check,
 +        # please check that the plugins can process IP addresses.
 +        raise errors.ConfigurationError("Enhancements not supported for IP address certificates")
 +
++=======
++>>>>>>> parent of d638200d1 (Initial IP address support: use san.SAN types internally (#10468))
      le_client.deploy_certificate(domains, path_provider.key_path, path_provider.cert_path,
                                   path_provider.chain_path, path_provider.fullchain_path)
- 
      le_client.enhance_config(domains, path_provider.chain_path)
  
  
@@@ -1242,16 -1226,9 +1236,19 @@@ def enhance(config: configuration.Names
      config.certname = cert_manager.get_certnames(
          config, "enhance", allow_multiple=False,
          custom_prompt=certname_question)[0]
-     cert_sans = cert_manager.sans_for_certname(config, config.certname)
-     if cert_sans is None:
+     cert_domains = cert_manager.domains_for_certname(config, config.certname)
+     if cert_domains is None:
          raise errors.Error("Could not find the list of domains for the given certificate name.")
++<<<<<<< HEAD
 +    cert_domains, ip_addresses = san.split(cert_sans)
 +    if len(ip_addresses) > 0:
 +        # Our apache and nginx plugins are currently relying on this check for a user friendly error
 +        # message about their lack of support for IP certificates. If you're removing this check,
 +        # please check that the plugins can process IP addresses.
 +        raise errors.ConfigurationError("Enhancements not supported for IP address certificates")
 +
++=======
++>>>>>>> parent of d638200d1 (Initial IP address support: use san.SAN types internally (#10468))
      if config.noninteractive_mode:
          domains = cert_domains
      else:

all the executable code in the diff here came from the PR being reverted, but the conflict comes from the code comments added to main.py in #10491. when this code is reintroduced, those code comments should also be added back

i also confirmed that while running a command like:

sudo certbot certonly -w /var/www/html -d example.com -w /var/www/html -d www.example.com --webroot

fails on main with the error from #10506, it succeeds on this branch

@bmw
bmw requested review from a team and wgreenberg and removed request for a team December 8, 2025 18:24
@bmw bmw mentioned this pull request Dec 9, 2025
@bmw

bmw commented Dec 9, 2025

Copy link
Copy Markdown
Member Author

imma close this in favor of #10509 for now. if people disagree, feel free to nudge me or reopen

@bmw bmw closed this Dec 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants