-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Fix openid.mod files for Jetty 12 #11907
Conversation
Signed-off-by: Lachlan Roberts <[email protected]>
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.
Please check ModulesTest.testOpenidModules()
, which has not been updated and passes but it should not.
jetty-ee8/jetty-ee8-openid/src/main/config/modules/ee8-openid.mod
Outdated
Show resolved
Hide resolved
jetty-ee9/jetty-ee9-openid/src/main/config/modules/ee9-openid.mod
Outdated
Show resolved
Hide resolved
@sbordet it makes sense why this test is passing, it is using |
Signed-off-by: Lachlan Roberts <[email protected]>
@lachlan-roberts the test is passing, but it's just spitting out errors, so it should not pass. |
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.
You have 2 options:
- Use the
modules/openid/
directory properly. - Don't copy the live jetty-home xml to the jetty-base xml.
@@ -12,7 +12,7 @@ lib/jetty-util-ajax-${jetty.version}.jar | |||
lib/jetty-openid-${jetty.version}.jar | |||
|
|||
[files] | |||
basehome:modules/openid/jetty-openid-baseloginservice.xml|etc/jetty-openid-baseloginservice.xml | |||
basehome:etc/jetty-openid-baseloginservice.xml|etc/jetty-openid-baseloginservice.xml |
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.
ugh, don't copy a live XML from jetty-home to jetty-base.
The modules/openid/ directory exists for a reason.
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.
I thought it was useful, because if the xml was deleted from jetty-base/etc then it still works.
And the use of this XML is optional, but it would be annoying to have to manually copy it over when you need to use it.
Anyway I reverted this change so the file is back at modules/openid/jetty-openid-baseloginservice.xml
.
Signed-off-by: Lachlan Roberts <[email protected]>
Signed-off-by: Lachlan Roberts <[email protected]>
I checked the output of the test. The test is not setting up OpenID correctly, it just adding the module and verifying that it has the message We have tests like |
jetty-openid-baseloginservice.xml
,jetty-openid.xml
, or the ini template, just the core one is enough.ee10-openid.mod
is pointless because it doesn't do anything other than depend onopenid.mod
so it has been removed.ee8-openid.mod
needed to specify its environment as ee8, was currently not working.