Skip to content
This repository has been archived by the owner on Feb 14, 2020. It is now read-only.

Update www/importentity.php #603

Merged
merged 4 commits into from
Sep 22, 2016
Merged

Update www/importentity.php #603

merged 4 commits into from
Sep 22, 2016

Conversation

tvdijen
Copy link
Contributor

@tvdijen tvdijen commented Sep 21, 2016

[Wed Sep 21 15:35:30 2016] [error] [client 10.68.130.101] PHP Fatal error: Call to undefined method SimpleSAML_Session::getInstance() in /apps/janus/janus-1.22.0/www/importentity.php on line 15

I think this one wasn't fixed properly to support SSP 1.1.14

[Wed Sep 21 15:35:30 2016] [error] [client 10.68.130.101] PHP Fatal error:  Call to undefined method SimpleSAML_Session::getInstance() in /apps/janus/janus-1.22.0/www/importentity.php on line 15

I think this one wasn't fixed properly to support SSP 1.1.14
Copy link
Contributor

@thijskh thijskh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This partially reverts changes in 022d072 by @mrvanes. Is that intentional?

@tvdijen
Copy link
Contributor Author

tvdijen commented Sep 21, 2016

Yes, it is. He used an SimpleSAML_Auth_Simple object to replace the deprecated SimpleSAML_Session::getInstance(), but that object doesn't define the getValue/setValue methods used a bit further down in this file.
I must admit I'm not entirely sure if my fix is right, but at least it works for me.
I'll discuss the change with @mrvanes tomorrow when I see him.

@tvdijen
Copy link
Contributor Author

tvdijen commented Sep 21, 2016

After reading the deprecation notice of SimpleSAML_Session::getInstance() and this post by @jaimeperez, I really think @mrvanes has approached the whole sessionfix-patch the wrong way. Perhaps Jaime can comment on this.

@tvdijen
Copy link
Contributor Author

tvdijen commented Sep 22, 2016

@mrvanes and I agreed on a mix of both worlds.. This has been tested and works / fixes the build.

@@ -26,7 +26,7 @@
$as = new SimpleSAML_Auth_Simple($authsource);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we instantiate $as with an $authsource (where does that come from?) and right below now pass $authenticationSource. Is that really correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, sorry, I messed up..

@tvdijen tvdijen changed the title Update importentity.php Update www/importentity.php Sep 22, 2016
@thijskh thijskh merged commit 4517d81 into janus-ssp:develop Sep 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants