From b3dc388feafdfe7dd658686dce947ec799e1c7db Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sun, 1 Sep 2024 16:10:58 -0400 Subject: [PATCH] Block JGit from loading the system Git config --- .../mixins/jgit/SystemReaderMixin.java | 16 ++++++++++++++++ src/main/resources/skyblocker.mixins.json | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/hysky/skyblocker/mixins/jgit/SystemReaderMixin.java diff --git a/src/main/java/de/hysky/skyblocker/mixins/jgit/SystemReaderMixin.java b/src/main/java/de/hysky/skyblocker/mixins/jgit/SystemReaderMixin.java new file mode 100644 index 0000000000..1c13c57f76 --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixins/jgit/SystemReaderMixin.java @@ -0,0 +1,16 @@ +package de.hysky.skyblocker.mixins.jgit; + +import org.eclipse.jgit.lib.Constants; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import com.llamalad7.mixinextras.injector.ModifyReturnValue; + +@Mixin(targets = "org.eclipse.jgit.util.SystemReader$Default", remap = false) +public class SystemReaderMixin { + + @ModifyReturnValue(method = "getenv", at = @At("RETURN")) + private String skyblocker$blockLoadingSystemGitConfig(String original, String variable) { + return variable.equals(Constants.GIT_CONFIG_NOSYSTEM_KEY) ? "FORCE-ENABLE" : original; + } +} diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index fdbd84f06a..912ce94eb9 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -55,7 +55,8 @@ "accessors.SkullBlockEntityAccessor", "accessors.SlotAccessor", "accessors.WorldRendererAccessor", - "discordipc.ConnectionMixin" + "discordipc.ConnectionMixin", + "jgit.SystemReaderMixin" ], "injectors": { "defaultRequire": 1