Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-28 19:39:17 +00:00
Code Issues Releases Activity

Fix hiding sentry dsn key in spark profiler

Browse Source
This commit is contained in:
Dreeam
2024-11-11 07:31:48 -05:00
parent 5c162fc7ed
commit aa4cd01137
2 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0003-Leaf-Config.patch
View File

@@ -11,7 +11,7 @@ Add per world config
Add config reload
diff --git a/build.gradle.kts b/build.gradle.kts
index e6d3fb2e7f7c4b5e5298acef7569a046c9062b67..9783e7800d060d0daab25b37b86cbbd811e02f65 100644
index 4426855192b7dcc58b16d41b8a9d44bbbed3b55f..78d29b5e5047f9f03d1b8e93047953e727611c5e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,13 @@ val alsoShade: Configuration by configurations.creating
@@ -41,7 +41,7 @@ index 278adb48400ca9d4fd37bff040b37d4a8dd47282..759b22fc6f949829cef757232357368e
DedicatedServerSettings dedicatedserversettings = new DedicatedServerSettings(optionset); // CraftBukkit - CLI argument support
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f39c51ae8ea689cb089cd9d4195276c2cfdaf1b7..5fed168aeeab505cd75cb89af09ac3ba8bb5aedb 100644
index 4efbd656c57672b84c5d90f987bd57c67fc0c550..05f805c7e7a6ff6d40b9f86aaac5362ab516be3f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1221,6 +1221,9 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -148,10 +148,10 @@ index 0000000000000000000000000000000000000000..f7ab1ff5f298ff1e5e16fe5396d1e9e6
+}
diff --git a/src/main/java/org/dreeam/leaf/config/LeafConfig.java b/src/main/java/org/dreeam/leaf/config/LeafConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..d973f9d47abe6fae06916b6362cb9c3b0d59205a
index 0000000000000000000000000000000000000000..fdbdf3f6a5071ce629d2881e861075dbeef11b42
--- /dev/null
+++ b/src/main/java/org/dreeam/leaf/config/LeafConfig.java
@@ -0,0 +1,270 @@
@@ -0,0 +1,269 @@
+package org.dreeam.leaf.config;
+
+import io.papermc.paper.configuration.GlobalConfiguration;
@@ -365,7 +365,6 @@ index 0000000000000000000000000000000000000000..d973f9d47abe6fae06916b6362cb9c3b
+
+ private static String[] buildSparkHiddenPaths() {
+ return new String[]{
+ "misc.sentry-dsn" // Hide Sentry DSN key
+ };
+ }
+

27
patches/server/0006-Pufferfish-Sentry.patch
View File

@@ -195,12 +195,32 @@ index 0000000000000000000000000000000000000000..1fc08518f9cc2b6840b5074f181aefc6
+ }
+
+}
diff --git a/src/main/java/org/dreeam/leaf/config/LeafConfig.java b/src/main/java/org/dreeam/leaf/config/LeafConfig.java
index fdbdf3f6a5071ce629d2881e861075dbeef11b42..41b24849b6601cdf89ee6cb4125a7127e716c5ee 100644
--- a/src/main/java/org/dreeam/leaf/config/LeafConfig.java
+++ b/src/main/java/org/dreeam/leaf/config/LeafConfig.java
@@ -1,6 +1,7 @@
package org.dreeam.leaf.config;
import io.papermc.paper.configuration.GlobalConfiguration;
+import org.dreeam.leaf.config.modules.misc.SentryDSN;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@@ -211,6 +212,7 @@ public class LeafConfig {
private static String[] buildSparkHiddenPaths() {
return new String[]{
+ SentryDSN.sentryDsnConfigPath // Hide Sentry DSN key
};
}
diff --git a/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java b/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java
new file mode 100644
index 0000000000000000000000000000000000000000..29e0a2aa4a6d6228f88c47053556cbd2457edc20
index 0000000000000000000000000000000000000000..b37aa469c0e1d1b18c1f43a364e00276ce8652e0
--- /dev/null
+++ b/src/main/java/org/dreeam/leaf/config/modules/misc/SentryDSN.java
@@ -0,0 +1,36 @@
@@ -0,0 +1,37 @@
+package org.dreeam.leaf.config.modules.misc;
+
+import org.apache.logging.log4j.Level;
@@ -213,6 +233,7 @@ index 0000000000000000000000000000000000000000..29e0a2aa4a6d6228f88c47053556cbd2
+ return EnumConfigCategory.MISC.getBaseKeyName() + ".sentry";
+ }
+
+ public static String sentryDsnConfigPath;
+ public static String sentryDsn = "";
+ public static String logLevel = "WARN";
+ public static boolean onlyLogThrown = true;
@@ -220,7 +241,7 @@ index 0000000000000000000000000000000000000000..29e0a2aa4a6d6228f88c47053556cbd2
+ @Override
+ public void onLoaded() {
+ String sentryEnvironment = System.getenv("SENTRY_DSN");
+ String sentryConfig = config.getString(getBasePath() + ".dsn", sentryDsn, """
+ String sentryConfig = config.getString(sentryDsnConfigPath = getBasePath() + ".dsn", sentryDsn, """
+ Sentry DSN for improved error logging, leave blank to disable,
+ Obtain from https://sentry.io/""");
+