Merge remote-tracking branch 'origin/main'

ViaVersionAddons · Nov 30, 2024 · 4db8fd3 · 4db8fd3
2 parents f0f42dc + d9e10fc
commit 4db8fd3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/Agent/build.gradle b/Agent/build.gradle
@@ -1,3 +1,7 @@
+base {
+    java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+}
+
 dependencies {
     include "org.ow2.asm:asm:9.7.1"
     include "org.ow2.asm:asm-tree:9.7.1"

diff --git a/Agent/src/main/java/net/lenni0451/authhook/Agent.java b/Agent/src/main/java/net/lenni0451/authhook/Agent.java
@@ -16,6 +16,12 @@ public static void premain(final String args, final Instrumentation instrumentat
     private static void hook(final Instrumentation instrumentation) {
         try {
             Map<String, String> config = Config.load();
+            if (config.get(Config.SECRET_KEY).contains(" ")) {
+                System.err.println("Please set a valid secret key in the auth_hook.properties file");
+                System.err.println("It is automatically generated by ViaProxy if you have the AuthHook plugin installed");
+                System.exit(-1);
+            }
+
             instrumentation.addTransformer(new URLRedirector(config), true);
         } catch (Throwable t) {
             System.err.println("An error occurred while starting AuthHook");

diff --git a/Agent/src/main/java/net/lenni0451/authhook/URLRedirector.java b/Agent/src/main/java/net/lenni0451/authhook/URLRedirector.java
@@ -38,7 +38,9 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
             boolean modified = false;
             for (MethodNode method : node.methods) {
                 for (AbstractInsnNode insn : method.instructions) {
-                    if (insn instanceof LdcInsnNode ldc && ldc.cst instanceof String str) {
+                    if (insn instanceof LdcInsnNode && ((LdcInsnNode) insn).cst instanceof String) {
+                        LdcInsnNode ldc = (LdcInsnNode) insn;
+                        String str = (String) ldc.cst;
                         if (str.startsWith(URL)) {
                             str = str.substring(URL.length());
                             str = this.targetAddress + "/" + this.secretKey + str;