Skip to content

fix: adapt to SimpleSAMLphp configuration-getters and namespace refactors #956

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

Open
Menrath wants to merge 5 commits into
base: MOODLE_500_STABLE
Choose a base branch
from
+17 −13
Open

fix: adapt to SimpleSAMLphp configuration-getters and namespace refactors #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46e919b
fix: adjust configuration getters to SimpleSAMLphp refactor
Menrath May 5, 2026
e2da0b1
fix: align SimpleSAML_Error_Exception usage with SimpleSAMLphp refactor
Menrath May 5, 2026
28d2ff7
fix: usage of SimpleSAML\XHTML\Template
Menrath May 5, 2026
5982692
misc: add type hint for auth source variable
Menrath May 5, 2026
3f9014d
fix: adjust usage of removed send function of SimpleSamlPHP XHTML tem…
Menrath May 5, 2026
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
23 changes: 12 additions & 11 deletions locallib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
*/

use auth_saml2\event\cert_regenerated;
use SimpleSAML\Error\Exception as SimpleSAML_Error_Exception;

// @codingStandardsIgnoreStart
/**
Expand All @@ -39,7 +40,7 @@ function auth_saml2_get_sp_metadata($baseurl = '') {

$sourceId = $saml2auth->spname;

$file = $saml2auth->get_file_sp_metadata_file($baseurl);
$file = $saml2auth->get_file_sp_metadata_file();
if (file_exists($file)) {
$xml = file_get_contents($file);
return $xml;
Expand Down Expand Up @@ -146,40 +147,40 @@ function auth_saml2_get_sp_metadata($baseurl = '') {
$metaArray20['NameIDFormat'] = $format;
}

$name = $spconfig->getLocalizedString('name', NULL);
$attributes = $spconfig->getArray('attributes', array());
$name = $spconfig->getOptionalLocalizedString('name', NULL);
$attributes = $spconfig->getOptionalArray('attributes', array());

if ($name !== NULL && !empty($attributes)) {
$metaArray20['name'] = $name;
$metaArray20['attributes'] = $attributes;
$metaArray20['attributes.required'] = $spconfig->getArray('attributes.required', array());
$metaArray20['attributes.required'] = $spconfig->getOptionalArray('attributes.required', array());

if (empty($metaArray20['attributes.required'])) {
unset($metaArray20['attributes.required']);
}

$description = $spconfig->getArray('description', NULL);
$description = $spconfig->getOptionalArray('description', NULL);
if ($description !== NULL) {
$metaArray20['description'] = $description;
}

$nameFormat = $spconfig->getString('attributes.NameFormat', NULL);
$nameFormat = $spconfig->getOptionalString('attributes.NameFormat', NULL);
if ($nameFormat !== NULL) {
$metaArray20['attributes.NameFormat'] = $nameFormat;
}
}

// add organization info
$orgName = $spconfig->getLocalizedString('OrganizationName', NULL);
$orgName = $spconfig->getOptionalLocalizedString('OrganizationName', NULL);
if ($orgName !== NULL) {
$metaArray20['OrganizationName'] = $orgName;

$metaArray20['OrganizationDisplayName'] = $spconfig->getLocalizedString('OrganizationDisplayName', NULL);
$metaArray20['OrganizationDisplayName'] = $spconfig->getOptionalLocalizedString('OrganizationDisplayName', NULL);
if ($metaArray20['OrganizationDisplayName'] === NULL) {
$metaArray20['OrganizationDisplayName'] = $orgName;
}

$metaArray20['OrganizationURL'] = $spconfig->getLocalizedString('OrganizationURL', NULL);
$metaArray20['OrganizationURL'] = $spconfig->getOptionalLocalizedString('OrganizationURL', NULL);
if ($metaArray20['OrganizationURL'] === NULL) {
throw new SimpleSAML_Error_Exception('If OrganizationName is set, OrganizationURL must also be set.');
}
Expand All @@ -193,10 +194,10 @@ function auth_saml2_get_sp_metadata($baseurl = '') {
}

// add technical contact
$email = $config->getString('technicalcontact_email', 'na@example.org', FALSE);
$email = $config->getOptionalString('technicalcontact_email', FALSE);
if ($email && $email !== 'na@example.org') {
$techcontact['emailAddress'] = $email;
$techcontact['name'] = $config->getString('technicalcontact_name', NULL);
$techcontact['name'] = $config->getOptionalString('technicalcontact_name', NULL);
$techcontact['contactType'] = 'technical';
$metaArray20['contacts'][] = \SimpleSAML\Utils\Config\Metadata::getContact($techcontact);
}
Expand Down
1 change: 1 addition & 0 deletions selectidp.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
*/

use auth_saml2\admin\saml2_settings;
use SimpleSAML\Error\Exception as SimpleSAML_Error_Exception;

// @codingStandardsIgnoreStart
require_once(__DIR__ . '/../../config.php');
Expand Down
6 changes: 4 additions & 2 deletions sp/metadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
* @package auth_saml2
* @copyright Brendan Heywood <brendan@catalyst-au.net>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*
* @var \SimpleSAML\Module\saml\Auth\Source\SP $source The Service Provider Source definition.
*/

// @codingStandardsIgnoreStart
Expand All @@ -52,13 +54,13 @@

if (array_key_exists('output', $_REQUEST) && $_REQUEST['output'] == 'xhtml') {

$t = new SimpleSAML_XHTML_Template($config, 'metadata.php', 'admin');
$t = new SimpleSAML\XHTML\Template($config, 'metadata.php');

$t->data['header'] = 'saml20-sp';
$t->data['metadata'] = htmlspecialchars($xml);
$t->data['metadataflat'] = '$metadata[' . var_export($entityId, TRUE) . '] = ' . var_export($metaArray20, TRUE) . ';';
$t->data['metaurl'] = $source->getMetadataURL();
$t->show();
$t->send();
} else {
// header('Content-Type: application/samlmetadata+xml');
header('Content-Type: text/xml');
Expand Down
Loading