Skip to content

fix: allow SSO redirects to mapped domains #1609

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
superdav42 merged 2 commits into from
Jul 6, 2026
Merged

fix: allow SSO redirects to mapped domains #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c862303
fix: allow sso redirects to mapped domains
superdav42 Jul 6, 2026
0ea399c
refactor: reuse domain mapping redirect allowlist
superdav42 Jul 6, 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
10 changes: 10 additions & 0 deletions inc/sso/class-sso.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,16 @@ public function startup(): void {

add_filter('allowed_http_origins', [$this, 'add_additional_origins']);

/*
* Domain_Mapping registers the network-owned redirect-host allow-list used
* by wp_safe_redirect(). SSO grant requests can run in contexts where domain
* mapping has not otherwise been instantiated, so load the singleton here
* instead of duplicating its redirect-host logic.
*/
if (class_exists('\WP_Ultimo\Domain_Mapping')) {
\WP_Ultimo\Domain_Mapping::get_instance();
}

/**
* Authorize a user via a bearer, and converts it into a regular cookie
* authenticated user
Expand Down
37 changes: 37 additions & 0 deletions tests/WP_Ultimo/SSO/SSO_Coverage_Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2214,6 +2214,43 @@ function ($location) use (&$redirect_url) {
$this->assertStringContainsString('wu_sso_token=', $redirect_url);
}

/**
* Test SSO allows safe redirects back to mapped broker domains.
*/
public function test_startup_loads_domain_mapping_redirect_host_filter(): void {
$sso = SSO::get_instance();
$domain_name = 'sso-redirect-mapped.example.com';
$domain = wu_create_domain(
[
'blog_id' => 1,
'domain' => $domain_name,
'active' => true,
'primary_domain' => false,
'secure' => false,
'stage' => \WP_Ultimo\Database\Domains\Domain_Stage::DONE,
]
);

if (is_wp_error($domain) || ! $domain instanceof \WP_Ultimo\Models\Domain) {
$this->markTestSkipped('Could not create mapped domain fixture.');
}

wp_cache_delete('domain:' . $domain_name, 'domain_mappings');
wp_cache_delete('domain:www.' . $domain_name, 'domain_mappings');

try {
$sso->startup();

$result = apply_filters('allowed_redirect_hosts', ['mygratis.site'], strtoupper($domain_name));

$this->assertContains($domain_name, $result);
} finally {
$domain->delete();
wp_cache_delete('domain:' . $domain_name, 'domain_mappings');
wp_cache_delete('domain:www.' . $domain_name, 'domain_mappings');
}
}

// ------------------------------------------------------------------
// handle_broker — verify code paths (lines 519-590)
// ------------------------------------------------------------------
Expand Down
Loading