Wikinaut has submitted this change and it was merged.
Change subject: Bug 54511: Let OpenIDServer show an error msg for untrusted
TrustRoot
......................................................................
Bug 54511: Let OpenIDServer show an error msg for untrusted TrustRoot
Bug 54511
Change-Id: I1bfb754f0dc21557ef37d2dfcce54b31b3457fb5
---
M CHANGES
M OpenID.php
M SpecialOpenIDServer.body.php
3 files changed, 13 insertions(+), 2 deletions(-)
Approvals:
Wikinaut: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/CHANGES b/CHANGES
index b2b0d5e..54966ae 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
CHANGES
=======
+3.44 20131122 bug 54511 Let OpenIDServer show a meaningful error message in
+ case of untrusted trust root
3.43 20131103 bug 34844 and 34846
add uoi_user_registration for PostgreSQL
add uoi_user_registration field to the user_openid table
diff --git a/OpenID.php b/OpenID.php
index f67fcce..6aa0b08 100644
--- a/OpenID.php
+++ b/OpenID.php
@@ -29,7 +29,7 @@
exit( 1 );
}
-define( 'MEDIAWIKI_OPENID_VERSION', '3.43 20131103' );
+define( 'MEDIAWIKI_OPENID_VERSION', '3.44 20131122' );
$path = dirname( __FILE__ );
set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR .
get_include_path() );
diff --git a/SpecialOpenIDServer.body.php b/SpecialOpenIDServer.body.php
index 2d9723a..b821b21 100644
--- a/SpecialOpenIDServer.body.php
+++ b/SpecialOpenIDServer.body.php
@@ -189,6 +189,15 @@
return;
}
+ if ( is_a( $request, 'Auth_OpenID_ServerError' ) ) {
+ $wgOut->showErrorPage(
+ 'openiderror',
+ 'openid-error-server-response',
+ array( "", wfEscapeWikiText(
$request->toString() ) . "." )
+ );
+ return;
+ }
+
switch ( $request->mode ) {
case "checkid_setup":
@@ -606,7 +615,7 @@
}
function SregFromQuery( $query ) {
- $sreg = array(
+ $sreg = array(
'required' => array(),
'optional' => array(),
'policy_url' => null
--
To view, visit https://gerrit.wikimedia.org/r/97075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1bfb754f0dc21557ef37d2dfcce54b31b3457fb5
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/OpenID
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
