Skip to content

Add a filter for nonce and state cookie names #495

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
joshcanhelp merged 1 commit into from
Jun 28, 2018
Merged

Add a filter for nonce and state cookie names #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions lib/WP_Auth0_Nonce_Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ private function __construct() {
* Start-up process to make sure we have something stored.
*/
protected function init() {
if ( defined( static::NONCE_COOKIE_NAME ) && isset( $_COOKIE[ static::NONCE_COOKIE_NAME ] ) ) {
// If a NONCE_COOKIE_NAME is not defined then we don't need to persist the nonce value.
if ( defined( static::NONCE_COOKIE_NAME ) && isset( $_COOKIE[ static::get_storage_cookie_name() ] ) ) {
// Have a cookie, don't want to generate a new one.
$this->unique = $_COOKIE[ static::NONCE_COOKIE_NAME ];
$this->unique = $_COOKIE[ static::get_storage_cookie_name() ];
} else {
// No cookie, need to create one.
$this->unique = $this->generate_unique();
Expand Down Expand Up @@ -111,7 +112,7 @@ public function set_cookie( $value = null ) {
if ( is_null( $value ) ) {
$value = $this->unique;
}
return $this->handle_cookie( $this->get_storage_cookie_name(), $value, $this->get_cookie_exp() );
return $this->handle_cookie( static::get_storage_cookie_name(), $value, $this->get_cookie_exp() );
}

/**
Expand All @@ -122,7 +123,7 @@ public function set_cookie( $value = null ) {
* @return bool
*/
public function validate( $value ) {
$cookie_name = $this->get_storage_cookie_name();
$cookie_name = static::get_storage_cookie_name();
$valid = isset( $_COOKIE[ $cookie_name ] ) ? $_COOKIE[ $cookie_name ] === $value : false;
$this->reset();
return $valid;
Expand All @@ -134,7 +135,7 @@ public function validate( $value ) {
* @return bool
*/
public function reset() {
return $this->handle_cookie( $this->get_storage_cookie_name(), '', 0 );
return $this->handle_cookie( static::get_storage_cookie_name(), '', 0 );
}

/**
Expand Down Expand Up @@ -179,7 +180,7 @@ protected function handle_cookie( $cookie_name, $cookie_value, $cookie_exp ) {
*
* @return string
*/
protected function get_storage_cookie_name() {
return static::NONCE_COOKIE_NAME;
public static function get_storage_cookie_name() {
return apply_filters( 'auth0_nonce_cookie_name', static::NONCE_COOKIE_NAME );
}
}
4 changes: 2 additions & 2 deletions lib/WP_Auth0_State_Handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ final class WP_Auth0_State_Handler extends WP_Auth0_Nonce_Handler {
*
* @return string
*/
protected function get_storage_cookie_name() {
return self::STATE_COOKIE_NAME;
public static function get_storage_cookie_name() {
return apply_filters( 'auth0_state_cookie_name', self::STATE_COOKIE_NAME );
}
}
4 changes: 2 additions & 2 deletions templates/auth0-sso-handler-lock10.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
var $input2=$(document.createElement('input')).attr('name','state').val(authResult.state);
$form.append($input).append($input2);
$("body").append($form);
Cookies.set( '<?php echo WP_Auth0_State_Handler::STATE_COOKIE_NAME ?>', authResult.state );
Cookies.set( '<?php echo WP_Auth0_Nonce_Handler::NONCE_COOKIE_NAME ?>', authResult.idTokenPayload.nonce );
Cookies.set( '<?php echo WP_Auth0_State_Handler::get_storage_cookie_name() ?>', authResult.state );
Cookies.set( '<?php echo WP_Auth0_Nonce_Handler::get_storage_cookie_name() ?>', authResult.idTokenPayload.nonce );
$form.submit();
});
}
Expand Down
4 changes: 2 additions & 2 deletions templates/login-form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ function renderAuth0Form( $canShowLegacyLogin = true, $specialSettings = array()
'ready' => WP_Auth0::ready(),
'domain' => $options->get( 'domain' ),
'clientId' => $options->get( 'client_id' ),
'stateCookieName' => WP_Auth0_State_Handler::STATE_COOKIE_NAME,
'nonceCookieName' => WP_Auth0_Nonce_Handler::NONCE_COOKIE_NAME,
'stateCookieName' => WP_Auth0_State_Handler::get_storage_cookie_name(),
'nonceCookieName' => WP_Auth0_Nonce_Handler::get_storage_cookie_name(),
'usePasswordless' => $use_passwordless,
'loginFormId' => WPA0_AUTH0_LOGIN_FORM_ID,
'showAsModal' => ! empty( $specialSettings['show_as_modal'] ),
Expand Down