-
Notifications
You must be signed in to change notification settings - Fork 95
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
[JENKINS-75056] Upgrade pac4j to version 6.1.0 #491
base: master
Are you sure you want to change the base?
[JENKINS-75056] Upgrade pac4j to version 6.1.0 #491
Conversation
} | ||
|
||
/** | ||
* This method is needed as there seems to be a bug in pac4j and hasChanged is not able to return true |
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 am curious: Is there an official bug report link? Maybe helpful to add this here...
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.
@@ -1376,12 +1400,10 @@ public boolean handleTokenExpiration(HttpServletRequest httpRequest, HttpServlet | |||
} | |||
|
|||
private void redirectToLoginUrl(HttpServletRequest req, HttpServletResponse res) throws IOException { | |||
if (req != null && (req.getSession(false) != null || Strings.isNullOrEmpty(req.getHeader("Authorization")))) { | |||
if (req.getSession(false) != null || Strings.isNullOrEmpty(req.getHeader("Authorization"))) { |
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 added the null check on purpose (see https://github.com/jenkinsci/oic-auth-plugin/releases/tag/4.438.v6e62f6782770).
Suggestion: add @NonNull
to the parameters to tighten the contract.
if (res != null) { | ||
res.sendRedirect(Jenkins.get().getSecurityRealm().getLoginUrl()); | ||
} | ||
res.sendRedirect(Jenkins.get().getSecurityRealm().getLoginUrl()); |
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 added the null check on purpose (see https://github.com/jenkinsci/oic-auth-plugin/releases/tag/4.438.v6e62f6782770).
Suggestion: add @NonNull
to the parameters to tighten the contract.
src/main/java/org/jenkinsci/plugins/oic/OicdPluginOpMetadataResolver.java
Outdated
Show resolved
Hide resolved
} | ||
|
||
/** | ||
* This method is needed as there seems to be a bug in pac4j and hasChanged is not able to return true |
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.
… like jackson lib coming from jackson2 plugin
…solver.java Co-authored-by: Francisco Javier Fernandez <[email protected]>
I wonder if this PR super-seeds #455? |
Yes, seems like the same change. |
<springVersion>6.1.14</springVersion> | ||
<jacksonVersion>2.18.1</jacksonVersion> |
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.
unused?
CI is failing as pom uses 5.3 version of plugin-pom which needs min maven 3.9.6 I think CI needs an update to use the updated Maven version. |
Depends on #485 |
Testing done
Executed all the Junit tests
Executed OicAuthPluginTest
The plugin is compiling and passing all the tests.
Jenkins issue 75056
Submitter checklist