From 2070f229689fc9ec0b4a1b42fb49946cfaa3f6ee Mon Sep 17 00:00:00 2001 From: ljacqu Date: Mon, 27 Mar 2017 21:41:35 +0200 Subject: [PATCH] Security - if any Throwable is thrown on initialization AuthMe should shut down - Found via #1149 --- src/main/java/fr/xephi/authme/AuthMe.java | 6 +++--- .../fr/xephi/authme/initialization/OnStartupTasks.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index f74d5606..d124f81e 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -137,9 +137,9 @@ public class AuthMe extends JavaPlugin { // Initialize the plugin try { initialize(); - } catch (Exception e) { - ConsoleLogger.logException("Aborting initialization of AuthMe:", e); - OnStartupTasks.displayLegacyJarHint(e); + } catch (Throwable th) { + ConsoleLogger.logException("Aborting initialization of AuthMe:", th); + OnStartupTasks.displayLegacyJarHint(th); stopOrUnload(); return; } diff --git a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java index bce15af4..b226afa1 100644 --- a/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java +++ b/src/main/java/fr/xephi/authme/initialization/OnStartupTasks.java @@ -127,11 +127,11 @@ public class OnStartupTasks { * Displays a hint to use the legacy AuthMe JAR if AuthMe could not be started * because Gson was not found. * - * @param e the exception to process + * @param th the Throwable to process */ - public static void displayLegacyJarHint(Exception e) { - if (e instanceof InjectorReflectionException) { - Throwable causeOfCause = Optional.of(e) + public static void displayLegacyJarHint(Throwable th) { + if (th instanceof InjectorReflectionException) { + Throwable causeOfCause = Optional.of(th) .map(Throwable::getCause) .map(Throwable::getCause).orElse(null); if (causeOfCause instanceof NoClassDefFoundError