mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
234 lines
9.6 KiB
Diff
234 lines
9.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Raneri <kevin.raneri@gmail.com>
|
|
Date: Tue, 9 Nov 2021 14:01:56 -0500
|
|
Subject: [PATCH] Pufferfish: Sentry
|
|
|
|
Original license: GPL v3
|
|
Original project: https://github.com/pufferfish-gg/Pufferfish
|
|
|
|
diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..c7772aac00f6db664f7a5673bc2585fa025e6aad
|
|
--- /dev/null
|
|
+++ b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
|
|
@@ -0,0 +1,165 @@
|
|
+package gg.pufferfish.pufferfish.sentry;
|
|
+
|
|
+import com.google.gson.Gson;
|
|
+
|
|
+import java.lang.reflect.Field;
|
|
+import java.lang.reflect.Modifier;
|
|
+import java.util.Map;
|
|
+import java.util.TreeMap;
|
|
+
|
|
+import org.apache.logging.log4j.ThreadContext;
|
|
+import org.bukkit.command.Command;
|
|
+import org.bukkit.command.CommandSender;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.Event;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.bukkit.plugin.Plugin;
|
|
+import org.bukkit.plugin.RegisteredListener;
|
|
+import org.jetbrains.annotations.Nullable;
|
|
+
|
|
+public class SentryContext {
|
|
+
|
|
+ private static final Gson GSON = new Gson();
|
|
+
|
|
+ public static void setPluginContext(@Nullable Plugin plugin) {
|
|
+ if (plugin != null) {
|
|
+ ThreadContext.put("pufferfishsentry_pluginname", plugin.getName());
|
|
+ ThreadContext.put("pufferfishsentry_pluginversion", plugin.getPluginMeta().getVersion());
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public static void removePluginContext() {
|
|
+ ThreadContext.remove("pufferfishsentry_pluginname");
|
|
+ ThreadContext.remove("pufferfishsentry_pluginversion");
|
|
+ }
|
|
+
|
|
+ public static void setSenderContext(@Nullable CommandSender sender) {
|
|
+ if (sender != null) {
|
|
+ ThreadContext.put("pufferfishsentry_playername", sender.getName());
|
|
+ if (sender instanceof Player player) {
|
|
+ ThreadContext.put("pufferfishsentry_playerid", player.getUniqueId().toString());
|
|
+ }
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public static void removeSenderContext() {
|
|
+ ThreadContext.remove("pufferfishsentry_playername");
|
|
+ ThreadContext.remove("pufferfishsentry_playerid");
|
|
+ }
|
|
+
|
|
+ public static void setEventContext(Event event, RegisteredListener registration) {
|
|
+ setPluginContext(registration.getPlugin());
|
|
+
|
|
+ try {
|
|
+ // Find the player that was involved with this event
|
|
+ Player player = null;
|
|
+ if (event instanceof PlayerEvent) {
|
|
+ player = ((PlayerEvent) event).getPlayer();
|
|
+ } else {
|
|
+ Class<? extends Event> eventClass = event.getClass();
|
|
+
|
|
+ Field playerField = null;
|
|
+
|
|
+ for (Field field : eventClass.getDeclaredFields()) {
|
|
+ if (field.getType().equals(Player.class)) {
|
|
+ playerField = field;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (playerField != null) {
|
|
+ playerField.setAccessible(true);
|
|
+ player = (Player) playerField.get(event);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (player != null) {
|
|
+ setSenderContext(player);
|
|
+ }
|
|
+ } catch (Exception ignored) {
|
|
+ } // We can't really safely log exceptions.
|
|
+
|
|
+ ThreadContext.put("pufferfishsentry_eventdata", GSON.toJson(serializeFields(event)));
|
|
+ }
|
|
+
|
|
+ public static void removeEventContext() {
|
|
+ removePluginContext();
|
|
+ removeSenderContext();
|
|
+ ThreadContext.remove("pufferfishsentry_eventdata");
|
|
+ }
|
|
+
|
|
+ private static Map<String, String> serializeFields(Object object) {
|
|
+ Map<String, String> fields = new TreeMap<>();
|
|
+ fields.put("_class", object.getClass().getName());
|
|
+ for (Field declaredField : object.getClass().getDeclaredFields()) {
|
|
+ try {
|
|
+ if (Modifier.isStatic(declaredField.getModifiers())) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ String fieldName = declaredField.getName();
|
|
+ if (fieldName.equals("handlers")) {
|
|
+ continue;
|
|
+ }
|
|
+ declaredField.setAccessible(true);
|
|
+ Object value = declaredField.get(object);
|
|
+ if (value != null) {
|
|
+ fields.put(fieldName, value.toString());
|
|
+ } else {
|
|
+ fields.put(fieldName, "<null>");
|
|
+ }
|
|
+ } catch (Exception ignored) {
|
|
+ } // We can't really safely log exceptions.
|
|
+ }
|
|
+ return fields;
|
|
+ }
|
|
+
|
|
+ public static class State {
|
|
+
|
|
+ private Plugin plugin;
|
|
+ private Command command;
|
|
+ private String commandLine;
|
|
+ private Event event;
|
|
+ private RegisteredListener registeredListener;
|
|
+
|
|
+ public Plugin getPlugin() {
|
|
+ return plugin;
|
|
+ }
|
|
+
|
|
+ public void setPlugin(Plugin plugin) {
|
|
+ this.plugin = plugin;
|
|
+ }
|
|
+
|
|
+ public Command getCommand() {
|
|
+ return command;
|
|
+ }
|
|
+
|
|
+ public void setCommand(Command command) {
|
|
+ this.command = command;
|
|
+ }
|
|
+
|
|
+ public String getCommandLine() {
|
|
+ return commandLine;
|
|
+ }
|
|
+
|
|
+ public void setCommandLine(String commandLine) {
|
|
+ this.commandLine = commandLine;
|
|
+ }
|
|
+
|
|
+ public Event getEvent() {
|
|
+ return event;
|
|
+ }
|
|
+
|
|
+ public void setEvent(Event event) {
|
|
+ this.event = event;
|
|
+ }
|
|
+
|
|
+ public RegisteredListener getRegisteredListener() {
|
|
+ return registeredListener;
|
|
+ }
|
|
+
|
|
+ public void setRegisteredListener(RegisteredListener registeredListener) {
|
|
+ this.registeredListener = registeredListener;
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
index 001465eedafa51ac027a4db51cba6223edfe1171..2e6d62c4f3687e299c34e876c503b400e13be05a 100644
|
|
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
|
@@ -597,7 +597,9 @@ public final class SimplePluginManager implements PluginManager {
|
|
|
|
// Paper start
|
|
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
|
server.getLogger().log(Level.SEVERE, msg, ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
|
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
|
|
}
|
|
// Paper end
|
|
@@ -667,9 +669,11 @@ public final class SimplePluginManager implements PluginManager {
|
|
));
|
|
}
|
|
} catch (Throwable ex) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
|
|
// Paper start - error reporting
|
|
String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
|
|
server.getLogger().log(Level.SEVERE, msg, ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
|
|
if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
|
|
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
index 8acf45815b5841e3b2082a8bc5b7974e85cdd7f9..2fae50a9d1f0d9ecd91036697dedd64bc56f7d3b 100644
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
@@ -343,7 +343,13 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
try {
|
|
jPlugin.setEnabled(true);
|
|
} catch (Throwable ex) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
|
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
|
+ // Paper start - Disable plugins that fail to load
|
|
+ this.server.getPluginManager().disablePlugin(jPlugin);
|
|
+ return;
|
|
+ // Paper end
|
|
}
|
|
|
|
// Perhaps abort here, rather than continue going, but as it stands,
|
|
@@ -368,7 +374,9 @@ public final class JavaPluginLoader implements PluginLoader {
|
|
try {
|
|
jPlugin.setEnabled(false);
|
|
} catch (Throwable ex) {
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
|
|
server.getLogger().log(Level.SEVERE, "Error occurred while disabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
|
+ gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
|
|
}
|
|
|
|
if (cloader instanceof PluginClassLoader) {
|