diff --git a/AUTHORS.md b/AUTHORS.md index ae2be97a5..273b1313d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -124,6 +124,7 @@ Authors * [James Balazs](https://github.com/jamesbalazs) * [James Kasten](https://github.com/jdkasten) * [Jason Grinblat](https://github.com/ptychomancer) +* [Jason Owen](https://github.com/jasonaowen) * [Jawshua](https://github.com/jawshua) * [Jay Faulkner](https://github.com/jayofdoom) * [J.C. Jones](https://github.com/jcjones) diff --git a/certbot-apache/src/certbot_apache/_internal/constants.py b/certbot-apache/src/certbot_apache/_internal/constants.py index 9c9c2f56b..2e3b7a56f 100644 --- a/certbot-apache/src/certbot_apache/_internal/constants.py +++ b/certbot-apache/src/certbot_apache/_internal/constants.py @@ -34,6 +34,8 @@ ALL_SSL_OPTIONS_HASHES: list[str] = [ '3fd812e3e87fe5c645d3682a511b2a06c8286f19594f28e280f17cd6af1301b5', '27155797e160fe43b6951354a0a0ca4d829e9e605b3b41fc223c20bf2f6cb3c6', '3a6881d0a7e5740b039ec550c916105259f53b577a3d38d0ed11bd675bfeab88', + '0f3d9c62d4274aca0406925dc4ee0919599c397e7463bce792a915b60060d004', + '95f7367d4905a1cd0932a35ce476b4a639e2108dbd1eedf924a5ea9e51fecaf7', ] """SHA256 hashes of the contents of previous versions of all versions of MOD_SSL_CONF_SRC""" diff --git a/certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf b/certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf index e8265fda5..82482b858 100644 --- a/certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf +++ b/certbot-apache/src/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf @@ -14,7 +14,3 @@ SSLHonorCipherOrder off SSLSessionTickets off SSLOptions +StrictRequire - -# Add vhost name to log entries: -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined -LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common diff --git a/certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf b/certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf index aee489913..b0418496a 100644 --- a/certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf +++ b/certbot-apache/src/certbot_apache/_internal/tls_configs/old-options-ssl-apache.conf @@ -16,7 +16,3 @@ SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA25 SSLHonorCipherOrder off SSLOptions +StrictRequire - -# Add vhost name to log entries: -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" vhost_combined -LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common diff --git a/newsfragments/9769.fixed b/newsfragments/9769.fixed new file mode 100644 index 000000000..8a36d7ca4 --- /dev/null +++ b/newsfragments/9769.fixed @@ -0,0 +1 @@ +Removed `vhost_combined` and `vhost_common` log formats from included Apache configuration file.