Live log preview 12.1.x

plugin.xml

@@ -44,8 +44,8 @@
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="6.2.2" />
-			<param name="plugin.zip.version" value="6.2.2" />
+			<param name="plugin.version" value="6.2.3" />
+			<param name="plugin.zip.version" value="6.2.3" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.codelibs.fess</groupId>
 	<artifactId>fess</artifactId>
-	<version>12.1.2-SNAPSHOT</version>
+	<version>12.1.3-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>Fess</name>
 	<description>Fess is Full tExt Search System.</description>
@@ -60,13 +60,13 @@
 		<utflute.version>0.8.5</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>2.1.1</crawler.version>
+		<crawler.version>2.1.2</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>6.2.1</suggest.version>
+		<suggest.version>6.2.2</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>6.2.3</elasticsearch.version>
+		<elasticsearch.version>6.2.4</elasticsearch.version>
 		<elasticsearch.min.version>6.0.0</elasticsearch.min.version>
 		<cluster.runner.version>${elasticsearch.version}.0</cluster.runner.version>
 

src/main/assemblies/files/fess.in.bat

@@ -65,6 +65,10 @@ set JAVA_OPTS=%JAVA_OPTS% -Dlog4j.shutdownHookEnabled=false
 set JAVA_OPTS=%JAVA_OPTS% -Dlog4j2.disable.jmx=true
 set JAVA_OPTS=%JAVA_OPTS% -Dlog4j.skipJansi=true
 
+REM SSL truststore for certificate validation over https
+REM JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStore=/tech/elastic/config/truststore.jks
+REM JAVA_OPTS=%JAVA_OPTS% -Djavax.net.ssl.trustStorePassword=changeit
+
 if NOT "%FESS_USE_GC_LOGGING%" == "" set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDetails
 if NOT "%FESS_USE_GC_LOGGING%" == "" set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCTimeStamps
 if NOT "%FESS_USE_GC_LOGGING%" == "" set JAVA_OPTS=%JAVA_OPTS% -XX:+PrintGCDateStamps

src/main/assemblies/files/fess.in.sh

@@ -18,6 +18,10 @@ fi
 #ES_TRANSPORT_URL=localhost:9300
 #FESS_DICTIONARY_PATH=/var/lib/elasticsearch/config/
 
+# SSL truststore for certificate validation over https
+#JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=/tech/elastic/config/truststore.jks"
+#JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStorePassword=changeit"
+
 # min and max heap sizes should be set to the same value to avoid
 # stop-the-world GC pauses during resize, and so that we can lock the
 # heap in memory on startup to prevent any of it from being swapped

src/main/java/org/codelibs/fess/Constants.java

