Skip to content

fix(ssl): copy and validate custom certs on site update #489

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 1 commit into
base: develop
Choose a base branch
from
Open

fix(ssl): copy and validate custom certs on site update #489

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
16 changes: 16 additions & 0 deletions src/helper/class-ee-site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,12 @@ protected function delete_site( $level, $site_url, $site_fs_path, $db_data = []
* [--wildcard]
* : Enable wildcard SSL on site.
*
* [--ssl-key=<ssl-key-path>]
* : Path to the SSL key file. Required with --ssl=custom.
*
* [--ssl-crt=<ssl-crt-path>]
* : Path to the SSL crt file. Required with --ssl=custom.
*
* [--php=<php-version>]
* : PHP version for site. Currently only supports PHP 5.6, 7.0, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, and 8.5.
* ---
Expand Down Expand Up @@ -471,6 +477,9 @@ protected function delete_site( $level, $site_url, $site_fs_path, $db_data = []
* # Add self-signed SSL to non-ssl site
* $ ee site update example.com --ssl=self
*
* # Add custom SSL to non-ssl site
* $ ee site update example.com --ssl=custom --ssl-key=/path/to/site.key --ssl-crt=/path/to/site.crt
*
* # Update PHP version of site.
* $ ee site update example.com --php=8.0
*
Expand Down Expand Up @@ -937,6 +946,13 @@ protected function update_ssl( $assoc_args ) {
$this->site_data['site_ssl'] = $ssl;

if ( $ssl ) {
// www_ssl_wrapper() skips cert work for custom SSL, so mirror the create
// path here: validate the provided key/crt and copy them into the
// nginx-proxy certs dir before enabling HTTPS, else the site serves a wrong cert.
if ( 'custom' === $ssl ) {
$this->validate_site_custom_ssl( get_flag_value( $assoc_args, 'ssl-key' ), get_flag_value( $assoc_args, 'ssl-crt' ) );
$this->custom_site_ssl();
}
$this->www_ssl_wrapper( [ 'nginx' ] );
} else {
$this->disable_ssl();
Expand Down
Loading