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

Use namespaced SimpleSAMLphp class if available #118

Merged
merged 2 commits into from
Mar 29, 2018
Merged

Use namespaced SimpleSAMLphp class if available #118

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a175f67
fix #117 use namespaced SimpleSAMLphp class if available
modelm Mar 29, 2018
8bfc261
fix printf & phpcs syntax for dynamic simplesaml classname
modelm Mar 29, 2018
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
19 changes: 15 additions & 4 deletions inc/class-wp-saml-auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@ class WP_SAML_Auth {
*/
private $provider = null;

/**
* Class name to instantiate for SimpleSAML Auth.
* Replaced with namespaced version if available.
*
* @var string
*/
private $simplesamlphp_class = 'SimpleSAML_Auth_Simple';

/**
* Get the controller instance
*
Expand Down Expand Up @@ -84,18 +92,21 @@ public function action_init() {
if ( file_exists( $simplesamlphp_path ) ) {
require_once $simplesamlphp_path;
}
if ( ! class_exists( 'SimpleSAML_Auth_Simple' ) ) {
if ( class_exists( 'SimpleSAML\Auth\Simple' ) ) {
$this->simplesamlphp_class = 'SimpleSAML\Auth\Simple';
}
if ( ! class_exists( $this->simplesamlphp_class ) ) {
add_action(
'admin_notices', function() {
if ( current_user_can( 'manage_options' ) ) {
// Translators: Links to the WP SAML Auth plugin.
echo '<div class="message error"><p>' . wp_kses_post( sprintf( __( "WP SAML Auth wasn't able to find the <code>SimpleSAML_Auth_Simple</code> class. Please check the <code>simplesamlphp_autoload</code> configuration option, or <a href='%s'>visit the plugin page</a> for more information.", 'wp-saml-auth' ), 'https://wordpress.org/plugins/wp-saml-auth/' ) ) . '</p></div>';
echo '<div class="message error"><p>' . wp_kses_post( sprintf( __( "WP SAML Auth wasn't able to find the <code>%1\$s</code> class. Please check the <code>simplesamlphp_autoload</code> configuration option, or <a href='%2\$s'>visit the plugin page</a> for more information.", 'wp-saml-auth' ), $this->simplesamlphp_class, 'https://wordpress.org/plugins/wp-saml-auth/' ) ) . '</p></div>';
}
}
);
return;
}
$this->provider = new SimpleSAML_Auth_Simple( self::get_option( 'auth_source' ) );
$this->provider = new $this->simplesamlphp_class( self::get_option( 'auth_source' ) );
}
add_action( 'login_head', array( $this, 'action_login_head' ) );
add_action( 'login_message', array( $this, 'action_login_message' ) );
Expand Down Expand Up @@ -240,7 +251,7 @@ public function do_saml_authentication() {
$redirect_to = $redirect_to ? : $_SERVER['REQUEST_URI'];
$this->provider->login( $redirect_to );
}
} elseif ( is_a( $this->provider, 'SimpleSAML_Auth_Simple' ) ) {
} elseif ( is_a( $this->provider, $this->simplesamlphp_class ) ) {
$redirect_to = filter_input( INPUT_GET, 'redirect_to', FILTER_SANITIZE_URL );
if ( $redirect_to ) {
$redirect_to = add_query_arg(
Expand Down