Skip to content

fix(site): validate alias domain names on site create #239

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 3 commits into from
Sep 25, 2026
Merged

fix(site): validate alias domain names on site create #239

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3249c7
fix(site): drop blank alias domains on wp site create
mrrobot47 Sep 24, 2026
225054d
fix(site): reject invalid alias domain names on wp site create
mrrobot47 Sep 24, 2026
3610e15
fix(site): reject a subdomain multisite whose wildcard is another sit…
mrrobot47 Sep 24, 2026
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
28 changes: 16 additions & 12 deletions src/WordPress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
use function EE\Site\Utils\get_site_info;
use function EE\Site\Utils\get_public_dir;
use function EE\Site\Utils\check_alias_in_db;
use function EE\Site\Utils\get_parent_of_alias;
use function EE\Site\Utils\split_alias_domains;
use function EE\Site\Utils\validate_alias_domains;
use function EE\Utils\get_flag_value;
use function EE\Utils\trailingslashit;
use function EE\Utils\get_value_if_flag_isset;
Expand Down Expand Up @@ -295,12 +298,21 @@ public function create( $args, $assoc_args ) {
\EE::error( sprintf( "Site %1\$s already exists. If you want to re-create it please delete the older one using:\n`ee site delete %1\$s`", $this->site_data['site_url'] ) );
}

$alias_domains = \EE\Utils\get_flag_value( $assoc_args, 'alias-domains', '' );
$alias_domains = split_alias_domains( \EE\Utils\get_flag_value( $assoc_args, 'alias-domains', '' ) );
validate_alias_domains( $alias_domains );

$alias_domain_to_check = explode( ',', $alias_domains );
$alias_domain_to_check = $alias_domains;
$alias_domain_to_check[] = $this->site_data['site_url'];
check_alias_in_db( $alias_domain_to_check );

// A subdomain multisite also serves `*.<site>`, which must not already belong to another site.
if ( 'subdom' === $this->site_data['app_sub_type'] ) {
$wildcard_parent = get_parent_of_alias( '*.' . $this->site_data['site_url'] );
if ( ! empty( $wildcard_parent ) ) {
\EE::error( sprintf( 'Cannot create a subdomain multisite for %1$s: *.%1$s is already an alias domain of site %2$s. Please delete it from the alias domains of %2$s first.', $this->site_data['site_url'], $wildcard_parent ) );
}
}

$this->site_data['site_fs_path'] = WEBROOT . $this->site_data['site_url'];
$this->cache_type = \EE\Utils\get_flag_value( $assoc_args, 'cache' );
$wildcard_flag = \EE\Utils\get_flag_value( $assoc_args, 'wildcard' );
Expand Down Expand Up @@ -361,16 +373,8 @@ public function create( $args, $assoc_args ) {
}
}

$this->site_data['alias_domains'] = ( 'subdom' === $this->site_data['app_sub_type'] ) ? $this->site_data['site_url'] . ',*.' . $this->site_data['site_url'] : $this->site_data['site_url'];
$this->site_data['alias_domains'] .= ',';
if ( ! empty( $alias_domains ) ) {
$comma_seprated_domains = explode( ',', $alias_domains );
foreach ( $comma_seprated_domains as $domain ) {
$trimmed_domain = trim( $domain );
$this->site_data['alias_domains'] .= $trimmed_domain . ',';
}
}
$this->site_data['alias_domains'] = substr( $this->site_data['alias_domains'], 0, - 1 );
$site_domains = ( 'subdom' === $this->site_data['app_sub_type'] ) ? [ $this->site_data['site_url'], '*.' . $this->site_data['site_url'] ] : [ $this->site_data['site_url'] ];
$this->site_data['alias_domains'] = implode( ',', array_merge( $site_domains, $alias_domains ) );

$supported_php_versions = [ 5.6, 7.0, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4, 8.5, 'latest' ];
if ( ! in_array( $this->site_data['php_version'], $supported_php_versions ) ) {
Expand Down
Loading