@@ -35,6 +35,8 @@ public class Constants extends CoreLibConstants {
 
     public static final Boolean F = false;
 
+    public static final String SCORE = "score";
+
     public static final String ON = "on";
 
     public static final String READY = "ready";

src/main/java/org/codelibs/fess/api/json/JsonApiManager.java

@@ -138,34 +138,32 @@ protected void processScrollSearchRequest(final HttpServletRequest request, fina
         final JsonRequestParams params = new JsonRequestParams(request, fessConfig);
         try {
             response.setContentType("application/x-ndjson; charset=UTF-8");
-            final long count =
-                    searchService.scrollSearch(params, doc -> {
-                        buf.setLength(0);
-                        buf.append('{');
-                        boolean first2 = true;
-                        for (final Map.Entry<String, Object> entry : doc.entrySet()) {
-                            final String name = entry.getKey();
-                            if (StringUtil.isNotBlank(name) && entry.getValue() != null
-                                    && ComponentUtil.getQueryHelper().isApiResponseField(name)) {
-                                if (!first2) {
-                                    buf.append(',');
-                                } else {
-                                    first2 = false;
-                                }
-                                buf.append(escapeJson(name));
-                                buf.append(':');
-                                buf.append(escapeJson(entry.getValue()));
-                            }
-                        }
-                        buf.append('}');
-                        buf.append('\n');
-                        try {
-                            response.getWriter().print(buf.toString());
-                        } catch (final IOException e) {
-                            throw new IORuntimeException(e);
+            final long count = searchService.scrollSearch(params, doc -> {
+                buf.setLength(0);
+                buf.append('{');
+                boolean first2 = true;
+                for (final Map.Entry<String, Object> entry : doc.entrySet()) {
+                    final String name = entry.getKey();
+                    if (StringUtil.isNotBlank(name) && entry.getValue() != null) {
+                        if (!first2) {
+                            buf.append(',');
+                        } else {
+                            first2 = false;
                         }
-                        return true;
-                    }, OptionalThing.empty());
+                        buf.append(escapeJson(name));
+                        buf.append(':');
+                        buf.append(escapeJson(entry.getValue()));
+                    }
+                }
+                buf.append('}');
+                buf.append('\n');
+                try {
+                    response.getWriter().print(buf.toString());
+                } catch (final IOException e) {
+                    throw new IORuntimeException(e);
+                }
+                return true;
+            }, OptionalThing.empty());
             response.flushBuffer();
             if (logger.isDebugEnabled()) {
                 logger.debug("Loaded " + count + " docs");

src/main/java/org/codelibs/fess/app/service/SearchService.java

@@ -16,7 +16,6 @@
 package org.codelibs.fess.app.service;
 
 import java.text.NumberFormat;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -43,6 +42,7 @@
 import org.codelibs.fess.es.client.FessEsClientException;
 import org.codelibs.fess.helper.QueryHelper;
 import org.codelibs.fess.helper.SystemHelper;
+import org.codelibs.fess.helper.ViewHelper;
 import org.codelibs.fess.mylasta.action.FessUserBean;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
@@ -107,7 +107,7 @@ public void search(final SearchRequestParams params, final SearchRenderData data
                         fessConfig.getIndexDocumentSearchIndex(),
                         fessConfig.getIndexDocumentType(),
                         searchRequestBuilder -> {
-                            fessConfig.processSearchPreference(searchRequestBuilder, userBean);
+                            queryHelper.processSearchPreference(searchRequestBuilder, userBean);
                             return SearchConditionBuilder.builder(searchRequestBuilder)
                                     .query(StringUtil.isBlank(sortField) ? query : query + " sort:" + sortField).offset(pageStart)
                                     .size(pageSize).facetInfo(params.getFacetInfo()).geoInfo(params.getGeoInfo())
@@ -192,29 +192,38 @@ public long scrollSearch(final SearchRequestParams params, final Function<Map<St
                 fessConfig.getIndexDocumentSearchIndex(),
                 fessConfig.getIndexDocumentType(),
                 searchRequestBuilder -> {
-                    fessConfig.processSearchPreference(searchRequestBuilder, userBean);
-                    return SearchConditionBuilder.builder(searchRequestBuilder)
+                    queryHelper.processSearchPreference(searchRequestBuilder, userBean);
+                    return SearchConditionBuilder.builder(searchRequestBuilder).scroll()
                             .query(StringUtil.isBlank(sortField) ? query : query + " sort:" + sortField).size(pageSize)
-                            .responseFields(queryHelper.getResponseFields()).searchRequestType(params.getType()).build();
+                            .responseFields(queryHelper.getScrollResponseFields()).searchRequestType(params.getType()).build();
                 },
                 (searchResponse, hit) -> {
+                    final Map<String, Object> docMap = new HashMap<>();
                     final Map<String, Object> source = hit.getSourceAsMap();
                     if (source != null) {
-                        final Map<String, Object> docMap = new HashMap<>(source);
-                        docMap.put(fessConfig.getIndexFieldId(), hit.getId());
-                        docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
-                        return docMap;
+                        docMap.putAll(source);
                     }
                     final Map<String, DocumentField> fields = hit.getFields();
                     if (fields != null) {
-                        final Map<String, Object> docMap =
-                                fields.entrySet().stream()
-                                        .collect(Collectors.toMap(e -> e.getKey(), e -> (Object) e.getValue().getValues()));
-                        docMap.put(fessConfig.getIndexFieldId(), hit.getId());
-                        docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
-                        return docMap;
+                        docMap.putAll(fields.entrySet().stream()
+                                .collect(Collectors.toMap(e -> e.getKey(), e -> (Object) e.getValue().getValues())));
                     }
-                    return Collections.emptyMap();
+
+                    final ViewHelper viewHelper = ComponentUtil.getViewHelper();
+                    if (viewHelper != null && !docMap.isEmpty()) {
+                        docMap.put(fessConfig.getResponseFieldContentTitle(), viewHelper.getContentTitle(docMap));
+                        docMap.put(fessConfig.getResponseFieldContentDescription(), viewHelper.getContentDescription(docMap));
+                        docMap.put(fessConfig.getResponseFieldUrlLink(), viewHelper.getUrlLink(docMap));
+                        docMap.put(fessConfig.getResponseFieldSitePath(), viewHelper.getSitePath(docMap));
+                    }
+
+                    if (!docMap.containsKey(Constants.SCORE)) {
+                        docMap.put(Constants.SCORE, hit.getScore());
+                    }
+
+                    docMap.put(fessConfig.getIndexFieldId(), hit.getId());
+                    docMap.put(fessConfig.getIndexFieldVersion(), hit.getVersion());
+                    return docMap;
                 }, cursor);
     }
 
@@ -287,7 +296,7 @@ public OptionalEntity<Map<String, Object>> getDocumentByDocId(final String docId
                     }
                     builder.setQuery(boolQuery);
                     builder.setFetchSource(fields, null);
-                    fessConfig.processSearchPreference(builder, userBean);
+                    queryHelper.processSearchPreference(builder, userBean);
                     return true;
                 });
 
@@ -314,7 +323,7 @@ public List<Map<String, Object>> getDocumentListByDocIds(final String[] docIds,
                     builder.setQuery(boolQuery);
                     builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger().intValue());
                     builder.setFetchSource(fields, null);
-                    fessConfig.processSearchPreference(builder, userBean);
+                    queryHelper.processSearchPreference(builder, userBean);
                     return true;
                 });
     }

src/main/java/org/codelibs/fess/app/web/base/FessSearchAction.java

@@ -226,8 +226,7 @@ protected HtmlResponse redirectToLogin() {
     }
 
     protected HtmlResponse redirectToRoot() {
-        final String contextPath = request.getServletContext().getContextPath();
-        return systemHelper.getRedirectResponseToRoot(newHtmlResponseAsRedirect(StringUtil.isBlank(contextPath) ? "/" : contextPath));
+        return systemHelper.getRedirectResponseToRoot(newHtmlResponseAsRedirect("/"));
     }
 
     protected HtmlNext virtualHost(final HtmlNext path) {

src/main/java/org/codelibs/fess/app/web/go/GoAction.java

@@ -21,7 +21,6 @@
 import java.util.Map;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
 import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.net.URLUtil;
@@ -40,7 +39,6 @@
 import org.lastaflute.web.response.ActionResponse;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.StreamResponse;
-import org.lastaflute.web.util.LaRequestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -146,31 +144,13 @@ public ActionResponse index(final GoForm form) throws IOException {
                     return redirect(ErrorAction.class);
                 }
             } else {
-                return redirect(targetUrl + hash);
+                return HtmlResponse.fromRedirectPathAsIs(targetUrl + hash);
             }
         } else {
-            return redirect(targetUrl + hash);
+            return HtmlResponse.fromRedirectPathAsIs(DocumentUtil.encodeUrl(targetUrl + hash));
         }
     }
 
-    protected ActionResponse redirect(final String url) {
-        final HttpServletRequest request2 = LaRequestUtil.getRequest();
-        final String enc = request2.getCharacterEncoding() == null ? Constants.UTF_8 : request2.getCharacterEncoding();
-        final StringBuilder buf = new StringBuilder(url.length() + 100);
-        for (final char c : url.toCharArray()) {
-            if (CharUtil.isUrlChar(c)) {
-                buf.append(c);
-            } else {
-                try {
-                    buf.append(URLEncoder.encode(String.valueOf(c), enc));
-                } catch (final UnsupportedEncodingException e) {
-                    buf.append(c);
-                }
-            }
-        }
-        return HtmlResponse.fromRedirectPathAsIs(buf.toString());
-    }
-
     protected boolean isFileSystemPath(final String url) {
         return url.startsWith("file:") || url.startsWith("smb:") || url.startsWith("ftp:");
     }

src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java

@@ -61,8 +61,10 @@ public ActionResponse index(final ThumbnailForm form) {
 
         final File thumbnailFile = thumbnailManager.getThumbnailFile(doc);
         if (thumbnailFile == null) {
+            if (fessConfig.isThumbnailEnabled()) {
+                thumbnailManager.offer(doc);
+            }
             // 404
-            thumbnailManager.offer(doc);
             throw responseManager.new404("Thumbnail for " + form.docId + " is under generating.");
         }