mirror of
https://github.com/certbot/certbot.git
synced 2026-08-02 00:22:28 +02:00
require ssl vhosts for HSTS and OCSP stapling (#10455)
this is the first part of the nginx refactoring work i wanted to do. ohemorange, if this conflicts with your work on updating our nginx ssl config, please feel free to either ignore this for now or point me to your branch after merging this and i can fix up any merge conflicts myself like i previously offered the main thing this PR does is create a new choose_or_make_vhosts function with the current choose_vhosts behavior and makes choose_vhosts only return existing ssl vhosts which i think is the behavior we want when setting up HSTS or OCSP stapling. [this is what we do in apache](https://github.com/certbot/certbot/blob/867b499f9b3934f88beffe53f021c6834350c2f1/certbot-apache/src/certbot_apache/_internal/configurator.py#L1795-L1829), enabling HSTS or OCSP stapling on an HTTP vhost seems wrong/dangerous, and since we don't have cert and key information in these [enhance calls](https://github.com/certbot/certbot/blob/867b499f9b3934f88beffe53f021c6834350c2f1/certbot/src/certbot/interfaces.py#L255), any SSL vhost we create will be left with snakeoil certs which also seems very wrong of course, this simple change to certbot-nginx's prod code required many changes to its tests. the config file for headers.com was introduced [here](https://github.com/certbot/certbot/pull/6068) specifically for testing HSTS so i added the SSL configuration it needs to make work with the choose_vhost changes. that then broke the IP tests for headers.com that were added in https://github.com/certbot/certbot/pull/10145/ so i created a new no-listens.com vhost for testing that if this is merged, my plan in the next PR or two is to: 1. since choose_or_make_vhosts is now always called with create_if_no_match=True in prod code, i plan to remove that variable, make that the default behavior of the function, and fix up tests 2. then, since choose_or_make_vhosts is only called in deploy_cert, i plan to pass the cert and key to it so it can be used in _make_server_ssl instead of the dummy certs currently being used there i could do more of this in this PR if you want ohemorange, but i figured it rarely hurts to break things up especially when the code is kind of tricky like it is (to me) here
This commit is contained in:
@@ -0,0 +1 @@
|
||||
Fixed a bug in certbot-nginx that'd leave nginx configured with self-signed certificates if a user ran `certbot enhance` and they didn't have matching SSL server blocks. `certbot enhance` now requires the user to have a matching SSL server block to enable HSTS or OCSP stapling enhancements.
|
||||
Reference in New Issue
Block a user