Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hide sensitive server.properties data in timings reports

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-05 21:43:41 -05:00
parent c0c212bf48
commit 4d7b74e2d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0003-Timings-stuff.patch
View File

@@ -1,4 +1,4 @@
From b13286b4d4b42daa6cbe690825f9e1a7ee2b5299 Mon Sep 17 00:00:00 2001 From 26fc01169441ddf5a7a5b4499be5c26350db652a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 5 Jun 2020 21:30:19 -0500 Date: Fri, 5 Jun 2020 21:30:19 -0500
Subject: [PATCH] Timings stuff Subject: [PATCH] Timings stuff
@@ -8,7 +8,7 @@ Subject: [PATCH] Timings stuff
1 file changed, 21 insertions(+), 4 deletions(-) 1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index a3b41ce5fc..4a9e7fd92c 100644 index a3b41ce5fc..df14bbaabd 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java --- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -227,9 +227,13 @@ public class TimingsExport extends Thread { @@ -227,9 +227,13 @@ public class TimingsExport extends Thread {
@@ -36,7 +36,7 @@ index a3b41ce5fc..4a9e7fd92c 100644
+ private static JSONObject mapAsJSON(java.util.Properties properties) { + private static JSONObject mapAsJSON(java.util.Properties properties) {
+ JSONObject object = new JSONObject(); + JSONObject object = new JSONObject();
+ for (String key : properties.stringPropertyNames()) { + for (String key : properties.stringPropertyNames()) {
+ if (TimingsManager.hiddenConfigs.contains(key)) { + if (key.startsWith("rcon") || key.startsWith("query") || key.equals("level-seed") || TimingsManager.hiddenConfigs.contains(key)) {
+ continue; + continue;
+ } + }
+ object.put(key, valAsJSON(properties.get(key), key)); + object.put(key, valAsJSON(properties.get(key), key));