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

fix #724 add token

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-10-01 15:53:49 +09:00
parent eb8e5864dd
commit b9116ec790
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,17 +30,23 @@ public class LoginAction extends FessLoginAction {
@Execute
public HtmlResponse index() {
return asIndexPage(null).useForm(LoginForm.class);
}
private HtmlResponse asIndexPage(final LoginForm form) {
if (form != null) {
form.clearSecurityInfo();
}
return asHtml(path_Login_IndexJsp).renderWith(data -> {
RenderDataUtil.register(data, "notification", fessConfig.getNotificationLogin());
}).useForm(LoginForm.class);
saveToken();
});
}
@Execute
public HtmlResponse login(final LoginForm form) {
validate(form, messages -> {}, () -> {
form.clearSecurityInfo();
return asHtml(path_Login_IndexJsp);
});
validate(form, messages -> {}, () -> asIndexPage(form));
verifyToken(() -> asIndexPage(form));
final String username = form.username;
final String password = form.password;
form.clearSecurityInfo();
@ -50,9 +56,7 @@ public class LoginAction extends FessLoginAction {
return getHtmlResponse();
});
} catch (final LoginFailureException lfe) {
throwValidationError(messages -> messages.addErrorsLoginError(GLOBAL), () -> {
return asHtml(path_Login_IndexJsp);
});
throwValidationError(messages -> messages.addErrorsLoginError(GLOBAL), () -> asIndexPage(form));
}
return redirect(getClass());
}