From 2d410a79df9d4aa4ed1c5004603064849c3eac9a Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Mon, 11 Jun 2018 15:33:27 +0100 Subject: [PATCH] 0.7.10 - Log error when mixin class is subject to classload restrictions --- gradle.properties | 2 +- .../service/mojang/LaunchClassLoaderUtil.java | 30 +++++++++++++++++-- .../mojang/MixinServiceLaunchWrapper.java | 16 ++++++++++ .../asm/launch/MixinBootstrap.java | 2 +- .../asm/mixin/transformer/MixinInfo.java | 9 +++++- .../asm/service/IMixinService.java | 10 +++++++ 6 files changed, 64 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index da067e16..31f19850 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ packaging=jar description=Mixin url=https://www.spongepowered.org organization=SpongePowered -buildVersion=0.7.9 +buildVersion=0.7.10 buildType=SNAPSHOT diff --git a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java index 188c7533..59652686 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java +++ b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/LaunchClassLoaderUtil.java @@ -95,14 +95,40 @@ final class LaunchClassLoaderUtil { * @return true if either exclusion list contains either of the names */ boolean isClassExcluded(String name, String transformedName) { + return this.isClassClassLoaderExcluded(name, transformedName) || this.isClassTransformerExcluded(name, transformedName); + } + + /** + * Get whether the specified name or transformedName exist in the + * classloader exclusion list + * + * @param name class name + * @param transformedName transformed class name + * @return true if the classloader exclusion list contains either of the + * names + */ + boolean isClassClassLoaderExcluded(String name, String transformedName) { for (final String exception : this.getClassLoaderExceptions()) { - if (transformedName.startsWith(exception) || name.startsWith(exception)) { + if ((transformedName != null && transformedName.startsWith(exception)) || name.startsWith(exception)) { return true; } } + return false; + } + + /** + * Get whether the specified name or transformedName exist in the + * transformer exclusion list + * + * @param name class name + * @param transformedName transformed class name + * @return true if the transformer exclusion list contains either of the + * names + */ + boolean isClassTransformerExcluded(String name, String transformedName) { for (final String exception : this.getTransformerExceptions()) { - if (transformedName.startsWith(exception) || name.startsWith(exception)) { + if ((transformedName != null && transformedName.startsWith(exception)) || name.startsWith(exception)) { return true; } } diff --git a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java index ccf6e379..14a3faeb 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java +++ b/src/launchwrapper/java/org/spongepowered/asm/service/mojang/MixinServiceLaunchWrapper.java @@ -255,6 +255,22 @@ public class MixinServiceLaunchWrapper implements IMixinService, IClassProvider, return this.classLoaderUtil.isClassLoaded(className); } + /* (non-Javadoc) + * @see org.spongepowered.asm.service.IMixinService#getClassRestrictions( + * java.lang.String) + */ + @Override + public String getClassRestrictions(String className) { + String restrictions = ""; + if (this.classLoaderUtil.isClassClassLoaderExcluded(className, null)) { + restrictions = "PACKAGE_CLASSLOADER_EXCLUSION"; + } + if (this.classLoaderUtil.isClassTransformerExcluded(className, null)) { + restrictions = (restrictions.length() > 0 ? restrictions + "," : "") + "PACKAGE_TRANSFORMER_EXCLUSION"; + } + return restrictions; + } + /* (non-Javadoc) * @see org.spongepowered.asm.service.IClassProvider#getClassPath() */ diff --git a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java index e47428bf..60be5f76 100644 --- a/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java +++ b/src/main/java/org/spongepowered/asm/launch/MixinBootstrap.java @@ -60,7 +60,7 @@ public abstract class MixinBootstrap { /** * Subsystem version */ - public static final String VERSION = "0.7.9"; + public static final String VERSION = "0.7.10"; /** * Log all the things diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java index c189dae1..49d0f146 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/MixinInfo.java @@ -1158,11 +1158,18 @@ class MixinInfo implements Comparable, IMixinInfo { byte[] mixinBytes = null; try { + if (runTransformers) { + String restrictions = this.service.getClassRestrictions(mixinClassName); + if (restrictions.length() > 0) { + this.logger.error("Classloader restrictions [{}] encountered loading {}, name: {}", restrictions, this, mixinClassName); + } + } mixinBytes = this.service.getBytecodeProvider().getClassBytes(mixinClassName, runTransformers); + } catch (ClassNotFoundException ex) { throw new ClassNotFoundException(String.format("The specified mixin '%s' was not found", mixinClassName)); } catch (IOException ex) { - this.logger.warn("Failed to load mixin %s, the specified mixin will not be applied", mixinClassName); + this.logger.warn("Failed to load mixin {}, the specified mixin will not be applied", mixinClassName); throw new InvalidMixinException(this, "An error was encountered whilst loading the mixin class", ex); } diff --git a/src/main/java/org/spongepowered/asm/service/IMixinService.java b/src/main/java/org/spongepowered/asm/service/IMixinService.java index 24c9be09..6b7e1a21 100644 --- a/src/main/java/org/spongepowered/asm/service/IMixinService.java +++ b/src/main/java/org/spongepowered/asm/service/IMixinService.java @@ -126,6 +126,16 @@ public interface IMixinService { */ public abstract boolean isClassLoaded(String className); + /** + * Check whether the specified class name is subject to any restrictions in + * the context of this service + * + * @param className class name to check + * @return comma-separated list of restrictions, empty string if no + * restrictions apply + */ + public abstract String getClassRestrictions(String className); + /** * Get currently available transformers in the environment */