diff --git a/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java b/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java index 981c63a7f..6a2f93264 100644 --- a/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java +++ b/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java @@ -52,6 +52,8 @@ public class CacheAction extends FessSearchAction { return redirectToLogin(); } + validate(form, messages -> {}, () -> asHtml(path_Error_ErrorJsp)); + Map doc = null; try { doc = diff --git a/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java b/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java index 2eca0aa26..28d0b569c 100644 --- a/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java +++ b/src/main/java/org/codelibs/fess/app/web/cache/CacheForm.java @@ -17,13 +17,27 @@ package org.codelibs.fess.app.web.cache; import java.io.Serializable; +import javax.validation.constraints.Size; + +import org.lastaflute.web.validation.Required; + public class CacheForm implements Serializable { private static final long serialVersionUID = 1L; - //@Required(target = "go,cache") - //@Maxbytelength(maxbytelength = 100) + @Required + @Size(max = 100) public String docId; public String[] hq; + // for error page + + public String q; + + public String num; + + public String sort; + + public String lang; + } diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoForm.java b/src/main/java/org/codelibs/fess/app/web/go/GoForm.java index 2fd3db125..3aa8a8064 100644 --- a/src/main/java/org/codelibs/fess/app/web/go/GoForm.java +++ b/src/main/java/org/codelibs/fess/app/web/go/GoForm.java @@ -34,4 +34,14 @@ public class GoForm { public String queryId; public Integer order; + + // for error page + + public String q; + + public String num; + + public String sort; + + public String lang; } diff --git a/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java b/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java index 8cbaab633..8bdb9e7fd 100644 --- a/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java +++ b/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotAction.java @@ -52,6 +52,8 @@ public class ScreenshotAction extends FessSearchAction { return redirectToLogin(); } + validate(form, messages -> {}, () -> asHtml(path_Error_ErrorJsp)); + final Map doc = fessEsClient.getDocument(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), queryRequestBuilder -> { diff --git a/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotForm.java b/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotForm.java index 4b2a38fcb..4b481f0af 100644 --- a/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotForm.java +++ b/src/main/java/org/codelibs/fess/app/web/screenshot/ScreenshotForm.java @@ -17,11 +17,28 @@ package org.codelibs.fess.app.web.screenshot; import java.io.Serializable; +import javax.validation.constraints.Size; + +import org.lastaflute.web.validation.Required; + public class ScreenshotForm implements Serializable { private static final long serialVersionUID = 1L; + @Required + @Size(max = 100) public String docId; + @Required public String queryId; + // for error page + + public String q; + + public String num; + + public String sort; + + public String lang; + }