Add config for identity_providers in local_info.xml #524
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -179,6 +179,37 @@ | |||||||||||||
| --> | ||||||||||||||
| <restrict_personal_data>false</restrict_personal_data> | ||||||||||||||
|
|
||||||||||||||
| <!-- identity_providers | ||||||||||||||
| Shib/CheckIn Token reads config file | ||||||||||||||
| for needed AAI entitlements. | ||||||||||||||
| This is to allow Admins so that they will be empowered | ||||||||||||||
| to make quicker changes to AAI references. | ||||||||||||||
| --> | ||||||||||||||
| <identity_providers> | ||||||||||||||
| <provider> | ||||||||||||||
| <idp>aai.egi.eu/auth/realms/egi</idp> | ||||||||||||||
| <name>EGI Proxy</name> | ||||||||||||||
| <authentication_realms> | ||||||||||||||
| <shib_realm_name>EGI Proxy IdP</shib_realm_name> | ||||||||||||||
| </authentication_realms> | ||||||||||||||
| <required_groups> | ||||||||||||||
| <group>urn:mace:egi.eu:res:gocdb#aai.egi.eu</group> | ||||||||||||||
| </required_groups> | ||||||||||||||
| <help_url>https://docs.egi.eu/internal/configuration-database/access/#using-institutional-account-via-egi-check-in</help_url> | ||||||||||||||
| </provider> | ||||||||||||||
| <provider> | ||||||||||||||
| <idp>aai-demo.egi.eu/auth/realms/egi</idp> | ||||||||||||||
| <name>EGI Demo Proxy</name> | ||||||||||||||
| <authentication_realms> | ||||||||||||||
| <shib_realm_name>EGI Proxy IdP</shib_realm_name> | ||||||||||||||
| </authentication_realms> | ||||||||||||||
|
Comment on lines
+203
to
+205
There was a problem hiding this comment. As with https://github.com/GOCDB/gocdb/pull/524/files#r1842006878
Suggested change
|
||||||||||||||
| <required_groups> | ||||||||||||||
| <group>urn:mace:egi.eu:res:gocdb#aai.egi.eu</group> | ||||||||||||||
| </required_groups> | ||||||||||||||
| <help_url>https://docs.egi.eu/internal/configuration-database/access/#using-institutional-account-via-egi-check-in</help_url> | ||||||||||||||
| </provider> | ||||||||||||||
| </identity_providers> | ||||||||||||||
|
|
||||||||||||||
| </local_info> | ||||||||||||||
|
|
||||||||||||||
| <!-- | ||||||||||||||
|
|
||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -85,6 +85,7 @@ private function getAttributesInitToken(){ | |||||
| // specify location of the Shib Logout handler | ||||||
| \Factory::$properties['LOGOUTURL'] = 'https://'.$hostname.'/Shibboleth.sso/Logout'; | ||||||
| $idp = isset($_SERVER['Shib-Identity-Provider']) ? $_SERVER['Shib-Identity-Provider'] : ''; | ||||||
|
|
||||||
| if ($idp == 'https://unity.eudat-aai.fz-juelich.de:8443/saml-idp/metadata' | ||||||
| && $_SERVER['distinguishedName'] != null){ | ||||||
| $this->principal = $_SERVER['distinguishedName']; | ||||||
|
|
@@ -96,73 +97,67 @@ private function getAttributesInitToken(){ | |||||
| $this->userDetails = array('AuthenticationRealm' => array('UK_ACCESS_FED')); | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| $configService = \Factory::getConfigService(); | ||||||
| $identityProviders = $configService->getIdentityProvidersInfo(); | ||||||
|
|
||||||
| foreach ($identityProviders as $provider) { | ||||||
| if ($provider['idp'] === $idp) { | ||||||
| $name = $provider['name']; | ||||||
| $helpUrl = $provider['help_url']; | ||||||
|
|
||||||
| if (empty($_SERVER['voPersonID'])) { | ||||||
| die( | ||||||
| "Did not receive required attributes from the " | ||||||
| . "IDP $name to complete authentication. " | ||||||
|
There was a problem hiding this comment. I think this will read better
Suggested change
|
||||||
| . "Please contact gocdb-admins." | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| if (empty($_SERVER['entitlement'])) { | ||||||
| die( | ||||||
| "Did not receive the required entitlement " | ||||||
| . "attribute from the IDP $name. " | ||||||
|
There was a problem hiding this comment. I think this will read better
Suggested change
|
||||||
| . "Please contact gocdb-admins." | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
| if (!empty($provider['required_groups'])) { | ||||||
| $entitlementValues = explode(';', $_SERVER['entitlement']); | ||||||
|
|
||||||
| if ( | ||||||
| !array_intersect( | ||||||
| $entitlementValues, | ||||||
| $provider['required_groups'] | ||||||
| ) | ||||||
| ) { | ||||||
| $HTML = "<ul>" | ||||||
| . "<li>Login requires a GOCDB entitlement value " | ||||||
| . "which was not provided for the IDP $name.</li>" | ||||||
|
There was a problem hiding this comment. I think this will read better
Suggested change
|
||||||
| . "<li>Please see here for more information: " | ||||||
| . "<a href='$helpUrl' target='_blank'>" | ||||||
| . "$helpUrl</a>.</li>" | ||||||
| . "<li>Logout or restart your browser" | ||||||
| . "and attempt to login again using an IDP " | ||||||
| . "that provides a GOCDB entitlement.</li>" | ||||||
| . "</ul>"; | ||||||
| $HTML .= "<div style='text-align: center;'>"; | ||||||
| $HTML .= "<a href=\"" | ||||||
| . htmlspecialchars(\Factory::$properties['LOGOUTURL']) | ||||||
| . "\"><b><font color=\"red\">Logout</font></b></a>"; | ||||||
| $HTML .= "</div>"; | ||||||
| echo ($HTML); | ||||||
| die(); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| $this->principal = $_SERVER['voPersonID']; | ||||||
| $this->userDetails = [ | ||||||
| 'AuthenticationRealm' => $provider['authenticationRealms'] | ||||||
|
There was a problem hiding this comment. Given https://github.com/GOCDB/gocdb/pull/524/files#r1842006878, this will need a slight tweak |
||||||
| ]; | ||||||
|
|
||||||
| return; | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -203,5 +198,4 @@ public static function isPreAuthenticating() { | |||||
| public static function isStateless() { | ||||||
| return true; | ||||||
| } | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -567,4 +567,59 @@ public function getEmailTo() | |||||||||||||||||||
|
|
||||||||||||||||||||
| return $emailTo; | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| public function getIdentityProvidersInfo(): array | ||||||||||||||||||||
| { | ||||||||||||||||||||
| $localInfo = $this->GetLocalInfoXML(); | ||||||||||||||||||||
| $identityProviders = []; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| if (!empty($localInfo->identity_providers->provider)) { | ||||||||||||||||||||
|
There was a problem hiding this comment. What happens here if |
||||||||||||||||||||
| foreach ( | ||||||||||||||||||||
| $localInfo | ||||||||||||||||||||
| ->identity_providers | ||||||||||||||||||||
| ->provider as $providerDetails | ||||||||||||||||||||
| ) { | ||||||||||||||||||||
|
Comment on lines
+576
to
+581
There was a problem hiding this comment. Something like this I think would read better
Suggested change
|
||||||||||||||||||||
| /** idp */ | ||||||||||||||||||||
| $idp = (string) $providerDetails->idp; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /** name */ | ||||||||||||||||||||
| $name = (string) $providerDetails->name; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /** authentication_realms */ | ||||||||||||||||||||
| $authenticationRealms = []; | ||||||||||||||||||||
| if ($providerDetails->authentication_realms) { | ||||||||||||||||||||
|
There was a problem hiding this comment. Given https://github.com/GOCDB/gocdb/pull/524/files#r1842006878, this will need a slight tweak |
||||||||||||||||||||
| foreach ( | ||||||||||||||||||||
| $providerDetails | ||||||||||||||||||||
| ->authentication_realms | ||||||||||||||||||||
| ->shib_realm_name as $shibRealmName | ||||||||||||||||||||
| ) { | ||||||||||||||||||||
| $authenticationRealms[] = (string) $shibRealmName; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /** required_groups */ | ||||||||||||||||||||
| $requiredGroups = []; | ||||||||||||||||||||
| if ($providerDetails->required_groups) { | ||||||||||||||||||||
| foreach ( | ||||||||||||||||||||
| $providerDetails->required_groups->group as $group | ||||||||||||||||||||
| ) { | ||||||||||||||||||||
| $requiredGroups[] = (string) $group; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| /** help_url */ | ||||||||||||||||||||
| $helpURL = (string) $providerDetails->help_url; | ||||||||||||||||||||
|
|
||||||||||||||||||||
| $identityProviders[] = [ | ||||||||||||||||||||
| 'idp' => $idp, | ||||||||||||||||||||
| 'name' => $name, | ||||||||||||||||||||
| 'authenticationRealms' => $authenticationRealms, | ||||||||||||||||||||
|
There was a problem hiding this comment. Given https://github.com/GOCDB/gocdb/pull/524/files#r1842006878
Suggested change
|
||||||||||||||||||||
| 'requiredGroups' => $requiredGroups, | ||||||||||||||||||||
| 'helpURL', $helpURL | ||||||||||||||||||||
| ]; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| return $identityProviders; | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can just be
authentication_realm