From 7fb4e4a09517f414da53bdc5b2f0fdd9e4973130 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Tue, 5 Oct 2021 14:10:04 +0200 Subject: [PATCH 1/2] Change GH actions dist to adoptium --- .github/workflows/gradle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 28d3082a2..01ac6866f 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -7,7 +7,7 @@ on: [push, pull_request] jobs: build: - # Only run on PRs if the source branch is on a different repo. We do not need run everything twice. + # Only run on PRs if the source branch is on a different repo. We do not need to run everything twice. if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }} runs-on: ubuntu-latest @@ -18,7 +18,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - distribution: 'adopt' + distribution: 'temurin' java-version: 11 - name: Build with Gradle run: ./gradlew build From 8b4a57985b22fd118f09674d1fe897757c3ef089 Mon Sep 17 00:00:00 2001 From: MrMicky Date: Tue, 5 Oct 2021 14:20:18 +0200 Subject: [PATCH 2/2] Remove usage of `sun.misc.Unsafe` in `BungeeViaInjector` (#2698) --- .../bungee/platform/BungeeViaInjector.java | 143 ++++++++++++++---- .../viaversion/util/SetWrapper.java | 44 ++++++ .../UnsafeBackedForcefulFieldModifier.java | 4 + 3 files changed, 160 insertions(+), 31 deletions(-) create mode 100644 common/src/main/java/com/viaversion/viaversion/util/SetWrapper.java diff --git a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java index 0b918b628..f1a825a8e 100644 --- a/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java +++ b/bungee/src/main/java/com/viaversion/viaversion/bungee/platform/BungeeViaInjector.java @@ -17,46 +17,58 @@ */ package com.viaversion.viaversion.bungee.platform; +import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.platform.ViaInjector; import com.viaversion.viaversion.bungee.handlers.BungeeChannelInitializer; -import com.viaversion.viaversion.compatibility.ForcefulFieldModifier; -import com.viaversion.viaversion.compatibility.unsafe.UnsafeBackedForcefulFieldModifier; import com.viaversion.viaversion.util.ReflectionUtil; +import com.viaversion.viaversion.util.SetWrapper; import io.netty.channel.Channel; +import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelInitializer; import it.unimi.dsi.fastutil.ints.IntLinkedOpenHashSet; import it.unimi.dsi.fastutil.ints.IntSortedSet; +import net.md_5.bungee.api.ProxyServer; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.List; +import java.util.Set; public class BungeeViaInjector implements ViaInjector { - private final ForcefulFieldModifier forcefulFieldModifier; + private static final Field LISTENERS_FIELD; + private final List injectedChannels = new ArrayList<>(); - public BungeeViaInjector() { + static { try { - this.forcefulFieldModifier = new UnsafeBackedForcefulFieldModifier(); - } catch (final ReflectiveOperationException ex) { - throw new IllegalStateException("Cannot create a modifier accessor", ex); + LISTENERS_FIELD = ProxyServer.getInstance().getClass().getDeclaredField("listeners"); + LISTENERS_FIELD.setAccessible(true); + } catch (ReflectiveOperationException e) { + throw new RuntimeException("Unable to access listeners field.", e); } } @Override - public void inject() throws Exception { - try { - Class pipelineUtils = Class.forName("net.md_5.bungee.netty.PipelineUtils"); - Field field = pipelineUtils.getDeclaredField("SERVER_CHILD"); - field.setAccessible(true); + @SuppressWarnings("unchecked") + public void inject() throws ReflectiveOperationException { + Set listeners = (Set) LISTENERS_FIELD.get(ProxyServer.getInstance()); - BungeeChannelInitializer newInit = new BungeeChannelInitializer((ChannelInitializer) field.get(null)); + // Inject the list + Set wrapper = new SetWrapper<>(listeners, channel -> { + try { + injectChannel(channel); + } catch (Exception e) { + throw new RuntimeException(e); + } + }); - this.forcefulFieldModifier.setField(field, null, newInit); - } catch (Exception e) { - Via.getPlatform().getLogger().severe("Unable to inject ViaVersion, please post these details on our GitHub and ensure you're using a compatible server version."); - throw e; + LISTENERS_FIELD.set(ProxyServer.getInstance(), wrapper); + + // Iterate through current list + for (Channel channel : listeners) { + injectChannel(channel); } } @@ -65,6 +77,40 @@ public class BungeeViaInjector implements ViaInjector { Via.getPlatform().getLogger().severe("ViaVersion cannot remove itself from Bungee without a reboot!"); } + @SuppressWarnings("unchecked") + private void injectChannel(Channel channel) throws ReflectiveOperationException { + List names = channel.pipeline().names(); + ChannelHandler bootstrapAcceptor = null; + + for (String name : names) { + ChannelHandler handler = channel.pipeline().get(name); + try { + ReflectionUtil.get(handler, "childHandler", ChannelInitializer.class); + bootstrapAcceptor = handler; + } catch (Exception e) { + // Not this one + } + } + + // Default to first + if (bootstrapAcceptor == null) { + bootstrapAcceptor = channel.pipeline().first(); + } + + if (bootstrapAcceptor.getClass().getName().equals("net.md_5.bungee.query.QueryHandler")) { + return; + } + + try { + ChannelInitializer oldInit = ReflectionUtil.get(bootstrapAcceptor, "childHandler", ChannelInitializer.class); + ChannelInitializer newInit = new BungeeChannelInitializer(oldInit); + + ReflectionUtil.set(bootstrapAcceptor, "childHandler", newInit); + this.injectedChannels.add(channel); + } catch (NoSuchFieldException e) { + throw new RuntimeException("Unable to find core component 'childHandler', please check your plugins. issue: " + bootstrapAcceptor.getClass().getName()); + } + } @Override public int getServerProtocolVersion() throws Exception { @@ -76,29 +122,64 @@ public class BungeeViaInjector implements ViaInjector { return new IntLinkedOpenHashSet(getBungeeSupportedVersions()); } + @SuppressWarnings("unchecked") private List getBungeeSupportedVersions() throws Exception { return ReflectionUtil.getStatic(Class.forName("net.md_5.bungee.protocol.ProtocolConstants"), "SUPPORTED_VERSION_IDS", List.class); } - private ChannelInitializer getChannelInitializer() throws Exception { - Class pipelineUtils = Class.forName("net.md_5.bungee.netty.PipelineUtils"); - Field field = pipelineUtils.getDeclaredField("SERVER_CHILD"); - field.setAccessible(true); - return (ChannelInitializer) field.get(null); - } - @Override public JsonObject getDump() { JsonObject data = new JsonObject(); - try { - ChannelInitializer initializer = getChannelInitializer(); - data.addProperty("currentInitializer", initializer.getClass().getName()); - if (initializer instanceof BungeeChannelInitializer) { - data.addProperty("originalInitializer", ((BungeeChannelInitializer) initializer).getOriginal().getClass().getName()); + + // Generate information about current injections + JsonArray injectedChannelInitializers = new JsonArray(); + for (Channel channel : this.injectedChannels) { + JsonObject channelInfo = new JsonObject(); + channelInfo.addProperty("channelClass", channel.getClass().getName()); + + // Get information about the pipes for this channel + JsonArray pipeline = new JsonArray(); + for (String pipeName : channel.pipeline().names()) { + JsonObject handlerInfo = new JsonObject(); + handlerInfo.addProperty("name", pipeName); + + ChannelHandler channelHandler = channel.pipeline().get(pipeName); + if (channelHandler == null) { + handlerInfo.addProperty("status", "INVALID"); + continue; + } + + handlerInfo.addProperty("class", channelHandler.getClass().getName()); + + try { + Object child = ReflectionUtil.get(channelHandler, "childHandler", ChannelInitializer.class); + handlerInfo.addProperty("childClass", child.getClass().getName()); + if (child instanceof BungeeChannelInitializer) { + handlerInfo.addProperty("oldInit", ((BungeeChannelInitializer) child).getOriginal().getClass().getName()); + } + } catch (ReflectiveOperationException e) { + // Don't display + } + + pipeline.add(handlerInfo); } - } catch (Exception e) { - // Ignored, not printed in the dump + channelInfo.add("pipeline", pipeline); + + injectedChannelInitializers.add(channelInfo); } + + data.add("injectedChannelInitializers", injectedChannelInitializers); + + try { + Object list = LISTENERS_FIELD.get(ProxyServer.getInstance()); + data.addProperty("currentList", list.getClass().getName()); + if (list instanceof SetWrapper) { + data.addProperty("wrappedList", ((SetWrapper) list).originalSet().getClass().getName()); + } + } catch (ReflectiveOperationException ignored) { + // Ignored + } + return data; } } diff --git a/common/src/main/java/com/viaversion/viaversion/util/SetWrapper.java b/common/src/main/java/com/viaversion/viaversion/util/SetWrapper.java new file mode 100644 index 000000000..bf0d4ccad --- /dev/null +++ b/common/src/main/java/com/viaversion/viaversion/util/SetWrapper.java @@ -0,0 +1,44 @@ +package com.viaversion.viaversion.util; + +import com.google.common.collect.ForwardingSet; +import org.checkerframework.checker.nullness.qual.NonNull; + +import java.util.Collection; +import java.util.Set; +import java.util.function.Consumer; + +public class SetWrapper extends ForwardingSet { + + private final Set set; + private final Consumer addListener; + + public SetWrapper(Set set, Consumer addListener) { + this.set = set; + this.addListener = addListener; + } + + @Override + public boolean add(@NonNull E element) { + addListener.accept(element); + + return super.add(element); + } + + @Override + public boolean addAll(Collection collection) { + for (E element : collection) { + addListener.accept(element); + } + + return super.addAll(collection); + } + + @Override + protected Set delegate() { + return originalSet(); + } + + public Set originalSet() { + return this.set; + } +} diff --git a/java-compat/java-compat-unsafe/src/main/java/com/viaversion/viaversion/compatibility/unsafe/UnsafeBackedForcefulFieldModifier.java b/java-compat/java-compat-unsafe/src/main/java/com/viaversion/viaversion/compatibility/unsafe/UnsafeBackedForcefulFieldModifier.java index db8d21032..ab22b948c 100644 --- a/java-compat/java-compat-unsafe/src/main/java/com/viaversion/viaversion/compatibility/unsafe/UnsafeBackedForcefulFieldModifier.java +++ b/java-compat/java-compat-unsafe/src/main/java/com/viaversion/viaversion/compatibility/unsafe/UnsafeBackedForcefulFieldModifier.java @@ -22,10 +22,14 @@ import com.viaversion.viaversion.compatibility.ForcefulFieldModifier; import java.lang.reflect.Field; import java.util.Objects; +/** + * @deprecated usage of sun.misc.Unsafe is discouraged and can stop working in future Java releases. + */ @SuppressWarnings({ "java:S1191", // SonarLint/-Qube/-Cloud: We need Unsafe for the modifier implementation. "java:S3011", // ^: We need to circumvent the access restrictions of fields. }) +@Deprecated public final class UnsafeBackedForcefulFieldModifier implements ForcefulFieldModifier { private final sun.misc.Unsafe unsafe;