Auth_Simple: Make sure that we do not return to an URL when a callback is specified.

olavmo-sikt · olavmo-sikt · commit 5c34ebcabc76 · 2010-11-16T14:29:34.000Z
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2631 44740490-163a-0410-bde0-09ae8108e29a
diff --git a/lib/SimpleSAML/Auth/Simple.php b/lib/SimpleSAML/Auth/Simple.php
@@ -104,7 +104,7 @@ public function login(array $params = array()) {
 			$returnTo = SimpleSAML_Utilities::selfURL();
 		}
 
-		if ($keepPost && $_SERVER['REQUEST_METHOD'] === 'POST') {
+		if (is_string($returnTo) && $keepPost && $_SERVER['REQUEST_METHOD'] === 'POST') {
 			$returnTo = SimpleSAML_Utilities::createPostRedirectLink($returnTo, $_POST);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function login(array $params = array()) {`
`104`	`104`	`$returnTo = SimpleSAML_Utilities::selfURL();`
`105`	`105`	`}`
`106`	`106`
`107`		`- if ($keepPost && $_SERVER['REQUEST_METHOD'] === 'POST') {`
	`107`	`+ if (is_string($returnTo) && $keepPost && $_SERVER['REQUEST_METHOD'] === 'POST') {`
`108`	`108`	`$returnTo = SimpleSAML_Utilities::createPostRedirectLink($returnTo, $_POST);`
`109`	`109`	`}`
`110`	`110`