From 079d4646297461e066410816a8716013b4a50c5e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 23 Oct 2019 11:26:35 +0000
Subject: [PATCH] Startup: clients.config.d files must have a ".config" suffix
---
apps/i2ptunnel/jsp/ssl.jsp | 2 +-
router/java/src/net/i2p/router/startup/ClientAppConfig.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/i2ptunnel/jsp/ssl.jsp b/apps/i2ptunnel/jsp/ssl.jsp
index 5d61211060..d105186bda 100644
--- a/apps/i2ptunnel/jsp/ssl.jsp
+++ b/apps/i2ptunnel/jsp/ssl.jsp
@@ -591,7 +591,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
File[] configFiles;
if (!isSingleFile) {
File clientsConfigD = new File(configDir, "clients.config.d");
- configFiles = clientsConfigD.listFiles();
+ configFiles = clientsConfigD.listFiles(new net.i2p.util.FileSuffixFilter(".config"));
} else {
configFiles = null;
}
diff --git a/router/java/src/net/i2p/router/startup/ClientAppConfig.java b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
index f66e527c1e..266054cec4 100644
--- a/router/java/src/net/i2p/router/startup/ClientAppConfig.java
+++ b/router/java/src/net/i2p/router/startup/ClientAppConfig.java
@@ -12,6 +12,7 @@ import java.util.Set;
import net.i2p.I2PAppContext;
import net.i2p.data.DataHelper;
import net.i2p.router.RouterContext;
+import net.i2p.util.FileSuffixFilter;
import net.i2p.util.FileUtil;
import net.i2p.util.Log;
import net.i2p.util.ObjectCounter;
@@ -157,7 +158,7 @@ public class ClientAppConfig {
}
// clients.config.d
if (dir.isDirectory()) {
- File[] files = dir.listFiles();
+ File[] files = dir.listFiles(new FileSuffixFilter(".config"));
if (files != null && files.length > 0) {
// sort so the returned order is consistent
Arrays.sort(files);
--
GitLab