From 95a52176d5f71657a046a21a1b3cf64ec9255766 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 11:56:32 -0400 Subject: [PATCH 01/10] Try skipping TLS verification --- tools/local-env/scripts/install.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index 3ea702d021e24..fe05692d51eae 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -24,6 +24,8 @@ wp_cli( `config set SCRIPT_DEBUG ${process.env.LOCAL_SCRIPT_DEBUG} --raw --type= wp_cli( `config set WP_ENVIRONMENT_TYPE ${process.env.LOCAL_WP_ENVIRONMENT_TYPE} --type=constant` ); wp_cli( `config set WP_DEVELOPMENT_MODE ${process.env.LOCAL_WP_DEVELOPMENT_MODE} --type=constant` ); +wp_cli( 'config set MYSQL_CLIENT_FLAGS MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT --raw --type=constant' ); + // Read in wp-tests-config-sample.php, edit it to work with our config, then write it to wp-tests-config.php. const testConfig = readFileSync( 'wp-tests-config-sample.php', 'utf8' ) .replace( 'youremptytestdbnamehere', 'wordpress_develop_tests' ) From 0069ae0522c8370e17bcdb00d2823f6723deaa70 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 12:07:56 -0400 Subject: [PATCH 02/10] Try skipping SSL in container. --- docker-compose.yml | 1 + tools/local-env/scripts/install.js | 2 -- tools/local-env/test.cnf | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 tools/local-env/test.cnf diff --git a/docker-compose.yml b/docker-compose.yml index 863cbd2ea9b1b..9d2dcb0194c55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -77,6 +77,7 @@ services: volumes: - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql + - ./tools/local-env/test/cnf:/etc/my.cnf.d/custom.cnf - mysql:/var/lib/mysql # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0. diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index fe05692d51eae..3ea702d021e24 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -24,8 +24,6 @@ wp_cli( `config set SCRIPT_DEBUG ${process.env.LOCAL_SCRIPT_DEBUG} --raw --type= wp_cli( `config set WP_ENVIRONMENT_TYPE ${process.env.LOCAL_WP_ENVIRONMENT_TYPE} --type=constant` ); wp_cli( `config set WP_DEVELOPMENT_MODE ${process.env.LOCAL_WP_DEVELOPMENT_MODE} --type=constant` ); -wp_cli( 'config set MYSQL_CLIENT_FLAGS MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT --raw --type=constant' ); - // Read in wp-tests-config-sample.php, edit it to work with our config, then write it to wp-tests-config.php. const testConfig = readFileSync( 'wp-tests-config-sample.php', 'utf8' ) .replace( 'youremptytestdbnamehere', 'wordpress_develop_tests' ) diff --git a/tools/local-env/test.cnf b/tools/local-env/test.cnf new file mode 100644 index 0000000000000..a2f2eb6302022 --- /dev/null +++ b/tools/local-env/test.cnf @@ -0,0 +1,2 @@ +[mysql] +skip-ssl From 1a969799f3a9aa6da69fb10426550f32bfb8614a Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 12:09:00 -0400 Subject: [PATCH 03/10] Change PHP file to trigger unit test workflow. --- src/wp-mail.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wp-mail.php b/src/wp-mail.php index 3f39de4264fe5..1769592286371 100644 --- a/src/wp-mail.php +++ b/src/wp-mail.php @@ -36,6 +36,7 @@ define( 'WP_MAIL_INTERVAL', 5 * MINUTE_IN_SECONDS ); } + $last_checked = get_transient( 'mailserver_last_checked' ); if ( $last_checked ) { From c0e824a698643fcaf242e4219e9e18051c08811a Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 12:23:41 -0400 Subject: [PATCH 04/10] Try updating Docker within Action runner. --- .github/workflows/reusable-phpunit-tests-v3.yml | 8 ++++++++ docker-compose.yml | 1 - tools/local-env/test.cnf | 2 -- 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 tools/local-env/test.cnf diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml index 8f4a631de9ae4..b85aa48667342 100644 --- a/.github/workflows/reusable-phpunit-tests-v3.yml +++ b/.github/workflows/reusable-phpunit-tests-v3.yml @@ -130,6 +130,14 @@ jobs: echo "PHP_FPM_UID=$(id -u)" >> "$GITHUB_ENV" echo "PHP_FPM_GID=$(id -g)" >> "$GITHUB_ENV" + - name: Upgrade Docker + uses: docker/setup-docker-action@v4 + with: + daemon-config: | + { + "debug": true, + } + - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/docker-compose.yml b/docker-compose.yml index 9d2dcb0194c55..863cbd2ea9b1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -77,7 +77,6 @@ services: volumes: - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql - - ./tools/local-env/test/cnf:/etc/my.cnf.d/custom.cnf - mysql:/var/lib/mysql # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0. diff --git a/tools/local-env/test.cnf b/tools/local-env/test.cnf deleted file mode 100644 index a2f2eb6302022..0000000000000 --- a/tools/local-env/test.cnf +++ /dev/null @@ -1,2 +0,0 @@ -[mysql] -skip-ssl From 127303c5be6d178390ba186f40836709c98e0628 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 12:24:40 -0400 Subject: [PATCH 05/10] Run setup Docker with defaults --- .github/workflows/reusable-phpunit-tests-v3.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml index b85aa48667342..78a8f9060d4ed 100644 --- a/.github/workflows/reusable-phpunit-tests-v3.yml +++ b/.github/workflows/reusable-phpunit-tests-v3.yml @@ -132,11 +132,6 @@ jobs: - name: Upgrade Docker uses: docker/setup-docker-action@v4 - with: - daemon-config: | - { - "debug": true, - } - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 From cb064f54c9048f3cade115d1c9770b793639d13f Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 12:46:46 -0400 Subject: [PATCH 06/10] Disable ssl through commands --- .github/workflows/reusable-phpunit-tests-v3.yml | 3 --- tools/local-env/scripts/install.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/reusable-phpunit-tests-v3.yml b/.github/workflows/reusable-phpunit-tests-v3.yml index 78a8f9060d4ed..8f4a631de9ae4 100644 --- a/.github/workflows/reusable-phpunit-tests-v3.yml +++ b/.github/workflows/reusable-phpunit-tests-v3.yml @@ -130,9 +130,6 @@ jobs: echo "PHP_FPM_UID=$(id -u)" >> "$GITHUB_ENV" echo "PHP_FPM_GID=$(id -g)" >> "$GITHUB_ENV" - - name: Upgrade Docker - uses: docker/setup-docker-action@v4 - - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index 3ea702d021e24..3ce7054f9d553 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -61,5 +61,5 @@ wait_on( { * @param {string} cmd The WP-CLI command to run. */ function wp_cli( cmd ) { - execSync( `npm --silent run env:cli -- ${cmd} --path=/var/www/${process.env.LOCAL_DIR}`, { stdio: 'inherit' } ); + execSync( `npm --silent run env:cli -- ${cmd} --path=/var/www/${process.env.LOCAL_DIR} --ssl-mode=DISABLED`, { stdio: 'inherit' } ); } From 9506ea446080421271306377fe03e0219a4c9161 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 12:57:52 -0400 Subject: [PATCH 07/10] Adjust volumes on CLI container --- docker-compose.yml | 1 + tools/local-env/scripts/install.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 863cbd2ea9b1b..4deb2c3cabaf5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -109,6 +109,7 @@ services: WP_CONFIG_PATH: /var/www/wp-config.php volumes: + - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini - ./:/var/www # Keeps the service alive. diff --git a/tools/local-env/scripts/install.js b/tools/local-env/scripts/install.js index 3ce7054f9d553..3ea702d021e24 100644 --- a/tools/local-env/scripts/install.js +++ b/tools/local-env/scripts/install.js @@ -61,5 +61,5 @@ wait_on( { * @param {string} cmd The WP-CLI command to run. */ function wp_cli( cmd ) { - execSync( `npm --silent run env:cli -- ${cmd} --path=/var/www/${process.env.LOCAL_DIR} --ssl-mode=DISABLED`, { stdio: 'inherit' } ); + execSync( `npm --silent run env:cli -- ${cmd} --path=/var/www/${process.env.LOCAL_DIR}`, { stdio: 'inherit' } ); } From 4cc046931ac5c7e94c745a09f71698981851aa5a Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 13:03:37 -0400 Subject: [PATCH 08/10] Disabling SSL on `cli` container --- docker-compose.yml | 2 +- tools/local-env/ssl.cnf | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tools/local-env/ssl.cnf diff --git a/docker-compose.yml b/docker-compose.yml index 4deb2c3cabaf5..16a9b562548b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -109,8 +109,8 @@ services: WP_CONFIG_PATH: /var/www/wp-config.php volumes: - - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini - ./:/var/www + - ./tools/local-env/ssl.cnf:/root/.my.cnf:ro # Keeps the service alive. command: 'sleep infinity' diff --git a/tools/local-env/ssl.cnf b/tools/local-env/ssl.cnf new file mode 100644 index 0000000000000..54a217f788ec1 --- /dev/null +++ b/tools/local-env/ssl.cnf @@ -0,0 +1,14 @@ +[client] +ssl-mode=DISABLED + +# for MariaDB client compatibility +[mariadb] +ssl=0 + +# cover specific client tools that WP-CLI may call +[mysql] +ssl-mode=DISABLED +[mysqladmin] +ssl-mode=DISABLED +[mysqldump] +ssl-mode=DISABLED From 1e16464914ff50ef3bd276eb92a5adf713e08fd0 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 13:22:42 -0400 Subject: [PATCH 09/10] Try including a self-signed certificate --- docker-compose.yml | 22 +++++++++- tools/local-env/certs/ca-ext.cnf | 8 ++++ tools/local-env/certs/ca.key.pem | 52 ++++++++++++++++++++++++ tools/local-env/certs/ca.pem | 34 ++++++++++++++++ tools/local-env/certs/ca.srl | 1 + tools/local-env/certs/server-cert.pem | 28 +++++++++++++ tools/local-env/certs/server-key.pem | 28 +++++++++++++ tools/local-env/certs/server-openssl.cnf | 17 ++++++++ tools/local-env/certs/server.csr.pem | 17 ++++++++ tools/local-env/ssl.cnf | 18 ++------ 10 files changed, 209 insertions(+), 16 deletions(-) create mode 100644 tools/local-env/certs/ca-ext.cnf create mode 100644 tools/local-env/certs/ca.key.pem create mode 100644 tools/local-env/certs/ca.pem create mode 100644 tools/local-env/certs/ca.srl create mode 100644 tools/local-env/certs/server-cert.pem create mode 100644 tools/local-env/certs/server-key.pem create mode 100644 tools/local-env/certs/server-openssl.cnf create mode 100644 tools/local-env/certs/server.csr.pem diff --git a/docker-compose.yml b/docker-compose.yml index 16a9b562548b5..ec31b2019afc4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,9 +50,20 @@ services: volumes: - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini - ./:/var/www + # Trust the dev CA in the container + - ./tools/local-env/tls/ca.pem:/usr/local/share/ca-certificates/wpdev-ca.crt:ro # Copy or delete the Memcached dropin plugin file as appropriate. - command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm" + command: > + /bin/sh -c " + update-ca-certificates >/dev/null 2>&1 || true; + if [ \"$LOCAL_PHP_MEMCACHED\" = true ]; then + cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; + else + rm -f /var/www/src/wp-content/object-cache.php; + fi; + exec php-fpm + " # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly. init: true @@ -78,6 +89,10 @@ services: volumes: - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql - mysql:/var/lib/mysql + - ./tools/local-env/tls/ca.pem:/etc/mysql/ssl/ca.pem:ro + - ./tools/local-env/tls/server-cert.pem:/etc/mysql/ssl/server-cert.pem:ro + - ./tools/local-env/tls/server-key.pem:/etc/mysql/ssl/server-key.pem:ro + - ./tools/local-env/my-ssl.cnf:/etc/mysql/conf.d/my-ssl.cnf:ro # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0. command: ${LOCAL_DB_AUTH_OPTION-} @@ -111,9 +126,12 @@ services: volumes: - ./:/var/www - ./tools/local-env/ssl.cnf:/root/.my.cnf:ro + # Trust the dev CA in the CLI container + - ./tools/local-env/tls/ca.pem:/usr/local/share/ca-certificates/wpdev-ca.crt:ro # Keeps the service alive. - command: 'sleep infinity' + command: > + /bin/sh -c "update-ca-certificates >/dev/null 2>&1 || true; sleep infinity" # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly. init: true diff --git a/tools/local-env/certs/ca-ext.cnf b/tools/local-env/certs/ca-ext.cnf new file mode 100644 index 0000000000000..75988ffeb5775 --- /dev/null +++ b/tools/local-env/certs/ca-ext.cnf @@ -0,0 +1,8 @@ +authorityKeyIdentifier=keyid,issuer +basicConstraints=CA:FALSE +keyUsage = digitalSignature, keyEncipherment +extendedKeyUsage = serverAuth +subjectAltName = @alt_names + +[alt_names] +DNS.1 = mysql diff --git a/tools/local-env/certs/ca.key.pem b/tools/local-env/certs/ca.key.pem new file mode 100644 index 0000000000000..918041d57b57c --- /dev/null +++ b/tools/local-env/certs/ca.key.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC2E3aSRMxfgZCw +F0/AgTVJ9OcG23YG7CNyivQLS9+2QmvFuztL8fXKCRaxhzTc3/JYqkzv2prG/sHB +p7DL5TgJI8dxU2rw+ku/ITKa4sGnGlx4jz6IR4fkyrh0nbFk4xd0pVqei3AVY8X8 +cgURzr4xzwfmCN0CxJpGvMM0Byx1uGISP3rhHy7qDrYHvYnhrPB+OVYy1L2GhdWX +vrNPvhZEf07Ex139eI+9G7e2cfB7WnBgPsPduUEYGwJijCMqMQ+6YXKKFSERMwOq +yeDMpAIIqSZbe/pJq4RWcM+6b0/jWiN6jGvx5ioQU97uircMM0RjZzoD0pmr851Q +DVGReHmv3FfbK8dXkEazglBscgWboo7ME/Q2RMoW4Qo5ilqVsmf3k+jCSuN28xfs +a6bbab0L0CsSDvoT8TMddPPdVKucegP+SkQGcfS7PKzn5Ws4wj2P5qDkTVCYBA/6 +GhnnXF2S7d4X49zdyqVfEHxZfNw7L6fn8VuBUJR0IyTyGBPjcS+Hypek/51bF9pn +fxIgdkSXe0sLZTQlQw6kc9W/N0iNCt41d2bsT6VeolXoZwhsmvYNTWZJRKlerGqJ +YXrWgCZc61QOIQf+UyQYzwIGf3EhiwkQmWmaZqoVGHO9/1J3q+UDkeOYs0mreFlJ +FpoMYx9fGupKkIYxoYpEw8lRXAXQ8QIDAQABAoICAATTRuOrzhduiW/uljmoUvS2 ++FPEB4CPITCybQhK8PlVZkzIYFMWwlL3OFzpE+YR9fa9QKpkn+XL2kUFwCzkfL6F +Q7kFoxe9fQ9qKPtWLMKpyK9AlewqVSLORTgrS7MRmk1dlSVkKvVuKPuT5qgo/f0M +8GJ7c/v+9jBkupmg4l/rodxmRp07udRlzROEcD3aWvSavrrnIhoJZvaNYmwnwf2m +ZWctT24zE+rI7BlPiLYu2JE8aJgc25RGIaM3SovziT1WbXYqXC98AMoLF+7kc9ID +RZXMFynSUVYHHwI2W/wkUedisaOosWRbDKqZY4N/wlK4vslbe0twJTL6FLd8ZWEl +Dsx1pStdXkDNfjDihFv/60AWgcLN4N/NQysYzU2FlPN4ujyl8e3MZSrx1BccM1Jm +Sh8rSXFrokT+f8p/KkKuh/posSjnJot3RhZcnqCtnOL5ZubIo4sLKf3xKQZqj4J9 +WNkFtTJf+dnPvPaPbN/f5BpyQjtw9qvNt/yK0+ev5l2AxuSDRk8MPXlImCasIH+B +3V4DfGn7naxyNoNc8Bh65elaQIzLvu8Z3WZ1f17jQQr12Lo/gTTfjib9T+b9hXPd +dYUP63dMFQ3RpgrYsFAm5gZoGvUq23zaGU31w5wPSDWCU1Hr0qbhMR7Z8Xkdbuwi +kSOItIe9qAdggKU4F05fAoIBAQDzFp6uY80CN5wUAhNEOB3GhHJ8CU8InatTK/Zj +6Cf1Pf2iDolQ/ZzhP91XKNI2z+wvuGAk5fTMsvN4af46yXlzJMgySd9yVcdzhs4E +qzn3Fs1RqLXD2z4RjFIyNdH+l/aa49tUIB+Qo/2kNZZLXtBHZzHt9IMVaoyVvmb2 +HyBXb3yslw6m44RfnLm7f6bHPIPTPAAUoWKlc6CLFxyozVg9c8OqUSP8TxUJOAiO +yXPxBEi5x1FF0DIh6Dfdx9Ty7QE/aI0d6GBnxddKB3Mxd7r4sgjyhJGtS48Sr6lx +gANz1RWy4jVqbjV+0eqUb83XTYckSigbZxGQK7s5r0C/mIsPAoIBAQC/vztLWpkL +Dozq1Ld0z5oRtFHROi4pFYwiARe/L+413BIEd5WvZy3qANZPIC3be2sZ2VY/k1eC +fGL2zBn3mcniPs46oRyo4wgN/7WYLykiU2hoU8KdEBbBAk0pdj0TmBt/aphbCTRD +pqp37eN9PF9Sen02hZ8oQYvp5ahR0WjmNBT4wFqtHHKIgaYW4mXLKKfhzo1phKn/ +DzoRoM0Ju+AgBZ073dbTKwZwuvlVoVmCIi4UEoMgXN1TsvO6QFAf0QT3pg2pAxat +e/6+jo92e/d6gndh6M00MyicVMOZgVCKdyLhBTudR3JcrR7TFgSiRG7SyvZiilaZ +13HzohPX6+P/AoIBAH37ch+1L3F/uo8QCEYpwxy4VdD8zg4MENeZCCf9EIBkMUfE +utvTpHOEssTSLigkGCcfKgzVdMqFz/LPE+gJtLy9ClgtuvU5iZXQ/oKi7vakxaIV +iqZHwOI9U/gbtop43WCmyGvP/ivrIa/x6cOEDvOCgvjs6Oa3gsa0mA3kUdGewQF9 +hCVv8pHO2t9Wp+vH7BYUmYIXpdVTmJedUcgWLC4lCfoB9WF05tURSjYeJ814R+yo +ZPGGlgTGofV59F42AJiJKeGfJh+CBDKkq8muYKM1ObfehtVGPI8VpP5itudYPten +rsFK/sSMLEPjsc1sq6ZeHG0fPJX4ZB7gOfFSMHcCggEATLSKWs2mVYb/ll17+k2m +O5jf9gwJNUQ6Z8v6HPBmocMkrgbMqXtkIa0uDj84OQn5QUDxQMOHiVqLGGFzrdom +qcwoIcobtfAEY908XuHW2bV2Ge4P91bdU17BUWnMaw85SNJymlBnSPzeStWuYIYL +N+pqNqpjje4Ss4G8wOY9yYFiNlR0sbWkl7kNoS/2OrxL1IgVh/WbL75+o1ipTVCM +CyNT0AQhkR4wGF6jqb6/GNDlkAAL1qFvpLD80TAzHVc3Xn5eDpN+ue3VbZOIDoTu +7mJMsa04kb45a7h4+uqBNrMMD+pQ+8z+EdbrctPnDKbFkqvAvpDKrgZCvozC1Wi3 +LwKCAQBsA7ezjbJF6OMWfODinwQH7CaR9J/6Y8DCMGeaQhw3zGZ/en922eKrcmo4 +bC2mSF0Se3BbqDqR7iJmS3X14NUaESZUynYJRJqsSvhWidpovCEp46WNDbi7pIiJ +05YB0s/D4EJhCmikfjsGCaF8CCBBL55mlwZZNQa3Fga57mNQwBxVFrE98w4QFdm7 +qrYUC217mZbmW5IWIPC1uKKapjt2TRF/0QS7FsXiHWXszay6RehQjM+qzaGbdpvz +pQ1Pl8CbfBSxqi5xWsU3HbK/zmWJ5sPjXMJGyEwlRDi5+mn6iZwQUUBW9mBBe++v +uWL5VY4W3oY/S/dxXPDKMLP0yhAc +-----END PRIVATE KEY----- diff --git a/tools/local-env/certs/ca.pem b/tools/local-env/certs/ca.pem new file mode 100644 index 0000000000000..c8bd03fe11a17 --- /dev/null +++ b/tools/local-env/certs/ca.pem @@ -0,0 +1,34 @@ +-----BEGIN CERTIFICATE----- +MIIF1TCCA72gAwIBAgIUWxVN6UF5XZ8pFW9IN8Xrxzkn4kEwDQYJKoZIhvcNAQEL +BQAwejELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVzcy1EZXZlbG9wIExv +Y2FsIERvY2tlciBFbnZpcm9ubWVudDE2MDQGA1UEAwwtV29yZFByZXNzLURldmVs +b3AgTG9jYWwgRG9ja2VyIEVudmlyb25tZW50IENBMB4XDTI1MDgyNTE3MTExMVoX +DTM1MDgyMzE3MTExMVowejELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVz +cy1EZXZlbG9wIExvY2FsIERvY2tlciBFbnZpcm9ubWVudDE2MDQGA1UEAwwtV29y +ZFByZXNzLURldmVsb3AgTG9jYWwgRG9ja2VyIEVudmlyb25tZW50IENBMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAthN2kkTMX4GQsBdPwIE1SfTnBtt2 +Buwjcor0C0vftkJrxbs7S/H1ygkWsYc03N/yWKpM79qaxv7Bwaewy+U4CSPHcVNq +8PpLvyEymuLBpxpceI8+iEeH5Mq4dJ2xZOMXdKVanotwFWPF/HIFEc6+Mc8H5gjd +AsSaRrzDNAcsdbhiEj964R8u6g62B72J4azwfjlWMtS9hoXVl76zT74WRH9OxMdd +/XiPvRu3tnHwe1pwYD7D3blBGBsCYowjKjEPumFyihUhETMDqsngzKQCCKkmW3v6 +SauEVnDPum9P41ojeoxr8eYqEFPe7oq3DDNEY2c6A9KZq/OdUA1RkXh5r9xX2yvH +V5BGs4JQbHIFm6KOzBP0NkTKFuEKOYpalbJn95PowkrjdvMX7Gum22m9C9ArEg76 +E/EzHXTz3VSrnHoD/kpEBnH0uzys5+VrOMI9j+ag5E1QmAQP+hoZ51xdku3eF+Pc +3cqlXxB8WXzcOy+n5/FbgVCUdCMk8hgT43Evh8qXpP+dWxfaZ38SIHZEl3tLC2U0 +JUMOpHPVvzdIjQreNXdm7E+lXqJV6GcIbJr2DU1mSUSpXqxqiWF61oAmXOtUDiEH +/lMkGM8CBn9xIYsJEJlpmmaqFRhzvf9Sd6vlA5HjmLNJq3hZSRaaDGMfXxrqSpCG +MaGKRMPJUVwF0PECAwEAAaNTMFEwHQYDVR0OBBYEFFMGJgG3s+gSGCrQxPVBmi/i +QIKpMB8GA1UdIwQYMBaAFFMGJgG3s+gSGCrQxPVBmi/iQIKpMA8GA1UdEwEB/wQF +MAMBAf8wDQYJKoZIhvcNAQELBQADggIBADOw8ioaGG+R/4q3zluvVBLOut0o2KYe +R3xqY81shpApRGRW5uzEvZIAy3X1TeCQCczrW5cJmMWG6M39vWXzx51CTFEnqqIt +j9tVpHyRFLsA4ftm2qEaWdmNu3E89vu0Ei3Rf9dpJCTz6bSDn5WYlVCzLGEsteoN +X2y308Jve+1mKiS31qC9VrGMYA3QY7szB6NH+khr14evmx6THp1u8hZa4H4D5wxs +wQKcvM2XtIBcaDTjLYj8XR0pkcd+65jpsWmN2CoJxyGr39zuAJXDLMFPAv9kJuOn +6v064FDiIkwaFEi+SXnJZs6RfQT+787MzmIbeOqMoI63NnhkkZ90wvHzAcuaLur+ +85KJlyOv5wTzjXYNqQAQxxRRDXUJTf6CMtihPNH5Xh9vKJWCQQmicbWazGDJLTiJ +/Tdmsq60DXVco8MsEhS3G9tbaPYt2DjVr7XdyyS1CbOrp1jg69qzi0ixLN0mxIsD +jtApOgQi+Eet3UbAacEI3tyztc/MvgDrakLlGcQbqB69vIUKnfDi9de1A4KVgBv1 +pX/Y7VY0nLhMd18TcRj08EEp9bcmtRQQdpsiiMSxTMNjqGVtePcePKCKljrx3WKV +sFUgXizVEu1Vkf8dYnDvnkK7DQ7/HSjNfJx19lASJJEf2Nbd+V8oIpzsmIIlert0 +H8nf3m5U71kG +-----END CERTIFICATE----- diff --git a/tools/local-env/certs/ca.srl b/tools/local-env/certs/ca.srl new file mode 100644 index 0000000000000..2e91e3e4d0460 --- /dev/null +++ b/tools/local-env/certs/ca.srl @@ -0,0 +1 @@ +74E1B3DE44A92D86F583CD72708F541D43B0F266 diff --git a/tools/local-env/certs/server-cert.pem b/tools/local-env/certs/server-cert.pem new file mode 100644 index 0000000000000..fbb659dd2b618 --- /dev/null +++ b/tools/local-env/certs/server-cert.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIE3DCCAsSgAwIBAgIUdOGz3kSpLYb1g81ycI9UHUOw8mYwDQYJKoZIhvcNAQEL +BQAwejELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVzcy1EZXZlbG9wIExv +Y2FsIERvY2tlciBFbnZpcm9ubWVudDE2MDQGA1UEAwwtV29yZFByZXNzLURldmVs +b3AgTG9jYWwgRG9ja2VyIEVudmlyb25tZW50IENBMB4XDTI1MDgyNTE3MTQwM1oX +DTI3MTEyODE3MTQwM1owUjELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVz +cy1EZXZlbG9wIExvY2FsIERvY2tlciBFbnZpcm9ubWVudDEOMAwGA1UEAwwFbXlz +cWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgtEj05aqDAieajBut +6qVcdXG43BrElFaUbGL3Ve9/f+wc6nJuOw4J4R2UsAh2yg5LCHHSBl30suhARa+4 +r48BgaHDXW7LMJFa99G+m3MUFsRilKtzZ1J3yului7NBAYIyfh59qiFL1VQSnDWX +rdeDmyNhn9LIA/7n4D/wlDSE66XuZg41XjwNnLMzN2WiMUgmy4S31GwH64WSTh/Z +wpKfFmGDy51/u32yTS8LshNzQ2NWOKUSqByXwrXUzlSs+PQRaoaf+iC1FsnWHiF+ +qNhMhT75NPEjYIJjEmHFCaCGxGwqBkZz+VvC9LHjsx5P/KMAkoYKKcqtoXlqRv1U +bE5BAgMBAAGjgYEwfzAfBgNVHSMEGDAWgBRTBiYBt7PoEhgq0MT1QZov4kCCqTAJ +BgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAQBgNV +HREECTAHggVteXNxbDAdBgNVHQ4EFgQUGMd61nuxOcJb0OonbnvAAudHFX0wDQYJ +KoZIhvcNAQELBQADggIBAH9gAJb0/hj4iuVzT8QMyCa1zarcVEteqzmcfnxgdakr +t2fv47uwjzOJBt0JXfP0Za0G5mzyLrBMKcRiIe9TnDbE9+KbHSyXndtyquBZ4LeX +qCelnEzAagH/Jst7ISkoTd/PJMkTZvbJchRWjKuYftC8N0IFniT+utrqEWV2LHZg +z21rCeR5fNqptHMNkZq26kJq1XVZS/crIPZwjkEgVu1fMj8IWEYeWafJeEswbhtF +VrySBwajBfaK2aidUtLACvpY962ieHLiWL//IZHp9id/gbjLT041bOcmGE3xyxOF +ah5YWy0r1xzZtMALU14vlB3vwzSfZyrpxH7kOYRO1xS+/m85OzJkSPyiulpoXiyO +mKNZDEqz9BMBvJTyQhS87YH+xaXhYiZUT6mB2voFtXQhz9YtXMvlIeOr1xbPvo9Y +r9sqQqQDKWlGMFkDZ2n2W9o3tvgGG7Q1ImAy/8r3wh4EymKgd+W3ulmOp6hlQ2jN +PcRovNuz7a1mq6Jn92ns+CS1tkZ/kYrwDKlqZMVZr0W1ljhASTwCX3Di6B7PhqFj +l/zwdw1JJ3FwJu9PHOk5v/3f29ZIL1zEQPczjAjP1ZtPnLTAP1o/20XYrW53h7LR +6+B5tvig5tS2pDiG78HMpeE88UjZjP3IciOnseJ+HC0MB5MrFzUA4mxnjHeI8iSZ +-----END CERTIFICATE----- diff --git a/tools/local-env/certs/server-key.pem b/tools/local-env/certs/server-key.pem new file mode 100644 index 0000000000000..04683ce56de14 --- /dev/null +++ b/tools/local-env/certs/server-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCgtEj05aqDAiea +jBut6qVcdXG43BrElFaUbGL3Ve9/f+wc6nJuOw4J4R2UsAh2yg5LCHHSBl30suhA +Ra+4r48BgaHDXW7LMJFa99G+m3MUFsRilKtzZ1J3yului7NBAYIyfh59qiFL1VQS +nDWXrdeDmyNhn9LIA/7n4D/wlDSE66XuZg41XjwNnLMzN2WiMUgmy4S31GwH64WS +Th/ZwpKfFmGDy51/u32yTS8LshNzQ2NWOKUSqByXwrXUzlSs+PQRaoaf+iC1FsnW +HiF+qNhMhT75NPEjYIJjEmHFCaCGxGwqBkZz+VvC9LHjsx5P/KMAkoYKKcqtoXlq +Rv1UbE5BAgMBAAECggEAAY5arNO4JTPFOOagPPyflHKHAvR5+4sj1HpBMhETtC8Y +/5sDN88xaVs+lf+SBr5u9Cnf2kSurmLOGL3j//Hj51k/PPz1CJl5itaJTM3EspOE +MXUsPNOUYEMSJBHNDvUqCChMTh4H26wJjUg/GkR4E1bno+Ia4HjDbtuEcFAAZdoT +VYeRSOxJvWegf0WzpJzYcZ738klLf6JsNyccx+U8TevTaqOC+XNZn6/SBHyief9B +F1nAcAQhZAM59QqedbBn8ZLhgQngcoGg6RDPISOCCOJ0yYzYWBjEcM6fo6bdpTWZ +g2Oar29XDNkdqCZV5pvpKlYeA3TbbIBhtlBaA9hhHQKBgQDgltOiS6D7ybgoNCGe +ZD7E19rH57YauXeH3zAF1O6MmTr0Pxfl/IPOCOStn45f3uZsVik9ULahT2alV+++ +BIZnQn9b8CWSThlPHTqDeNvgXC0PJzrdKC0jBsbBE0T4FXfoeSha03KXb6zCViLX +0fxLzwogNZTU63DGWio8DlOJNQKBgQC3LiCQwxU7AqCBn8Pz9hxPjOZbJrAarBxP +F3gW/XWT3FH2LLG4q7sI5vwscm6MsqCASXGwQ50SM+gHGebB1WGnaH0SCzfV4y1z +t/XLBj/fI3sdF642KRPkHvvw/0n3pkhbWp+QGntXw7ulfI5Wt+ZpUIyGrc4xN+XH +qLYwTSpeXQKBgAxOV2RSLoz9XZjeWmU6avIQPc2sVZ8bQIBya0g2haewkblmZ6HT +d0ln1VfqITwBk7Cl+/Z/ILKwDhjLO7i2uMKZsy7Pds+QdfSOznD7w1iE1Hc7GA+c +LvT3XxafPq01R++2C88GPQYtOVMgsyIOQHvK6WwgY3pTOEe2ExBdXJhtAoGAZjib +e60hv9hrcWqSkyWYDtx2AA/K3leFRK24Gjw+zNB5/IJces16hjFAMB17i5By+KQD +iXVxxaKprKzLlQdag21Pvi38bqNjzduukileo0rNfSKl2Rt7OiYAOjB8OnLUlgYw +XN4qToOvx12GoOXm8oY8pTuAgP7Mf2qqoLGvHxECgYAI+BKzyMA8K/n8iRvInA3h +YJ7iBDeQzhg3yyY7vnFzI40tPlBH9tAykIXWlW1fN7icY8IVElJswLp36t4ExqLP +TJltSrsrVxTdMZq7+AekCYI9Kxc/8PcZJCxaxHPIdjvFIVcHpqhleavkD5ZOegKO +xEgu/GvQ5IeVDgz+IeRnXA== +-----END PRIVATE KEY----- diff --git a/tools/local-env/certs/server-openssl.cnf b/tools/local-env/certs/server-openssl.cnf new file mode 100644 index 0000000000000..8940f0d011e20 --- /dev/null +++ b/tools/local-env/certs/server-openssl.cnf @@ -0,0 +1,17 @@ +[ req ] +default_bits = 2048 +prompt = no +default_md = sha256 +distinguished_name = dn +req_extensions = req_ext + +[ dn ] +C = US +O = WordPress-Develop Local Docker Environment +CN = mysql + +[ req_ext ] +subjectAltName = @alt_names + +[ alt_names ] +DNS.1 = mysql diff --git a/tools/local-env/certs/server.csr.pem b/tools/local-env/certs/server.csr.pem new file mode 100644 index 0000000000000..c3ab6fff83d74 --- /dev/null +++ b/tools/local-env/certs/server.csr.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICujCCAaICAQAwUjELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVzcy1E +ZXZlbG9wIExvY2FsIERvY2tlciBFbnZpcm9ubWVudDEOMAwGA1UEAwwFbXlzcWww +ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgtEj05aqDAieajBut6qVc +dXG43BrElFaUbGL3Ve9/f+wc6nJuOw4J4R2UsAh2yg5LCHHSBl30suhARa+4r48B +gaHDXW7LMJFa99G+m3MUFsRilKtzZ1J3yului7NBAYIyfh59qiFL1VQSnDWXrdeD +myNhn9LIA/7n4D/wlDSE66XuZg41XjwNnLMzN2WiMUgmy4S31GwH64WSTh/ZwpKf +FmGDy51/u32yTS8LshNzQ2NWOKUSqByXwrXUzlSs+PQRaoaf+iC1FsnWHiF+qNhM +hT75NPEjYIJjEmHFCaCGxGwqBkZz+VvC9LHjsx5P/KMAkoYKKcqtoXlqRv1UbE5B +AgMBAAGgIzAhBgkqhkiG9w0BCQ4xFDASMBAGA1UdEQQJMAeCBW15c3FsMA0GCSqG +SIb3DQEBCwUAA4IBAQB4Wmzsk3JFoiZkY70VwDfsXPVXeIz5/B/uOlxQ50qjLSTQ +DHe4JuLN5CLdtRxkzrgIn90DJWE1MVDts7u0Pp0vgAwYH+G9j8QY6SrXoX3nObH1 +ZzBZ2TMReRXyfHz+EvZhcweVH7qMIlL5JbhaQlXkVxb7yS6ScLZcqJfWTqHkBkB5 +wRwrlLXBOTSwdQIuZFjyhA++lICcdoMBqLORfgpNoVTh2dXGd4lPpEZe/aGE9Bk4 +I980QmW23QwbzH7PfAzN5C8w2eWGCoVkdb/Y2qgvzM0YfcGFrOU+IgaWqtv7c00B +c8qs+Qv2yQsMWsksTC5t32ylBAtTGF2evm3LbJz+ +-----END CERTIFICATE REQUEST----- diff --git a/tools/local-env/ssl.cnf b/tools/local-env/ssl.cnf index 54a217f788ec1..31b41f30ebe81 100644 --- a/tools/local-env/ssl.cnf +++ b/tools/local-env/ssl.cnf @@ -1,14 +1,4 @@ -[client] -ssl-mode=DISABLED - -# for MariaDB client compatibility -[mariadb] -ssl=0 - -# cover specific client tools that WP-CLI may call -[mysql] -ssl-mode=DISABLED -[mysqladmin] -ssl-mode=DISABLED -[mysqldump] -ssl-mode=DISABLED +[mysqld] +ssl_ca=/etc/mysql/ssl/ca.pem +ssl_cert=/etc/mysql/ssl/server-cert.pem +ssl_key=/etc/mysql/ssl/server-key.pem From 03505b66c95e42f1e026bd23ca9058c7557952b0 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Mon, 25 Aug 2025 13:26:03 -0400 Subject: [PATCH 10/10] Remove debug code. --- docker-compose.yml | 23 +---------- tools/local-env/certs/ca-ext.cnf | 8 ---- tools/local-env/certs/ca.key.pem | 52 ------------------------ tools/local-env/certs/ca.pem | 34 ---------------- tools/local-env/certs/ca.srl | 1 - tools/local-env/certs/server-cert.pem | 28 ------------- tools/local-env/certs/server-key.pem | 28 ------------- tools/local-env/certs/server-openssl.cnf | 17 -------- tools/local-env/certs/server.csr.pem | 17 -------- tools/local-env/ssl.cnf | 4 -- 10 files changed, 2 insertions(+), 210 deletions(-) delete mode 100644 tools/local-env/certs/ca-ext.cnf delete mode 100644 tools/local-env/certs/ca.key.pem delete mode 100644 tools/local-env/certs/ca.pem delete mode 100644 tools/local-env/certs/ca.srl delete mode 100644 tools/local-env/certs/server-cert.pem delete mode 100644 tools/local-env/certs/server-key.pem delete mode 100644 tools/local-env/certs/server-openssl.cnf delete mode 100644 tools/local-env/certs/server.csr.pem delete mode 100644 tools/local-env/ssl.cnf diff --git a/docker-compose.yml b/docker-compose.yml index ec31b2019afc4..863cbd2ea9b1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,20 +50,9 @@ services: volumes: - ./tools/local-env/php-config.ini:/usr/local/etc/php/conf.d/php-config.ini - ./:/var/www - # Trust the dev CA in the container - - ./tools/local-env/tls/ca.pem:/usr/local/share/ca-certificates/wpdev-ca.crt:ro # Copy or delete the Memcached dropin plugin file as appropriate. - command: > - /bin/sh -c " - update-ca-certificates >/dev/null 2>&1 || true; - if [ \"$LOCAL_PHP_MEMCACHED\" = true ]; then - cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; - else - rm -f /var/www/src/wp-content/object-cache.php; - fi; - exec php-fpm - " + command: /bin/sh -c "if [ $LOCAL_PHP_MEMCACHED = true ]; then cp -n /var/www/tests/phpunit/includes/object-cache.php /var/www/src/wp-content/object-cache.php; else rm -f /var/www/src/wp-content/object-cache.php; fi && exec php-fpm" # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly. init: true @@ -89,10 +78,6 @@ services: volumes: - ./tools/local-env/mysql-init.sql:/docker-entrypoint-initdb.d/mysql-init.sql - mysql:/var/lib/mysql - - ./tools/local-env/tls/ca.pem:/etc/mysql/ssl/ca.pem:ro - - ./tools/local-env/tls/server-cert.pem:/etc/mysql/ssl/server-cert.pem:ro - - ./tools/local-env/tls/server-key.pem:/etc/mysql/ssl/server-key.pem:ro - - ./tools/local-env/my-ssl.cnf:/etc/mysql/conf.d/my-ssl.cnf:ro # For compatibility with PHP versions that don't support the caching_sha2_password auth plugin used in MySQL 8.0. command: ${LOCAL_DB_AUTH_OPTION-} @@ -125,13 +110,9 @@ services: volumes: - ./:/var/www - - ./tools/local-env/ssl.cnf:/root/.my.cnf:ro - # Trust the dev CA in the CLI container - - ./tools/local-env/tls/ca.pem:/usr/local/share/ca-certificates/wpdev-ca.crt:ro # Keeps the service alive. - command: > - /bin/sh -c "update-ca-certificates >/dev/null 2>&1 || true; sleep infinity" + command: 'sleep infinity' # The init directive ensures the command runs with a PID > 1, so Ctrl+C works correctly. init: true diff --git a/tools/local-env/certs/ca-ext.cnf b/tools/local-env/certs/ca-ext.cnf deleted file mode 100644 index 75988ffeb5775..0000000000000 --- a/tools/local-env/certs/ca-ext.cnf +++ /dev/null @@ -1,8 +0,0 @@ -authorityKeyIdentifier=keyid,issuer -basicConstraints=CA:FALSE -keyUsage = digitalSignature, keyEncipherment -extendedKeyUsage = serverAuth -subjectAltName = @alt_names - -[alt_names] -DNS.1 = mysql diff --git a/tools/local-env/certs/ca.key.pem b/tools/local-env/certs/ca.key.pem deleted file mode 100644 index 918041d57b57c..0000000000000 --- a/tools/local-env/certs/ca.key.pem +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIJQQIBADANBgkqhkiG9w0BAQEFAASCCSswggknAgEAAoICAQC2E3aSRMxfgZCw -F0/AgTVJ9OcG23YG7CNyivQLS9+2QmvFuztL8fXKCRaxhzTc3/JYqkzv2prG/sHB -p7DL5TgJI8dxU2rw+ku/ITKa4sGnGlx4jz6IR4fkyrh0nbFk4xd0pVqei3AVY8X8 -cgURzr4xzwfmCN0CxJpGvMM0Byx1uGISP3rhHy7qDrYHvYnhrPB+OVYy1L2GhdWX -vrNPvhZEf07Ex139eI+9G7e2cfB7WnBgPsPduUEYGwJijCMqMQ+6YXKKFSERMwOq -yeDMpAIIqSZbe/pJq4RWcM+6b0/jWiN6jGvx5ioQU97uircMM0RjZzoD0pmr851Q -DVGReHmv3FfbK8dXkEazglBscgWboo7ME/Q2RMoW4Qo5ilqVsmf3k+jCSuN28xfs -a6bbab0L0CsSDvoT8TMddPPdVKucegP+SkQGcfS7PKzn5Ws4wj2P5qDkTVCYBA/6 -GhnnXF2S7d4X49zdyqVfEHxZfNw7L6fn8VuBUJR0IyTyGBPjcS+Hypek/51bF9pn -fxIgdkSXe0sLZTQlQw6kc9W/N0iNCt41d2bsT6VeolXoZwhsmvYNTWZJRKlerGqJ -YXrWgCZc61QOIQf+UyQYzwIGf3EhiwkQmWmaZqoVGHO9/1J3q+UDkeOYs0mreFlJ -FpoMYx9fGupKkIYxoYpEw8lRXAXQ8QIDAQABAoICAATTRuOrzhduiW/uljmoUvS2 -+FPEB4CPITCybQhK8PlVZkzIYFMWwlL3OFzpE+YR9fa9QKpkn+XL2kUFwCzkfL6F -Q7kFoxe9fQ9qKPtWLMKpyK9AlewqVSLORTgrS7MRmk1dlSVkKvVuKPuT5qgo/f0M -8GJ7c/v+9jBkupmg4l/rodxmRp07udRlzROEcD3aWvSavrrnIhoJZvaNYmwnwf2m -ZWctT24zE+rI7BlPiLYu2JE8aJgc25RGIaM3SovziT1WbXYqXC98AMoLF+7kc9ID -RZXMFynSUVYHHwI2W/wkUedisaOosWRbDKqZY4N/wlK4vslbe0twJTL6FLd8ZWEl -Dsx1pStdXkDNfjDihFv/60AWgcLN4N/NQysYzU2FlPN4ujyl8e3MZSrx1BccM1Jm -Sh8rSXFrokT+f8p/KkKuh/posSjnJot3RhZcnqCtnOL5ZubIo4sLKf3xKQZqj4J9 -WNkFtTJf+dnPvPaPbN/f5BpyQjtw9qvNt/yK0+ev5l2AxuSDRk8MPXlImCasIH+B -3V4DfGn7naxyNoNc8Bh65elaQIzLvu8Z3WZ1f17jQQr12Lo/gTTfjib9T+b9hXPd -dYUP63dMFQ3RpgrYsFAm5gZoGvUq23zaGU31w5wPSDWCU1Hr0qbhMR7Z8Xkdbuwi -kSOItIe9qAdggKU4F05fAoIBAQDzFp6uY80CN5wUAhNEOB3GhHJ8CU8InatTK/Zj -6Cf1Pf2iDolQ/ZzhP91XKNI2z+wvuGAk5fTMsvN4af46yXlzJMgySd9yVcdzhs4E -qzn3Fs1RqLXD2z4RjFIyNdH+l/aa49tUIB+Qo/2kNZZLXtBHZzHt9IMVaoyVvmb2 -HyBXb3yslw6m44RfnLm7f6bHPIPTPAAUoWKlc6CLFxyozVg9c8OqUSP8TxUJOAiO -yXPxBEi5x1FF0DIh6Dfdx9Ty7QE/aI0d6GBnxddKB3Mxd7r4sgjyhJGtS48Sr6lx -gANz1RWy4jVqbjV+0eqUb83XTYckSigbZxGQK7s5r0C/mIsPAoIBAQC/vztLWpkL -Dozq1Ld0z5oRtFHROi4pFYwiARe/L+413BIEd5WvZy3qANZPIC3be2sZ2VY/k1eC -fGL2zBn3mcniPs46oRyo4wgN/7WYLykiU2hoU8KdEBbBAk0pdj0TmBt/aphbCTRD -pqp37eN9PF9Sen02hZ8oQYvp5ahR0WjmNBT4wFqtHHKIgaYW4mXLKKfhzo1phKn/ -DzoRoM0Ju+AgBZ073dbTKwZwuvlVoVmCIi4UEoMgXN1TsvO6QFAf0QT3pg2pAxat -e/6+jo92e/d6gndh6M00MyicVMOZgVCKdyLhBTudR3JcrR7TFgSiRG7SyvZiilaZ -13HzohPX6+P/AoIBAH37ch+1L3F/uo8QCEYpwxy4VdD8zg4MENeZCCf9EIBkMUfE -utvTpHOEssTSLigkGCcfKgzVdMqFz/LPE+gJtLy9ClgtuvU5iZXQ/oKi7vakxaIV -iqZHwOI9U/gbtop43WCmyGvP/ivrIa/x6cOEDvOCgvjs6Oa3gsa0mA3kUdGewQF9 -hCVv8pHO2t9Wp+vH7BYUmYIXpdVTmJedUcgWLC4lCfoB9WF05tURSjYeJ814R+yo -ZPGGlgTGofV59F42AJiJKeGfJh+CBDKkq8muYKM1ObfehtVGPI8VpP5itudYPten -rsFK/sSMLEPjsc1sq6ZeHG0fPJX4ZB7gOfFSMHcCggEATLSKWs2mVYb/ll17+k2m -O5jf9gwJNUQ6Z8v6HPBmocMkrgbMqXtkIa0uDj84OQn5QUDxQMOHiVqLGGFzrdom -qcwoIcobtfAEY908XuHW2bV2Ge4P91bdU17BUWnMaw85SNJymlBnSPzeStWuYIYL -N+pqNqpjje4Ss4G8wOY9yYFiNlR0sbWkl7kNoS/2OrxL1IgVh/WbL75+o1ipTVCM -CyNT0AQhkR4wGF6jqb6/GNDlkAAL1qFvpLD80TAzHVc3Xn5eDpN+ue3VbZOIDoTu -7mJMsa04kb45a7h4+uqBNrMMD+pQ+8z+EdbrctPnDKbFkqvAvpDKrgZCvozC1Wi3 -LwKCAQBsA7ezjbJF6OMWfODinwQH7CaR9J/6Y8DCMGeaQhw3zGZ/en922eKrcmo4 -bC2mSF0Se3BbqDqR7iJmS3X14NUaESZUynYJRJqsSvhWidpovCEp46WNDbi7pIiJ -05YB0s/D4EJhCmikfjsGCaF8CCBBL55mlwZZNQa3Fga57mNQwBxVFrE98w4QFdm7 -qrYUC217mZbmW5IWIPC1uKKapjt2TRF/0QS7FsXiHWXszay6RehQjM+qzaGbdpvz -pQ1Pl8CbfBSxqi5xWsU3HbK/zmWJ5sPjXMJGyEwlRDi5+mn6iZwQUUBW9mBBe++v -uWL5VY4W3oY/S/dxXPDKMLP0yhAc ------END PRIVATE KEY----- diff --git a/tools/local-env/certs/ca.pem b/tools/local-env/certs/ca.pem deleted file mode 100644 index c8bd03fe11a17..0000000000000 --- a/tools/local-env/certs/ca.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF1TCCA72gAwIBAgIUWxVN6UF5XZ8pFW9IN8Xrxzkn4kEwDQYJKoZIhvcNAQEL -BQAwejELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVzcy1EZXZlbG9wIExv -Y2FsIERvY2tlciBFbnZpcm9ubWVudDE2MDQGA1UEAwwtV29yZFByZXNzLURldmVs -b3AgTG9jYWwgRG9ja2VyIEVudmlyb25tZW50IENBMB4XDTI1MDgyNTE3MTExMVoX -DTM1MDgyMzE3MTExMVowejELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVz -cy1EZXZlbG9wIExvY2FsIERvY2tlciBFbnZpcm9ubWVudDE2MDQGA1UEAwwtV29y -ZFByZXNzLURldmVsb3AgTG9jYWwgRG9ja2VyIEVudmlyb25tZW50IENBMIICIjAN -BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAthN2kkTMX4GQsBdPwIE1SfTnBtt2 -Buwjcor0C0vftkJrxbs7S/H1ygkWsYc03N/yWKpM79qaxv7Bwaewy+U4CSPHcVNq -8PpLvyEymuLBpxpceI8+iEeH5Mq4dJ2xZOMXdKVanotwFWPF/HIFEc6+Mc8H5gjd -AsSaRrzDNAcsdbhiEj964R8u6g62B72J4azwfjlWMtS9hoXVl76zT74WRH9OxMdd -/XiPvRu3tnHwe1pwYD7D3blBGBsCYowjKjEPumFyihUhETMDqsngzKQCCKkmW3v6 -SauEVnDPum9P41ojeoxr8eYqEFPe7oq3DDNEY2c6A9KZq/OdUA1RkXh5r9xX2yvH -V5BGs4JQbHIFm6KOzBP0NkTKFuEKOYpalbJn95PowkrjdvMX7Gum22m9C9ArEg76 -E/EzHXTz3VSrnHoD/kpEBnH0uzys5+VrOMI9j+ag5E1QmAQP+hoZ51xdku3eF+Pc -3cqlXxB8WXzcOy+n5/FbgVCUdCMk8hgT43Evh8qXpP+dWxfaZ38SIHZEl3tLC2U0 -JUMOpHPVvzdIjQreNXdm7E+lXqJV6GcIbJr2DU1mSUSpXqxqiWF61oAmXOtUDiEH -/lMkGM8CBn9xIYsJEJlpmmaqFRhzvf9Sd6vlA5HjmLNJq3hZSRaaDGMfXxrqSpCG -MaGKRMPJUVwF0PECAwEAAaNTMFEwHQYDVR0OBBYEFFMGJgG3s+gSGCrQxPVBmi/i -QIKpMB8GA1UdIwQYMBaAFFMGJgG3s+gSGCrQxPVBmi/iQIKpMA8GA1UdEwEB/wQF -MAMBAf8wDQYJKoZIhvcNAQELBQADggIBADOw8ioaGG+R/4q3zluvVBLOut0o2KYe -R3xqY81shpApRGRW5uzEvZIAy3X1TeCQCczrW5cJmMWG6M39vWXzx51CTFEnqqIt -j9tVpHyRFLsA4ftm2qEaWdmNu3E89vu0Ei3Rf9dpJCTz6bSDn5WYlVCzLGEsteoN -X2y308Jve+1mKiS31qC9VrGMYA3QY7szB6NH+khr14evmx6THp1u8hZa4H4D5wxs -wQKcvM2XtIBcaDTjLYj8XR0pkcd+65jpsWmN2CoJxyGr39zuAJXDLMFPAv9kJuOn -6v064FDiIkwaFEi+SXnJZs6RfQT+787MzmIbeOqMoI63NnhkkZ90wvHzAcuaLur+ -85KJlyOv5wTzjXYNqQAQxxRRDXUJTf6CMtihPNH5Xh9vKJWCQQmicbWazGDJLTiJ -/Tdmsq60DXVco8MsEhS3G9tbaPYt2DjVr7XdyyS1CbOrp1jg69qzi0ixLN0mxIsD -jtApOgQi+Eet3UbAacEI3tyztc/MvgDrakLlGcQbqB69vIUKnfDi9de1A4KVgBv1 -pX/Y7VY0nLhMd18TcRj08EEp9bcmtRQQdpsiiMSxTMNjqGVtePcePKCKljrx3WKV -sFUgXizVEu1Vkf8dYnDvnkK7DQ7/HSjNfJx19lASJJEf2Nbd+V8oIpzsmIIlert0 -H8nf3m5U71kG ------END CERTIFICATE----- diff --git a/tools/local-env/certs/ca.srl b/tools/local-env/certs/ca.srl deleted file mode 100644 index 2e91e3e4d0460..0000000000000 --- a/tools/local-env/certs/ca.srl +++ /dev/null @@ -1 +0,0 @@ -74E1B3DE44A92D86F583CD72708F541D43B0F266 diff --git a/tools/local-env/certs/server-cert.pem b/tools/local-env/certs/server-cert.pem deleted file mode 100644 index fbb659dd2b618..0000000000000 --- a/tools/local-env/certs/server-cert.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIE3DCCAsSgAwIBAgIUdOGz3kSpLYb1g81ycI9UHUOw8mYwDQYJKoZIhvcNAQEL -BQAwejELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVzcy1EZXZlbG9wIExv -Y2FsIERvY2tlciBFbnZpcm9ubWVudDE2MDQGA1UEAwwtV29yZFByZXNzLURldmVs -b3AgTG9jYWwgRG9ja2VyIEVudmlyb25tZW50IENBMB4XDTI1MDgyNTE3MTQwM1oX -DTI3MTEyODE3MTQwM1owUjELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVz -cy1EZXZlbG9wIExvY2FsIERvY2tlciBFbnZpcm9ubWVudDEOMAwGA1UEAwwFbXlz -cWwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgtEj05aqDAieajBut -6qVcdXG43BrElFaUbGL3Ve9/f+wc6nJuOw4J4R2UsAh2yg5LCHHSBl30suhARa+4 -r48BgaHDXW7LMJFa99G+m3MUFsRilKtzZ1J3yului7NBAYIyfh59qiFL1VQSnDWX -rdeDmyNhn9LIA/7n4D/wlDSE66XuZg41XjwNnLMzN2WiMUgmy4S31GwH64WSTh/Z -wpKfFmGDy51/u32yTS8LshNzQ2NWOKUSqByXwrXUzlSs+PQRaoaf+iC1FsnWHiF+ -qNhMhT75NPEjYIJjEmHFCaCGxGwqBkZz+VvC9LHjsx5P/KMAkoYKKcqtoXlqRv1U -bE5BAgMBAAGjgYEwfzAfBgNVHSMEGDAWgBRTBiYBt7PoEhgq0MT1QZov4kCCqTAJ -BgNVHRMEAjAAMAsGA1UdDwQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAQBgNV -HREECTAHggVteXNxbDAdBgNVHQ4EFgQUGMd61nuxOcJb0OonbnvAAudHFX0wDQYJ -KoZIhvcNAQELBQADggIBAH9gAJb0/hj4iuVzT8QMyCa1zarcVEteqzmcfnxgdakr -t2fv47uwjzOJBt0JXfP0Za0G5mzyLrBMKcRiIe9TnDbE9+KbHSyXndtyquBZ4LeX -qCelnEzAagH/Jst7ISkoTd/PJMkTZvbJchRWjKuYftC8N0IFniT+utrqEWV2LHZg -z21rCeR5fNqptHMNkZq26kJq1XVZS/crIPZwjkEgVu1fMj8IWEYeWafJeEswbhtF -VrySBwajBfaK2aidUtLACvpY962ieHLiWL//IZHp9id/gbjLT041bOcmGE3xyxOF -ah5YWy0r1xzZtMALU14vlB3vwzSfZyrpxH7kOYRO1xS+/m85OzJkSPyiulpoXiyO -mKNZDEqz9BMBvJTyQhS87YH+xaXhYiZUT6mB2voFtXQhz9YtXMvlIeOr1xbPvo9Y -r9sqQqQDKWlGMFkDZ2n2W9o3tvgGG7Q1ImAy/8r3wh4EymKgd+W3ulmOp6hlQ2jN -PcRovNuz7a1mq6Jn92ns+CS1tkZ/kYrwDKlqZMVZr0W1ljhASTwCX3Di6B7PhqFj -l/zwdw1JJ3FwJu9PHOk5v/3f29ZIL1zEQPczjAjP1ZtPnLTAP1o/20XYrW53h7LR -6+B5tvig5tS2pDiG78HMpeE88UjZjP3IciOnseJ+HC0MB5MrFzUA4mxnjHeI8iSZ ------END CERTIFICATE----- diff --git a/tools/local-env/certs/server-key.pem b/tools/local-env/certs/server-key.pem deleted file mode 100644 index 04683ce56de14..0000000000000 --- a/tools/local-env/certs/server-key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCgtEj05aqDAiea -jBut6qVcdXG43BrElFaUbGL3Ve9/f+wc6nJuOw4J4R2UsAh2yg5LCHHSBl30suhA -Ra+4r48BgaHDXW7LMJFa99G+m3MUFsRilKtzZ1J3yului7NBAYIyfh59qiFL1VQS -nDWXrdeDmyNhn9LIA/7n4D/wlDSE66XuZg41XjwNnLMzN2WiMUgmy4S31GwH64WS -Th/ZwpKfFmGDy51/u32yTS8LshNzQ2NWOKUSqByXwrXUzlSs+PQRaoaf+iC1FsnW -HiF+qNhMhT75NPEjYIJjEmHFCaCGxGwqBkZz+VvC9LHjsx5P/KMAkoYKKcqtoXlq -Rv1UbE5BAgMBAAECggEAAY5arNO4JTPFOOagPPyflHKHAvR5+4sj1HpBMhETtC8Y -/5sDN88xaVs+lf+SBr5u9Cnf2kSurmLOGL3j//Hj51k/PPz1CJl5itaJTM3EspOE -MXUsPNOUYEMSJBHNDvUqCChMTh4H26wJjUg/GkR4E1bno+Ia4HjDbtuEcFAAZdoT -VYeRSOxJvWegf0WzpJzYcZ738klLf6JsNyccx+U8TevTaqOC+XNZn6/SBHyief9B -F1nAcAQhZAM59QqedbBn8ZLhgQngcoGg6RDPISOCCOJ0yYzYWBjEcM6fo6bdpTWZ -g2Oar29XDNkdqCZV5pvpKlYeA3TbbIBhtlBaA9hhHQKBgQDgltOiS6D7ybgoNCGe -ZD7E19rH57YauXeH3zAF1O6MmTr0Pxfl/IPOCOStn45f3uZsVik9ULahT2alV+++ -BIZnQn9b8CWSThlPHTqDeNvgXC0PJzrdKC0jBsbBE0T4FXfoeSha03KXb6zCViLX -0fxLzwogNZTU63DGWio8DlOJNQKBgQC3LiCQwxU7AqCBn8Pz9hxPjOZbJrAarBxP -F3gW/XWT3FH2LLG4q7sI5vwscm6MsqCASXGwQ50SM+gHGebB1WGnaH0SCzfV4y1z -t/XLBj/fI3sdF642KRPkHvvw/0n3pkhbWp+QGntXw7ulfI5Wt+ZpUIyGrc4xN+XH -qLYwTSpeXQKBgAxOV2RSLoz9XZjeWmU6avIQPc2sVZ8bQIBya0g2haewkblmZ6HT -d0ln1VfqITwBk7Cl+/Z/ILKwDhjLO7i2uMKZsy7Pds+QdfSOznD7w1iE1Hc7GA+c -LvT3XxafPq01R++2C88GPQYtOVMgsyIOQHvK6WwgY3pTOEe2ExBdXJhtAoGAZjib -e60hv9hrcWqSkyWYDtx2AA/K3leFRK24Gjw+zNB5/IJces16hjFAMB17i5By+KQD -iXVxxaKprKzLlQdag21Pvi38bqNjzduukileo0rNfSKl2Rt7OiYAOjB8OnLUlgYw -XN4qToOvx12GoOXm8oY8pTuAgP7Mf2qqoLGvHxECgYAI+BKzyMA8K/n8iRvInA3h -YJ7iBDeQzhg3yyY7vnFzI40tPlBH9tAykIXWlW1fN7icY8IVElJswLp36t4ExqLP -TJltSrsrVxTdMZq7+AekCYI9Kxc/8PcZJCxaxHPIdjvFIVcHpqhleavkD5ZOegKO -xEgu/GvQ5IeVDgz+IeRnXA== ------END PRIVATE KEY----- diff --git a/tools/local-env/certs/server-openssl.cnf b/tools/local-env/certs/server-openssl.cnf deleted file mode 100644 index 8940f0d011e20..0000000000000 --- a/tools/local-env/certs/server-openssl.cnf +++ /dev/null @@ -1,17 +0,0 @@ -[ req ] -default_bits = 2048 -prompt = no -default_md = sha256 -distinguished_name = dn -req_extensions = req_ext - -[ dn ] -C = US -O = WordPress-Develop Local Docker Environment -CN = mysql - -[ req_ext ] -subjectAltName = @alt_names - -[ alt_names ] -DNS.1 = mysql diff --git a/tools/local-env/certs/server.csr.pem b/tools/local-env/certs/server.csr.pem deleted file mode 100644 index c3ab6fff83d74..0000000000000 --- a/tools/local-env/certs/server.csr.pem +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICujCCAaICAQAwUjELMAkGA1UEBhMCVVMxMzAxBgNVBAoMKldvcmRQcmVzcy1E -ZXZlbG9wIExvY2FsIERvY2tlciBFbnZpcm9ubWVudDEOMAwGA1UEAwwFbXlzcWww -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgtEj05aqDAieajBut6qVc -dXG43BrElFaUbGL3Ve9/f+wc6nJuOw4J4R2UsAh2yg5LCHHSBl30suhARa+4r48B -gaHDXW7LMJFa99G+m3MUFsRilKtzZ1J3yului7NBAYIyfh59qiFL1VQSnDWXrdeD -myNhn9LIA/7n4D/wlDSE66XuZg41XjwNnLMzN2WiMUgmy4S31GwH64WSTh/ZwpKf -FmGDy51/u32yTS8LshNzQ2NWOKUSqByXwrXUzlSs+PQRaoaf+iC1FsnWHiF+qNhM -hT75NPEjYIJjEmHFCaCGxGwqBkZz+VvC9LHjsx5P/KMAkoYKKcqtoXlqRv1UbE5B -AgMBAAGgIzAhBgkqhkiG9w0BCQ4xFDASMBAGA1UdEQQJMAeCBW15c3FsMA0GCSqG -SIb3DQEBCwUAA4IBAQB4Wmzsk3JFoiZkY70VwDfsXPVXeIz5/B/uOlxQ50qjLSTQ -DHe4JuLN5CLdtRxkzrgIn90DJWE1MVDts7u0Pp0vgAwYH+G9j8QY6SrXoX3nObH1 -ZzBZ2TMReRXyfHz+EvZhcweVH7qMIlL5JbhaQlXkVxb7yS6ScLZcqJfWTqHkBkB5 -wRwrlLXBOTSwdQIuZFjyhA++lICcdoMBqLORfgpNoVTh2dXGd4lPpEZe/aGE9Bk4 -I980QmW23QwbzH7PfAzN5C8w2eWGCoVkdb/Y2qgvzM0YfcGFrOU+IgaWqtv7c00B -c8qs+Qv2yQsMWsksTC5t32ylBAtTGF2evm3LbJz+ ------END CERTIFICATE REQUEST----- diff --git a/tools/local-env/ssl.cnf b/tools/local-env/ssl.cnf deleted file mode 100644 index 31b41f30ebe81..0000000000000 --- a/tools/local-env/ssl.cnf +++ /dev/null @@ -1,4 +0,0 @@ -[mysqld] -ssl_ca=/etc/mysql/ssl/ca.pem -ssl_cert=/etc/mysql/ssl/server-cert.pem -ssl_key=/etc/mysql/ssl/server-key.pem