openid: Add support for custom extension args.

olavmo-sikt · olavmo-sikt · commit 56eb4ac8b902 · 2010-12-22T13:00:24.000Z
Thanks to Andjelko Horvat for providing this patch! git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2693 44740490-163a-0410-bde0-09ae8108e29a
diff --git a/config-templates/authsources.php b/config-templates/authsources.php
@@ -109,6 +109,13 @@
 			//'http://axschema.org/contact/country/home',
 			//'http://axschema.org/pref/language',
 		),
+		// custom extension arguments
+		'extension.args' => array(
+			//'http://specs.openid.net/extensions/ui/1.0' => array(
+			//	'mode' => 'popup',
+			//	'icon' => 'true',
+			//),
+		),
 	),
 	*/
 
diff --git a/modules/openid/lib/Auth/Source/OpenIDConsumer.php b/modules/openid/lib/Auth/Source/OpenIDConsumer.php
@@ -56,6 +56,11 @@ class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 	 */
 	private $validateSReg;
 
+	/**
+	 * List of custom extension args
+	 */
+	private $extensionArgs;
+
 	/**
 	 * Constructor for this authentication source.
 	 *
@@ -80,6 +85,8 @@ public function __construct($info, $config) {
 		$this->requiredAXAttributes = $cfgParse->getArray('attributes.ax_required', array());
 
 		$this->validateSReg = $cfgParse->getBoolean('sreg.validate',TRUE);
+
+		$this->extensionArgs = $cfgParse->getArray('extension.args', array());
 	}
 
 
@@ -203,6 +210,14 @@ public function doAuth(array &$state, $openid) {
 
 		}
 
+		foreach($this->extensionArgs as $ext_ns => $ext_arg) {
+			if (is_array($ext_arg)) {
+				foreach($ext_arg as $ext_key => $ext_value) {
+					$auth_request->addExtensionArg($ext_ns, $ext_key, $ext_value);
+				}
+			}
+		}
+
 		// Redirect the user to the OpenID server for authentication.
 		// Store the token for this authentication so we can verify the
 		// response.
