Skip to content

Use explicit functions to retrieve optional config #915

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
wants to merge 1 commit into
base: MOODLE_500_STABLE
Choose a base branch
from
Open

Use explicit functions to retrieve optional config #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions locallib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,40 +146,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', []);

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', []);

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 +193,10 @@ function auth_saml2_get_sp_metadata($baseurl = '') {
}

// add technical contact
$email = $config->getString('technicalcontact_email', '[email protected]', FALSE);
$email = $config->getOptionalString('technicalcontact_email', '[email protected]');
if ($email && $email !== '[email protected]') {
$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
12 changes: 6 additions & 6 deletions vendor/simplesamlphp/saml2/src/SAML2/Configuration/SimpleSAMLConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected static function pluckConfiguration(Configuration $configuration, strin
$extracted['certificateData'] = $configuration->getString($prefix.'certificate');
}

$extracted['assertionEncryptionEnabled'] = $configuration->getBoolean('assertion.encryption', false);
$extracted['assertionEncryptionEnabled'] = $configuration->getOptinalBoolean('assertion.encryption', false);

if ($configuration->hasValue('sharedKey')) {
$extracted['sharedKey'] = $configuration->getString('sharedKey');
Expand All @@ -101,7 +101,7 @@ protected static function pluckConfiguration(Configuration $configuration, strin
*/
protected static function enrichForIdentityProvider(Configuration $configuration, array &$baseConfiguration) : void
{
$baseConfiguration['base64EncodedAttributes'] = $configuration->getBoolean('base64attributes', false);
$baseConfiguration['base64EncodedAttributes'] = $configuration->getOptionalBoolean('base64attributes', false);
$baseConfiguration['entityId'] = $configuration->getString('entityid');
}

Expand Down Expand Up @@ -133,22 +133,22 @@ protected static function enrichForDecryptionProvider(
array &$baseConfiguration
) : void {
if ($configuration->hasValue('sharedKey')) {
$baseConfiguration['sharedKey'] = $configuration->getString('sharedKey', null);
$baseConfiguration['sharedKey'] = $configuration->getOptionalString('sharedKey', null);
}

if ($configuration->hasValue('new_privatekey')) {
$baseConfiguration['privateKeys'][] = new PrivateKey(
$configuration->getString('new_privatekey'),
PrivateKey::NAME_NEW,
$configuration->getString('new_privatekey_pass', null)
$configuration->getOptionalString('new_privatekey_pass', null)
);
}

if ($configuration->getBoolean('assertion.encryption', false)) {
if ($configuration->getOptionalBoolean('assertion.encryption', false)) {
$baseConfiguration['privateKeys'][] = new PrivateKey(
$configuration->getString('privatekey'),
PrivateKey::NAME_DEFAULT,
$configuration->getString('privatekey_pass', null)
$configuration->getOptionalString('privatekey_pass', null)
);

if ($configuration->hasValue('encryption.blacklisted-algorithms')) {
Expand Down