0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #2499 display password update page

Browse source
This commit is contained in:
Shinsuke Sugaya 2020-11-19 21:27:29 +09:00
parent 4d5613cc72
commit 08866981f2
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/codelibs/fess/app/web/login/LoginAction.java
View file

@ -53,6 +53,7 @@ public class LoginAction extends FessLoginAction {
@Execute
public HtmlResponse index() {
getSession().ifPresent(session -> session.removeAttribute(INVALID_OLD_PASSWORD));
return asIndexPage(null).useForm(LoginForm.class);
}
@ -74,15 +75,16 @@ public class LoginAction extends FessLoginAction {
final String password = form.password;
form.clearSecurityInfo();
try {
return fessLoginAssist.loginRedirect(new LocalUserCredential(username, password), op -> {}, () -> {
final HtmlResponse loginRedirect = fessLoginAssist.loginRedirect(new LocalUserCredential(username, password), op -> {}, () -> {
activityHelper.login(getUserBean());
userInfoHelper.deleteUserCodeFromCookie(request);
if (ComponentUtil.getFessConfig().isValidAdminPassword(password)) {
return getHtmlResponse();
}
getSession().ifPresent(session -> session.setAttribute(INVALID_OLD_PASSWORD, password));
return asHtml(virtualHost(path_Login_NewpasswordJsp));
return getHtmlResponse();
});
if (ComponentUtil.getFessConfig().isValidAdminPassword(password)) {
return loginRedirect;
}
getSession().ifPresent(session -> session.setAttribute(INVALID_OLD_PASSWORD, password));
return asHtml(virtualHost(path_Login_NewpasswordJsp));
} catch (final LoginFailureException lfe) {
activityHelper.loginFailure(OptionalThing.of(new LocalUserCredential(username, password)));
throwValidationError(messages -> messages.addErrorsLoginError(GLOBAL), () -> asIndexPage(form));