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

add validation for file name

Browse source
This commit is contained in:
Kaoru FUZITA 2015-12-13 19:06:16 +09:00
parent 8209eb69d2
commit 5e08dc9a00
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/codelibs/fess/app/web/admin/design/AdminDesignAction.java
View file

@ -114,7 +114,7 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
@Execute
public HtmlResponse upload(final UploadForm form) {
validate(form, messages -> {}, () -> asListHtml());
validate(form, messages -> {}, () -> asListHtml(form));
verifyToken(() -> asListHtml());
final String uploadedFileName = form.designFile.getFileName();
String fileName = form.designFileName;
@ -306,6 +306,14 @@ public class AdminDesignAction extends FessAdminAction implements Serializable {
return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class);
}
private HtmlResponse asListHtml(UploadForm uploadForm) {
return asHtml(path_AdminDesign_AdminDesignJsp).useForm(DesignForm.class, setup -> {
setup.setup(form -> {
copyBeanToBean(uploadForm, form, op -> op.include("designFile", "designFileName"));
});
});
}
private HtmlResponse asEditHtml() {
return asHtml(path_AdminDesign_AdminDesignEditJsp);
}

3
src/main/java/org/codelibs/fess/app/web/admin/design/UploadForm.java
View file

@ -17,6 +17,8 @@ package org.codelibs.fess.app.web.admin.design;
import java.io.Serializable;
import javax.validation.constraints.Pattern;
import org.lastaflute.web.ruts.multipart.MultipartFormFile;
import org.lastaflute.web.validation.Required;
@ -27,5 +29,6 @@ public class UploadForm implements Serializable {
@Required
public MultipartFormFile designFile;
@Pattern(regexp = "^[^\\\\|/|:|\\*|?|\"|<|>|\\|]+$", message = "{errors.design_file_name_is_invalid}")
public String designFileName;
}