-
Notifications
You must be signed in to change notification settings - Fork 698
Disconnect ADFS-module from SimpleSAMLphp #2227
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.
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
Conversation
* Use Locales instead of Languages * Rename locales to match ISO-standard * Add upgrade note
* i18n in 2.3 allow Brazilian to be selected again * This is a more special case * break the CI again but with simpler code * Allow CI to complete with no implicit lower case on lang * One more case of strtolower --------- Co-authored-by: Tim van Dijen <tvdijen@gmail.com>
1248083 to
1421717
Compare
* Remove deprecated spaceless-filter * Fix whitespace-issue in converted metadata block * Add update-note
…find things (#2235) * docs: add some dev info about ssp-assets-base to help new developers find things * docs: cleaning
* Throw user-friendly exception with the proper HTTP statuscode for 'method not found' * Suppress traceback for MethodNotAllowed error, unless debug-logging is set * Be able to suppress error reporting for specific types of errors
…of the current language
monkeyiq
left a comment
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.
We can check out the no metadata signing issue before or after merge.
|
Should be fixed in the |
|
My setup is probably a little strange. I have in my config.php: I have in my adfs-idp-hosted.php metadata file With that configuration I have to add a test like this in ADFS.php After digging into this a bit more what I think we want is for me to set the privatekey/certificate to null in the idp file and the code to load keys changes to something like Otherwise the |
|
Thinking a bit more, it is a bit cleaner if the privatekey/certificate calls remain not optional but are moved into a block that is wrapped in a test if signing is desired (true by default). |
|
I'm not sure I follow what you're doing? What does If you want your assertions signed, you have to set a key-pair in the adfs-idp-hosted.php file. This is not different from SAML IDPs by the way. |
|
Please ignore my comment about 'metadata.sign.enable' I was thinking about how the code might be a little simpler if it was using a config key but it was the end of a long day so the key I mentioned was not valid. |
|
The end of my slightly older comment is still ok though... the code does need to check for privatekey using |
|
Gotcha, changed two getString with getOptionalString |
|
Hmm, |
|
I think I properly fixed it now |
|
Cool. Login works without key/cert here. |
|
Should we tag a release of the module before merging? |
|
I've tagged v3.0.0-rc1 for the module and I will rebase this PR against the 2.4 release branch |
|
I took a quick look at the PR after the rebase. It seems LanguageTest.php is being changed in the PR and src/SimpleSAML/Locale/Language.php. The former seems ok but the later seems to be removing the lower casing of the language from 2.4 so maybe something was a little funky in the rebase?
|
|
The strtolower only seems to exist in 2.4 ... Not in 2.3, not in master.. Something wasn't properly cherry-picked along the different branches here |
|
Ah I see commit b9e38b9 above seems to be it. |
|
Right, so it was intentionally removed in the 2.3 branch, but we failed to cherry-pick it to 2.4 .. |
|
I am wondering about the many other commits at the top of the PR. For example the "Add link to 2.3 upgrade notes" doesn't seem to be in 2.4 either. |
|
Ah I see, they were cherry picked into feature/adfs-upgrade and are now being merged into simplesamlphp-2.4. |
|
I am thinking the "rebase and merge" option is probably the way to go? This will keep info about the cherry picked stuff separate in the history. |
|
I will merge this tomorrow morning. |
|
hmm, the rebase and merge is saying it cannot be done due to conflicts :( |
|
I guess the normal merge is the second best option. The squash seems like the least desirable for this PR. |
Disconnect ADFS-module from SimpleSAMLphp
This particular code was used by the ADFS-module to generate metadata.
The new adfs-module (currently in dev-feature/library) now has it's own metadata-builder and uses the low-level ws-security library to build the SecurityTokenServiceType-element and it's content.
Since this is fully backwards compatible once I tag a new major of the module (people can still use the adfs metadata-endpoint and get the same result), this should be fine to merge in the current release.