Skip to content

fix(site): use a new file for every www check #517

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

Merged
mrrobot47 merged 1 commit into from
Oct 12, 2026
Merged

fix(site): use a new file for every www check #517

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
13 changes: 10 additions & 3 deletions src/helper/class-ee-site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,9 @@ protected function check_www_or_non_www_domain( $site_url, $site_path, $site_con
$random_string = EE\Utils\random_password();
$successful = false;
$extra_path = str_replace( '/var/www/htdocs', '', $site_container_path );
$file_path = $site_path . '/app/htdocs' . $extra_path . '/check.html';
// A new name per check: the site's nginx caches open files for 2 minutes (open_file_cache), so a reused name serves the previous check's file.
$check_file = 'ee-www-check-' . bin2hex( random_bytes( 8 ) ) . '.html';
$file_path = $site_path . '/app/htdocs' . $extra_path . '/' . $check_file;

// The site can write here: drop whatever is at the path so a planted symlink isn't followed, then create the file exclusively.
if ( is_link( $file_path ) || is_file( $file_path ) ) {
Expand All @@ -1934,19 +1936,24 @@ protected function check_www_or_non_www_domain( $site_url, $site_path, $site_con
$site_url = 'www.' . $site_url;
}

$site_url .= '/check.html';
$site_url .= '/' . $check_file;

$curl = curl_init();
curl_setopt( $curl, CURLOPT_URL, $site_url );
curl_setopt( $curl, CURLOPT_RETURNTRANSFER, true );
curl_setopt( $curl, CURLOPT_FOLLOWLOCATION, true );
curl_setopt( $curl, CURLOPT_HEADER, false );
$data = curl_exec( $curl );
$data = curl_exec( $curl );
$http_code = curl_getinfo( $curl, CURLINFO_HTTP_CODE );
$final_url = curl_getinfo( $curl, CURLINFO_EFFECTIVE_URL );
$error = curl_error( $curl );
curl_close( $curl );

if ( ! empty( $data ) && $random_string === $data ) {
$successful = true;
EE::debug( "pointed for $site_url" );
} else {
EE::debug( sprintf( 'www check failed for %s: HTTP %d from %s%s', $site_url, $http_code, $final_url, $error ? " ($error)" : '' ) );
}

if ( file_exists( $file_path ) ) {
Expand Down
Loading