Changeset 12758 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php

Timestamp:

07/25/2023 04:07:53 AM (2 years ago)

Author:

dd32

Message:

Login: Don't override the login redirect location when it appears it'll go to the OIDC plugin used for Matrix.

This function is intended to prevent a post-login redirect langing on a login.wordpress.org page, except that OIDC expects this to occur.

This resolves a login issue with Chattrix on Make.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-login/functions.php

@@ -582 +582 @@
     // If the redirect is to a url that doesn't seem right, override it.
     $redirect_host = parse_url( $redirect, PHP_URL_HOST );
+    $redirect_qv   = parse_url( $redirect, PHP_URL_QUERY );
     $proper_host   = parse_url( $_COOKIE['wporg_came_from'], PHP_URL_HOST );
     if (
@@ -591 +592 @@
                 'login.wordpress.org',    // Default redirect for priv'd users.
             ]
+        ) &&
+        // Don't override if the redirect is back to an OIDC destination.
+        ! (
+            'login.wordpress.org' == $redirect_host &&
+            str_contains( $redirect_qv, 'response_type=code' )
         )
     ) {