Skip to content

Commit d49a3dd

Browse files
committed
Update server config hidden paths
1 parent a7d0b26 commit d49a3dd

File tree

6 files changed

+19
-27
lines changed

6 files changed

+19
-27
lines changed

spark-bukkit/src/main/java/me/lucko/spark/bukkit/BukkitServerConfigProvider.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,11 @@ private static Map<String, Path> getNestedFiles(Path configDir, String prefix) {
139139
}
140140

141141
ImmutableSet.Builder<String> hiddenPaths = ImmutableSet.<String>builder()
142+
.addAll(BASE_HIDDEN_PATHS)
142143
.add("database")
143144
.add("settings.bungeecord-addresses")
144145
.add("settings.velocity-support.secret")
145146
.add("proxies.velocity.secret")
146-
.add("server-ip")
147-
.add("motd")
148-
.add("resource-pack")
149-
.add("rcon<dot>password")
150-
.add("rcon<dot>ip")
151-
.add("level-seed")
152147
.add("world-settings.*.feature-seeds")
153148
.add("world-settings.*.seed-*")
154149
.add("feature-seeds")

spark-common/src/main/java/me/lucko/spark/common/platform/serverconfig/ServerConfigProvider.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
package me.lucko.spark.common.platform.serverconfig;
2222

2323
import com.google.common.collect.ImmutableMap;
24+
import com.google.common.collect.ImmutableSet;
2425
import com.google.gson.JsonElement;
2526
import me.lucko.spark.common.platform.MetadataProvider;
2627

@@ -29,6 +30,7 @@
2930
import java.util.Collections;
3031
import java.util.List;
3132
import java.util.Map;
33+
import java.util.Set;
3234

3335
/**
3436
* Abstract implementation of {@link MetadataProvider} which
@@ -38,6 +40,18 @@
3840
* the configurations before they are sent to the viewer.</p>
3941
*/
4042
public abstract class ServerConfigProvider implements MetadataProvider {
43+
44+
protected static final Set<String> BASE_HIDDEN_PATHS = ImmutableSet.of(
45+
"server-ip",
46+
"motd",
47+
"resource-pack",
48+
"rcon<dot>password",
49+
"rcon<dot>ip",
50+
"level-seed",
51+
"management-server-secret",
52+
"management-server-tls-keystore-password"
53+
);
54+
4155
private final Map<String, ConfigParser> files;
4256
private final ExcludedConfigFilter hiddenPathFilters;
4357

spark-fabric/src/main/java/me/lucko/spark/fabric/FabricServerConfigProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public FabricServerConfigProvider() {
4242

4343
static {
4444
ImmutableSet.Builder<String> hiddenPaths = ImmutableSet.<String>builder()
45-
.add("server-ip")
46-
.add("motd")
47-
.add("resource-pack")
48-
.add("rcon<dot>password")
49-
.add("level-seed")
45+
.addAll(BASE_HIDDEN_PATHS)
5046
.addAll(getSystemPropertyList("spark.serverconfigs.hiddenpaths"));
5147

5248
FILES = ImmutableMap.of("server.properties", PropertiesConfigParser.INSTANCE);

spark-forge/src/main/java/me/lucko/spark/forge/ForgeServerConfigProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public ForgeServerConfigProvider() {
4242

4343
static {
4444
ImmutableSet.Builder<String> hiddenPaths = ImmutableSet.<String>builder()
45-
.add("server-ip")
46-
.add("motd")
47-
.add("resource-pack")
48-
.add("rcon<dot>password")
49-
.add("level-seed")
45+
.addAll(BASE_HIDDEN_PATHS)
5046
.addAll(getSystemPropertyList("spark.serverconfigs.hiddenpaths"));
5147

5248
FILES = ImmutableMap.of("server.properties", PropertiesConfigParser.INSTANCE);

spark-neoforge/src/main/java/me/lucko/spark/neoforge/NeoForgeServerConfigProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public NeoForgeServerConfigProvider() {
4242

4343
static {
4444
ImmutableSet.Builder<String> hiddenPaths = ImmutableSet.<String>builder()
45-
.add("server-ip")
46-
.add("motd")
47-
.add("resource-pack")
48-
.add("rcon<dot>password")
49-
.add("level-seed")
45+
.addAll(BASE_HIDDEN_PATHS)
5046
.addAll(getSystemPropertyList("spark.serverconfigs.hiddenpaths"));
5147

5248
FILES = ImmutableMap.of("server.properties", PropertiesConfigParser.INSTANCE);

spark-paper/src/main/java/me/lucko/spark/paper/PaperServerConfigProvider.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,11 @@ private static Map<String, Path> getNestedFiles(Path configDir, String prefix) {
136136
}
137137

138138
ImmutableSet.Builder<String> hiddenPaths = ImmutableSet.<String>builder()
139+
.addAll(BASE_HIDDEN_PATHS)
139140
.add("database")
140141
.add("settings.bungeecord-addresses")
141142
.add("settings.velocity-support.secret")
142143
.add("proxies.velocity.secret")
143-
.add("server-ip")
144-
.add("motd")
145-
.add("resource-pack")
146-
.add("rcon<dot>password")
147-
.add("rcon<dot>ip")
148-
.add("level-seed")
149144
.add("world-settings.*.feature-seeds")
150145
.add("world-settings.*.seed-*")
151146
.add("feature-seeds")

0 commit comments

Comments
 (0)