WIP for testing: SAML Config Refactor #2953
Conversation
|
Is this going to subsume any of the other SAML PR's? |
|
#2924 is still needed i believe |
| $config['certdir'] = "/var/www/simplesamlphp/cert/"; | ||
| $config['metadatadir'] = "/var/www/simplesamlphp/metadata"; | ||
| $config['baseurlpath'] = 'simplesaml/'; | ||
| $config['loggingdir'] = '/var/www/simplesamlphp/log/'; | ||
| } |
There was a problem hiding this comment.
there are 2 } here at lines 68/69 and only 1 is needed (fatal)
| $cached_id = ''; | ||
| } | ||
|
|
||
| return $cached_id; | ||
| } |
There was a problem hiding this comment.
there are 3 } here and only 1 is needed (fatal)
|
closed in error - can you clarify why #2924 is still needed @mikemadison13? |
|
@lcatlett looking again, it's not i don't think. looks like you covered the multi-site stuff in this. sorry! |
|
@ba66e77 This PR should subsume any other SAML config PRs. |
| $creds_json = file_get_contents('/var/www/site-php/' . getenv('AH_SITE_NAME') . '/creds.json'); | ||
| elseif (getenv('AH_SITE_ENVIRONMENT')) { | ||
| // Set ACE ad ACSF sites based on hosting database and site name. | ||
| $config['certdir'] = "/mnt/www/html/{$_ENV['AH_SITE_GROUP']}.{$_ENV['AH_SITE_ENVIRONMENT']}/simplesamlphp/cert/"; |
There was a problem hiding this comment.
/mnt/www/html/{$_ENV['AH_SITE_GROUP']}.{$_ENV['AH_SITE_ENVIRONMENT']}/simplesamlphp/ is pointing to the simplesamlphp symlink in the docroot from symlinkDocrootToLibDir() right? Using a relative path works and would make non-environment specific, i.e. $config['certdir'] = 'cert/';. Same for $config['metadatadir'] on the next line
There was a problem hiding this comment.
@rjgwiz I believe the simplesamlphp_auth module has a note that it requires absolute paths for those files - have you found that not to be the case?
There was a problem hiding this comment.
@lcatlett yea - in our project we have been using relative path for over a year. Currently on simplesamlphp v1.15.4
|
@mikemadison13, you had requested changes on this PR. Have they all been addressed at this point? |
|
@ba66e77 yes i think we are good now! |
This reverts commit 312d471.
* Revert "Updating CHANGELOG.md and setting version for 9.1.2." This reverts commit 5e52325. * Revert "Minor code review docs update (#3013)" This reverts commit 25e3887. * Revert "SAML Config Refactor (#2953)" This reverts commit 312d471. * Revert "Improve template/README.md (#3004)" This reverts commit 316967d. * Revert "Multisite setup enhancements and bugfixes (#2997)" This reverts commit d0da339.
Fixes #2950 #2949
Changes proposed: