fix #1642 add fess_config.properties

src/main/java/org/codelibs/fess/app/web/admin/systeminfo/AdminSysteminfoAction.java

@@ -26,8 +26,10 @@ import org.codelibs.core.lang.StringUtil;
 import org.codelibs.core.misc.DynamicProperties;
 import org.codelibs.fess.Constants;
 import org.codelibs.fess.app.web.base.FessAdminAction;
+import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.RenderDataUtil;
+import org.lastaflute.core.direction.ObjectiveConfig;
 import org.lastaflute.web.Execute;
 import org.lastaflute.web.response.HtmlResponse;
 import org.lastaflute.web.response.render.RenderData;
@@ -83,7 +85,7 @@ public class AdminSysteminfoAction extends FessAdminAction {
     }
 
     protected void registerFessPropItems(final RenderData data) {
-        RenderDataUtil.register(data, "fessPropItems", getFessPropItems());
+        RenderDataUtil.register(data, "fessPropItems", getFessPropItems(fessConfig));
     }
 
     protected void registerBugReportItems(final RenderData data) {
@@ -106,12 +108,24 @@ public class AdminSysteminfoAction extends FessAdminAction {
         return itemList;
     }
 
-    public static List<Map<String, String>> getFessPropItems() {
+    public static List<Map<String, String>> getFessPropItems(final FessConfig fessConfig) {
         final List<Map<String, String>> itemList = new ArrayList<>();
         final DynamicProperties systemProperties = ComponentUtil.getSystemProperties();
         for (final Map.Entry<Object, Object> entry : systemProperties.entrySet()) {
             itemList.add(createItem(entry.getKey(), entry.getValue()));
         }
+        if (fessConfig instanceof ObjectiveConfig) {
+            ObjectiveConfig config = (ObjectiveConfig) fessConfig;
+            config.keySet().stream().forEach(k -> {
+                final String value;
+                if ("http.proxy.password".equals(k) || "spnego.preauth.password".equals(k) || "oic.client.secret".equals(k)) {
+                    value = "XXXXXXXX";
+                } else {
+                    value = config.get(k);
+                }
+                itemList.add(createItem(k, value));
+            });
+        }
         return itemList;
     }
 

src/main/java/org/codelibs/fess/app/web/api/admin/systeminfo/ApiAdminSysteminfoAction.java

@@ -42,7 +42,7 @@ public class ApiAdminSysteminfoAction extends FessApiAdminAction {
     public JsonResponse<ApiResult> get$index() {
         final List<Map<String, String>> bugReportItems = getBugReportItems();
         final List<Map<String, String>> envItems = getEnvItems();
-        final List<Map<String, String>> fessPropItems = getFessPropItems();
+        final List<Map<String, String>> fessPropItems = getFessPropItems(fessConfig);
         final List<Map<String, String>> propItems = getPropItems();
         return asJson(new ApiResult.ApiSystemInfoResponse().bugReportProps(bugReportItems).envProps(envItems).fessProps(fessPropItems)
                 .systemProps(propItems).status(ApiResult.Status.OK).result());