Skip to content
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

feat(settings): optional config option for sp entityId #932

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

feat(settings): optional config option for sp entityId #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7c4fe8
feat(settings): optional config option for sp entityId
sniegel-mind4bytes Feb 8, 2025
d4fff98
feat(settings): optional config option for sp entityId - fix formatting
sniegel-mind4bytes Feb 8, 2025
0c1523b
feat(settings): optional config option for sp entityId - fix linter m…
sniegel-mind4bytes Feb 10, 2025
9de6caf
feat(settings): optional config option for sp entityId - allow unsett…
sniegel-mind4bytes Mar 5, 2025
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
5 changes: 4 additions & 1 deletion lib/SAMLSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class SAMLSettings {
'saml-attribute-mapping-group_mapping_prefix',
'saml-user-filter-reject_groups',
'saml-user-filter-require_groups',
'sp-entityId',
'sp-x509cert',
'sp-name-id-format',
'sp-privateKey',
Expand Down Expand Up @@ -140,7 +141,9 @@ public function getOneLoginSettingsArray(int $idp): array {
// "sloWebServerDecode" is not expected to be passed to the OneLogin class
],
'sp' => [
'entityId' => $this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.getMetadata'),
'entityId' => (array_key_exists('sp-entityId', $this->configurations[$idp]) && trim($this->configurations[$idp]['sp-entityId']) != '')
? $this->configurations[$idp]['sp-entityId']
: $this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.getMetadata'),
'assertionConsumerService' => [
'url' => $this->urlGenerator->linkToRouteAbsolute('user_saml.SAML.assertionConsumerService'),
],
Expand Down
17 changes: 15 additions & 2 deletions lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,21 @@ public function getForm() {
];
}
$serviceProviderFields = [
'x509cert' => $this->l10n->t('X.509 certificate of the Service Provider'),
'privateKey' => $this->l10n->t('Private key of the Service Provider'),
'x509cert' => [
'text' => $this->l10n->t('X.509 certificate of the Service Provider'),
'type' => 'text',
'required' => false,
],
'privateKey' => [
'text' => $this->l10n->t('Private key of the Service Provider'),
'type' => 'text',
'required' => false,
],
'entityId' => [
'text' => $this->l10n->t('Service Provider EntityId (optional)'),
'type' => 'line',
'required' => false,
]
];
$securityOfferFields = [
'nameIdEncrypted' => $this->l10n->t('Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted.'),
Expand Down
10 changes: 7 additions & 3 deletions templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,14 @@
} ?> ><?php p($value['label']) ?></option>
<?php endforeach; ?>
</select>
<?php foreach ($_['sp'] as $key => $text): ?>
<?php foreach ($_['sp'] as $key => $attribute): ?>
<p>
<label class="user-saml-standalone-label" for="user-saml-<?php p($key) ?>"><?php p($text) ?></label><br/>
<textarea id="user-saml-<?php p($key) ?>" name="<?php p($key) ?>"><?php p($_['config']['sp-' . $key] ?? '') ?></textarea>
<label class="user-saml-standalone-label" for="user-saml-<?php p($key) ?>"><?php p($attribute['text']) ?></label><br/>
<?php if ($attribute['type'] === 'line'): ?>
<input id="user-saml-<?php p($key) ?>" name="<?php p($key) ?>" value="<?php p($_['config']['sp-' . $key] ?? '') ?>" type="text" <?php if (isset($attribute['required']) && $attribute['required'] === true): ?>class="required"<?php endif;?>/>
<?php else: ?>
<textarea id="user-saml-<?php p($key) ?>" name="<?php p($key) ?>" <?php if (isset($attribute['required']) && $attribute['required'] === true): ?>class="required"<?php endif;?>><?php p($_['config']['sp-' . $key] ?? '') ?></textarea>
<?php endif; ?>
</p>
<?php endforeach; ?>
</div>
Expand Down
17 changes: 15 additions & 2 deletions tests/unit/Settings/AdminTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,21 @@ public function formDataProvider() {
});

$serviceProviderFields = [
'x509cert' => 'X.509 certificate of the Service Provider',
'privateKey' => 'Private key of the Service Provider',
'x509cert' => [
'text' => 'X.509 certificate of the Service Provider',
'type' => 'text',
'required' => false,
],
'privateKey' => [
'text' => 'Private key of the Service Provider',
'type' => 'text',
'required' => false,
],
'entityId' => [
'text' => 'Service Provider EntityId (optional)',
'type' => 'line',
'required' => false,
]
];
$securityOfferFields = [
'nameIdEncrypted' => 'Indicates that the nameID of the <samlp:logoutRequest> sent by this SP will be encrypted.',
Expand Down