提交 ae1fdc95 编写于 作者: J Jesse Glick

[FIXED JENKINS-44010] It is possible for Jenkins.crumbIssuer to be unset while...

[FIXED JENKINS-44010] It is possible for Jenkins.crumbIssuer to be unset while the setup wizard is running.
上级 b5ee2a07
......@@ -254,7 +254,10 @@ public class SetupWizard extends PageDecorator {
a = securityRealm.getSecurityComponents().manager.authenticate(a);
SecurityContextHolder.getContext().setAuthentication(a);
CrumbIssuer crumbIssuer = Jenkins.getInstance().getCrumbIssuer();
JSONObject data = new JSONObject().accumulate("crumbRequestField", crumbIssuer.getCrumbRequestField()).accumulate("crumb", crumbIssuer.getCrumb(req));
JSONObject data = new JSONObject();
if (crumbIssuer != null) {
data.accumulate("crumbRequestField", crumbIssuer.getCrumbRequestField()).accumulate("crumb", crumbIssuer.getCrumb(req));
}
return HttpResponses.okJSON(data);
} else {
return HttpResponses.okJSON();
......
......@@ -3673,6 +3673,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
*
* @return null if none is in use.
*/
@CheckForNull
public CrumbIssuer getCrumbIssuer() {
return crumbIssuer;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册