From e06d7e47e0fe5e49e053d71f7d12fb207ec6a895 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 21 Jun 2014 23:03:41 -0400 Subject: [PATCH] Harden the security manager and make it less spammy. Clean up a bunch of deprecation warnings from guava. --- .../transformers/deobf/FMLDeobfuscatingRemapper.java | 12 +++++------- .../asm/transformers/deobf/LZMAInputSupplier.java | 6 +++--- .../cpw/mods/fml/relauncher/FMLSecurityManager.java | 8 +++++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 2d6d451ae8..a144accb27 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -16,7 +16,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -43,8 +42,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.google.common.io.CharStreams; -import com.google.common.io.InputSupplier; +import com.google.common.io.CharSource; import cpw.mods.fml.common.patcher.ClassPatchManager; import cpw.mods.fml.relauncher.FMLRelaunchLog; @@ -78,8 +76,8 @@ public class FMLDeobfuscatingRemapper extends Remapper { { File mapData = new File(deobfFileName); LZMAInputSupplier zis = new LZMAInputSupplier(new FileInputStream(mapData)); - InputSupplier srgSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8); - List srgList = CharStreams.readLines(srgSupplier); + CharSource srgSource = zis.asCharSource(Charsets.UTF_8); + List srgList = srgSource.readLines(); rawMethodMaps = Maps.newHashMap(); rawFieldMaps = Maps.newHashMap(); Builder builder = ImmutableBiMap.builder(); @@ -118,8 +116,8 @@ public class FMLDeobfuscatingRemapper extends Remapper { { InputStream classData = getClass().getResourceAsStream(deobfFileName); LZMAInputSupplier zis = new LZMAInputSupplier(classData); - InputSupplier srgSupplier = CharStreams.newReaderSupplier(zis,Charsets.UTF_8); - List srgList = CharStreams.readLines(srgSupplier); + CharSource srgSource = zis.asCharSource(Charsets.UTF_8); + List srgList = srgSource.readLines(); rawMethodMaps = Maps.newHashMap(); rawFieldMaps = Maps.newHashMap(); Builder builder = ImmutableBiMap.builder(); diff --git a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java index bd22a0a510..9bc6e39e71 100644 --- a/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java +++ b/src/main/java/cpw/mods/fml/common/asm/transformers/deobf/LZMAInputSupplier.java @@ -17,9 +17,9 @@ import java.io.InputStream; import LZMA.LzmaInputStream; -import com.google.common.io.InputSupplier; +import com.google.common.io.ByteSource; -public class LZMAInputSupplier implements InputSupplier { +public class LZMAInputSupplier extends ByteSource { private InputStream compressedData; public LZMAInputSupplier(InputStream compressedData) @@ -28,7 +28,7 @@ public class LZMAInputSupplier implements InputSupplier { } @Override - public InputStream getInput() throws IOException + public InputStream openStream() throws IOException { return new LzmaInputStream(this.compressedData); } diff --git a/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java b/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java index 4c7fba0ec0..e5f7db3a5c 100644 --- a/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java +++ b/src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java @@ -16,9 +16,11 @@ public class FMLSecurityManager extends SecurityManager { String permName = perm.getName() != null ? perm.getName() : "missing"; if (permName.startsWith("exitVM")) { - String callingClass = getClassContext()[4].getName(); - // FML is allowed to call system exit - if (!callingClass.startsWith("cpw.mods.fml.")) + Class[] classContexts = getClassContext(); + String callingClass = classContexts.length > 3 ? classContexts[4].getName() : "none"; + String callingParent = classContexts.length > 4 ? classContexts[5].getName() : "none"; + // FML is allowed to call system exit and the Minecraft applet (from the quit button) + if (!(callingClass.startsWith("cpw.mods.fml.") || ( "net.minecraft.client.Minecraft".equals(callingClass) && "net.minecraft.client.Minecraft".equals(callingParent)))) { throw new ExitTrappedException(); }