Skip to content
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

Forward 'redirect_to' to SAML Authentication to enable deep links #103

Merged
merged 12 commits into from
Nov 29, 2017
Merged

Forward 'redirect_to' to SAML Authentication to enable deep links #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
90ca8fd
Forwaring 'redirect_to' to SAML Authentication to enable deep links
nicholasio Nov 13, 2017
c07ff86
Fix PHPCS issue
danielbachhuber Nov 13, 2017
008944a
Setting login_redirect based on RelayState Response
nicholasio Nov 13, 2017
01dd2dc
Add a test case for the 'redirect_to' scenario
danielbachhuber Nov 29, 2017
e3ee525
Merge branch 'feature/deep-links' of https://github.com/nicholasio/wp…
danielbachhuber Nov 29, 2017
aef2f0f
Only pass through `redirect_to` when present in the request
danielbachhuber Nov 29, 2017
870cf65
Only set the `redirect_to` parameter when it's supplied
danielbachhuber Nov 29, 2017
a250db0
Add debug to figure out why log-in is failing
danielbachhuber Nov 29, 2017
8cd1070
Try pressing the 'Submit' button once more
danielbachhuber Nov 29, 2017
ecd1aab
Revert "Try pressing the 'Submit' button once more"
danielbachhuber Nov 29, 2017
7744088
Revert "Add debug to figure out why log-in is failing"
danielbachhuber Nov 29, 2017
046beff
Don't filter the login redirect when it's to itself
danielbachhuber Nov 29, 2017
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
24 changes: 21 additions & 3 deletions inc/class-wp-saml-auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,23 @@ public function action_login_message( $message ) {
'button' => __( 'Sign In', 'wp-saml-auth' ),
'alt_title' => __( 'Or, sign in with WordPress:', 'wp-saml-auth' ),
);

$query_args = array(
'action' => 'wp-saml-auth',
);
$redirect_to = filter_input( INPUT_GET, 'redirect_to', FILTER_SANITIZE_URL );
if ( $redirect_to ) {
$query_args['redirect_to'] = rawurlencode( $redirect_to );
}

/**
* Permit login screen text strings to be easily customized.
*
* @param array $strings Existing text strings.
*/
$strings = apply_filters( 'wp_saml_auth_login_strings', $strings );
echo '<h3><em>' . esc_html( $strings['title'] ) . '</em></h3>';
echo '<div id="wp-saml-auth-cta"><p><a class="button" href="' . esc_url( add_query_arg( 'action', 'wp-saml-auth', wp_login_url() ) ) . '">' . esc_html( $strings['button'] ) . '</a></p></div>';
echo '<div id="wp-saml-auth-cta"><p><a class="button" href="' . esc_url( add_query_arg( $query_args, wp_login_url() ) ) . '">' . esc_html( $strings['button'] ) . '</a></p></div>';
echo '<h3><em>' . esc_html( $strings['alt_title'] ) . '</em></h3>';
return $message;
}
Expand Down Expand Up @@ -211,9 +220,17 @@ public function do_saml_authentication() {
// Translators: Includes error reason from OneLogin.
return new WP_Error( 'wp_saml_auth_unauthenticated', sprintf( __( 'User is not authenticated with SAML IdP. Reason: %s', 'wp-saml-auth' ), $this->provider->getLastErrorReason() ) );
}
$attributes = $this->provider->getAttributes();
$attributes = $this->provider->getAttributes();
$redirect_to = filter_input( INPUT_POST, 'RelayState', FILTER_SANITIZE_URL );
if ( $redirect_to && false === stripos( $redirect_to, 'wp-login.php' ) ) {
add_filter( 'login_redirect', function() use ( $redirect_to ) {
return $redirect_to;
}, 1 );
}
} else {
$this->provider->login( $_SERVER['REQUEST_URI'] );
$redirect_to = filter_input( INPUT_GET, 'redirect_to', FILTER_SANITIZE_URL );
$redirect_to = $redirect_to ? : $_SERVER['REQUEST_URI'];
$this->provider->login( $redirect_to );
}
} elseif ( is_a( $this->provider, 'SimpleSAML_Auth_Simple' ) ) {
$this->provider->requireAuth(
Expand Down Expand Up @@ -245,6 +262,7 @@ public function do_saml_authentication() {
// Translators: Communicates how the user is fetched based on the SAML response.
return new WP_Error( 'wp_saml_auth_missing_attribute', sprintf( esc_html__( '"%1$s" attribute is expected, but missing, in SAML response. Attribute is used to fetch existing user by "%2$s". Please contact your administrator.', 'wp-saml-auth' ), $attribute, $get_user_by ) );
}

$existing_user = get_user_by( $get_user_by, $attributes[ $attribute ][0] );
if ( $existing_user ) {
/**
Expand Down
10 changes: 10 additions & 0 deletions tests/behat/login.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ Feature: SAML Login
Then print current URL
Then the "email" field should contain "[email protected]"

Scenario: Redirects using the 'redirect_to' field
Given I am on "wp-login.php?redirect_to=/sample-page/"
Then print current URL
And I fill in "username" with "employee"
And I fill in "password" with "employeepass"
And I press "submit"
And I press "Submit"
Then print current URL
Then I should see "Sample Page" in the ".entry-title" element

Scenario: Errors on an invalidpassword
Given I am on "wp-login.php"
Then print current URL
Expand Down