SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redact Velocity forwarding secret properly (#4980)

Browse Source
This commit is contained in:
Andrew Steinborn
2021-01-01 23:59:30 -05:00
parent f57ca49118
commit bd0e8d65a8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Spigot-Server-Patches/Add-Velocity-IP-Forwarding-Support.patch
View File

@@ -46,9 +46,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ velocitySupport = getBoolean("settings.velocity-support.enabled", false); + velocitySupport = getBoolean("settings.velocity-support.enabled", false);
+ velocityOnlineMode = getBoolean("settings.velocity-support.online-mode", false); + velocityOnlineMode = getBoolean("settings.velocity-support.online-mode", false);
+ String secret = getString("settings.velocity-support.secret", ""); + String secret = getString("settings.velocity-support.secret", "");
+ if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
+ TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
+ }
+ if (velocitySupport && secret.isEmpty()) { + if (velocitySupport && secret.isEmpty()) {
+ fatal("Velocity support is enabled, but no secret key was specified. A secret key is required!"); + fatal("Velocity support is enabled, but no secret key was specified. A secret key is required!");
+ } else { + } else {

5
Spigot-Server-Patches/Timings-v2.patch
View File

@@ -696,7 +696,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ boolean timings = getBoolean("timings.enabled", true); + boolean timings = getBoolean("timings.enabled", true);
+ boolean verboseTimings = getBoolean("timings.verbose", true); + boolean verboseTimings = getBoolean("timings.verbose", true);
+ TimingsManager.privacy = getBoolean("timings.server-name-privacy", false); + TimingsManager.privacy = getBoolean("timings.server-name-privacy", false);
+ TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses")); + TimingsManager.hiddenConfigs = getList("timings.hidden-config-entries", Lists.newArrayList("database", "settings.bungeecord-addresses", "settings.velocity-support.secret"));
+ if (!TimingsManager.hiddenConfigs.contains("settings.velocity-support.secret")) {
+ TimingsManager.hiddenConfigs.add("settings.velocity-support.secret");
+ }
+ int timingHistoryInterval = getInt("timings.history-interval", 300); + int timingHistoryInterval = getInt("timings.history-interval", 300);
+ int timingHistoryLength = getInt("timings.history-length", 3600); + int timingHistoryLength = getInt("timings.history-length", 3600);
+ timingsServerName = getString("timings.server-name", "Unknown Server"); + timingsServerName = getString("timings.server-name", "Unknown Server");