Add in login_url filter to add external=wordpress URL parameter when …

…going through password reset process. Add in checkmail=confirm parameter check to prevent automatic redirect to CAS login page in specific cases. Fixes #121.
uhm-coe · Oct 8, 2022 · 70260ba · 70260ba
1 parent 5cd4067
commit 70260ba
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 0 deletions.
diff --git a/src/authorizer/class-login-form.php b/src/authorizer/class-login-form.php
@@ -274,6 +274,20 @@ public function login_form_add_external_service_links() {
 	 * @return WP_Error|void       WP Error object or void on redirect.
 	 */
 	public function wp_login_errors__maybe_redirect_to_cas( $errors, $redirect_to ) {
+		// If the query string 'checkemail=confirm' is set, we do not want to automatically redirect to
+		// the CAS login screen using 'external=cas', and instead want to directly access the check email
+		// confirmation page.  So we will instead set the URL parameter 'external=wordpress' and redirect.
+		// This is to prevent issues when going through the normal WordPress password reset process.
+		if (
+			isset( $_REQUEST['checkemail'] ) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			'confirm' === $_REQUEST['checkemail'] && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+			isset( $_SERVER['QUERY_STRING'] ) &&
+			strpos( $_SERVER['QUERY_STRING'], 'external=wordpress' ) === false // phpcs:ignore WordPress.Security.ValidatedSanitizedInput
+		) {
+					wp_redirect( Helper::modify_current_url_for_external_login( 'wordpress' ) );  // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect
+					exit;
+		}
+
 		// Grab plugin settings.
 		$options       = Options::get_instance();
 		$auth_settings = $options->get_all( Helper::SINGLE_CONTEXT, 'allow override' );
@@ -425,6 +439,56 @@ public function custom_lostpassword_url( $lostpassword_url ) {
 	}
 
 
+	/**
+	 * Ensure that whenever we are on a wp-login.php page for WordPress and there is a log in link, it properly
+	 * generates a wp-login.php URL with the additional "wordpress=external" URL parameter.
+	 * Only affects the URL if the Hide WordPress Logins option is enabled.
+	 *
+	 * Filter:  wp_login_url https://developer.wordpress.org/reference/functions/wp_login_url/
+	 *
+	 * @param  string $login_url URL for the log in page.
+	 * @return string            URL for the log in page.
+	 */
+	public function maybe_add_external_wordpress_to_log_in_links( $login_url ) {
+		// Initial check to make sure that we are on a wp-login.php page.
+		if ( isset( $GLOBALS['pagenow'] ) && site_url( $GLOBALS['pagenow'], 'login' ) === $login_url ) {
+			// Do a check in here within the $_REQUEST params to narrow down the scope of where we'll modify the URL
+			// We need to check against the following:  action=lostpassword, checkemail=confirm, action=rp, and action=resetpass.
+			if (
+				(
+					isset( $_REQUEST['action'] ) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					(
+						'lostpassword' === $_REQUEST['action'] || // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+						'rp' === $_REQUEST['action'] || // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+						'resetpass' === $_REQUEST['action'] // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					)
+				) || (
+					isset( $_REQUEST['checkemail'] ) && // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+					'confirm' === $_REQUEST['checkemail'] // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+				)
+			) {
+				// Grab plugins settings.
+				$options       = Options::get_instance();
+				$auth_settings = $options->get_all( HELPER::SINGLE_CONTEXT, 'allow override' );
+
+				// Only change the Log in URL if the Hide WordPress Logins option is enabled in Authorizer.
+				if (
+					array_key_exists( 'advanced_hide_wp_login', $auth_settings ) &&
+					'1' === $auth_settings['advanced_hide_wp_login']
+				) {
+					// Need to determine if existing URL has params already or not, then add the param and value.
+					if ( strpos( $login_url, '?' ) === false ) {
+						$login_url = $login_url . '?external=wordpress';
+					} else {
+						$login_url = $login_url . '&external=wordpress';
+					}
+				}
+			}
+		}
+		return $login_url;
+	}
+
+
 	/**
 	 * Add custom error message to login screen.
 	 *

diff --git a/src/authorizer/class-wp-plugin-authorizer.php b/src/authorizer/class-wp-plugin-authorizer.php
@@ -51,6 +51,9 @@ public function __construct() {
 		// Modify login page with a custom password url (if option is set).
 		add_filter( 'lostpassword_url', array( Login_Form::get_instance(), 'custom_lostpassword_url' ) );
 
+		// Modify the log in URL (if applicable options are set).
+		add_filter( 'login_url', array( Login_Form::get_instance(), 'maybe_add_external_wordpress_to_log_in_links' ) );
+
 		// If we have a custom login error, add the filter to show it.
 		$error = get_option( 'auth_settings_advanced_login_error' );
 		if ( $error && strlen( $error ) > 0 ) {