diff options
20 files changed, 994 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..38171b3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +/.idea/* +!/.idea/artifacts + +# gradle +build +.gradle + +# other +eclipse +run diff --git a/.idea/artifacts/CopyMod.xml b/.idea/artifacts/CopyMod.xml new file mode 100644 index 0000000..14c03c2 --- /dev/null +++ b/.idea/artifacts/CopyMod.xml @@ -0,0 +1,8 @@ +<component name="ArtifactManager"> + <artifact name="CopyMod"> + <output-path>$USER_HOME$/AppData/Roaming/.minecraft/mods</output-path> + <root id="root"> + <element id="dir-copy" path="$PROJECT_DIR$/build/libs" /> + </root> + </artifact> +</component>
\ No newline at end of file diff --git a/.idea/artifacts/CopyResources.xml b/.idea/artifacts/CopyResources.xml new file mode 100644 index 0000000..abf019e --- /dev/null +++ b/.idea/artifacts/CopyResources.xml @@ -0,0 +1,8 @@ +<component name="ArtifactManager"> + <artifact name="CopyResources"> + <output-path>$PROJECT_DIR$/build/classes/main</output-path> + <root id="root"> + <element id="dir-copy" path="$PROJECT_DIR$/src/main/resources" /> + </root> + </artifact> +</component>
\ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/README.md diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e6d4434 --- /dev/null +++ b/build.gradle @@ -0,0 +1,102 @@ +buildscript { + repositories { + //new forge repository + maven { url "https://maven.minecraftforge.net" } + maven { url 'https://repo.spongepowered.org/maven'} + mavenCentral() + } + dependencies { + classpath "net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT" + classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT' + } +} + +plugins { + id "java" + id "com.github.johnrengelman.shadow" version "2.0.4" +} + +apply plugin: 'net.minecraftforge.gradle.tweaker-client' +apply plugin: 'org.spongepowered.mixin' + +version = "1.0.0" +group = "gq.malwarefight.nosession" +archivesBaseName = "nosession" + +compileJava.sourceCompatibility = compileJava.targetCompatibility = 1.8 +compileJava.options.encoding = "UTF-8" + +minecraft { + version = "1.8.9" + runDir = "run" + mappings = "stable_22" //mappings for 1.8.9 + makeObfSourceJar = false //disable creation of sources jar + tweakClass = 'gq.malwarefight.nosession.mixin.InitialTweaker' +} + +configurations { + shade + compile.extendsFrom(shade) +} + +repositories { + maven { url 'https://repo.spongepowered.org/maven/' } + maven { url 'https://maven.minecraftforge.net/' } + mavenCentral() +} + +dependencies { + shade('org.spongepowered:mixin:0.7.10-SNAPSHOT') { + exclude module: 'launchwrapper' + exclude module: 'guava' + exclude module: 'gson' + exclude module: 'commons-io' + exclude module: 'log4j-core' + } +} + +processResources { + //replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include "mcmod.info" + + //replace version and mcversion + expand "version":project.version, "mcversion":project.minecraft.version + } + + //copy everything else, that"s not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude "mcmod.info" + } + + rename '(.+_at.cfg)', 'META-INF/$1' +} + +shadowJar { + dependencies {} + configurations = [project.configurations.shade] + duplicatesStrategy DuplicatesStrategy.EXCLUDE //prevent duplicates + classifier "" //prevent creation of unshadowed jar +} + +reobf { + //reobfuscate the shadowed jar + shadowJar {} +} + +jar { + manifest { + attributes "ForceLoadAsMod": true, + "TweakOrder": 0, + "ModSide": "CLIENT", + 'FMLCorePluginContainsFMLMod': true, + 'TweakClass': 'gq.malwarefight.nosession.mixin.InitialTweaker', + 'MixinConfigs': 'mixins.nosession.json' + } +} + +sourceSets { + main { + ext.refMap = "mixins.nosession.refmap.json" + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..d6c2ce7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +# suppress inspection "UnusedProperty" +org.gradle.jvmargs=-Xmx4096M
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..6ffa237 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..7b64320 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip @@ -0,0 +1,169 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/main/java/gq/malwarefight/nosession/mixin/BlankTweaker.java b/src/main/java/gq/malwarefight/nosession/mixin/BlankTweaker.java new file mode 100644 index 0000000..2c9109b --- /dev/null +++ b/src/main/java/gq/malwarefight/nosession/mixin/BlankTweaker.java @@ -0,0 +1,29 @@ +package gq.malwarefight.nosession.mixin; + +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.LaunchClassLoader; + +import java.io.File; +import java.util.List; + +public class BlankTweaker implements ITweaker { + @Override + public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) { + + } + + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) { + + } + + @Override + public String getLaunchTarget() { + return null; + } + + @Override + public String[] getLaunchArguments() { + return new String[0]; + } +} diff --git a/src/main/java/gq/malwarefight/nosession/mixin/InitialTweaker.java b/src/main/java/gq/malwarefight/nosession/mixin/InitialTweaker.java new file mode 100644 index 0000000..7d9c308 --- /dev/null +++ b/src/main/java/gq/malwarefight/nosession/mixin/InitialTweaker.java @@ -0,0 +1,159 @@ +package gq.malwarefight.nosession.mixin; + +import com.google.common.annotations.Beta; +import com.google.common.collect.ForwardingMultimap; +import com.google.gson.Gson; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraft.launchwrapper.LogWrapper; +import org.apache.commons.io.ByteOrderMark; +import org.apache.commons.lang3.CharEncoding; +import org.apache.commons.lang3.Validate; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.objectweb.asm.Opcodes; +import org.spongepowered.asm.launch.MixinBootstrap; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.Mixins; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; +import java.util.*; + +@SuppressWarnings({"unused", "unchecked"}) +public class InitialTweaker implements ITweaker { + + // I'm creating my own allTweakers list + // with blackjack and hookers! + public final ArrayList<ITweaker> allTweakers = new ArrayList<>(); + + public InitialTweaker() {} + + public String getLibraryPath(Class<?> c) throws URISyntaxException { + return new File(c.getProtectionDomain().getCodeSource().getLocation().toURI()).getAbsolutePath(); + } + + public String getClasspath() throws URISyntaxException { + return String.join( + System.getProperty("path.separator"), + getLibraryPath(InitialTweaker.class), + getLibraryPath(YggdrasilAuthenticationService.class), + getLibraryPath(Gson.class), + getLibraryPath(LogManager.class), + getLibraryPath(Validate.class), + getLibraryPath(ForwardingMultimap.class), + getLibraryPath(Beta.class), + getLibraryPath(CharEncoding.class), + getLibraryPath(ByteOrderMark.class), + getLibraryPath(Logger.class), + getLibraryPath(Opcodes.class) + ); + } + + + public void setToken(String token) throws IOException, URISyntaxException { + File javaExecutable = Paths.get(System.getProperty("java.home"), "bin", "java").toFile(); + ProcessBuilder processBuilder = new ProcessBuilder( + javaExecutable.getAbsolutePath(), "-cp", getClasspath(), "gq.malwarefight.tokenapp.Main" + ); + processBuilder.redirectOutput(ProcessBuilder.Redirect.INHERIT).redirectError(ProcessBuilder.Redirect.INHERIT); + Process c = processBuilder.start(); + c.getOutputStream().write((token + "\n").getBytes(StandardCharsets.UTF_8)); + c.getOutputStream().flush(); + } + + /** + * This handles the launch arguments passed towards minecraft + * @param args The launch arguments + * @param gameDir The game directory (ie: .minecraft) + * @param assetsDir The assets directory + * @param profile The game profile + */ + @Override + @SuppressWarnings("unchecked") + public final void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) { + ArrayList<String> argsCopy = new ArrayList<>(args); + for (int i = 0; i < argsCopy.size(); i++) { + if (argsCopy.get(i).equals("--accessToken")) { + argsCopy.set(i + 1, "<noSessionAccessToken>"); + } + } + boolean any = false; + // in order to prevent other mods from seeing the true list of args with the token + // we will just call all the other tweakers from here + ArrayList<ITweaker> tweakers = (ArrayList<ITweaker>) Launch.blackboard.get("Tweaks"); + for (final ITweaker tweaker : tweakers) { + if (tweaker == this) + continue; + + LogWrapper.log(Level.INFO, "Calling tweak class %s", tweaker.getClass().getName()); + tweaker.acceptOptions(argsCopy, gameDir, assetsDir, profile); + tweaker.injectIntoClassLoader(Launch.classLoader); + allTweakers.add(tweaker); + tweakers.set(tweakers.indexOf(tweaker), new BlankTweaker()); + any = true; + } + if (any) { + ((ArrayList<String>) Launch.blackboard.get("TweakClasses")).add(0, + Utils.getUniqueClassName() + ); + } + } + + /** + * Inject into the MC class loader + * @param classLoader The class loader + */ + @Override + public final void injectIntoClassLoader(LaunchClassLoader classLoader) { + MixinBootstrap.init(); + MixinEnvironment environment = MixinEnvironment.getDefaultEnvironment(); + Mixins.addConfiguration("mixins.nosession.json"); + // Check if the obfuscation context is null + if (environment.getObfuscationContext() == null) { + environment.setObfuscationContext("notch"); + } + // This is a client side, client :) + environment.setSide(MixinEnvironment.Side.CLIENT); + } + + @Override + public String getLaunchTarget() { + return MixinBootstrap.getPlatform().getLaunchTarget(); + } + + @Override + public String[] getLaunchArguments() { + + ArrayList<String> argsFromOurTweakers = new ArrayList<>(); + + for (ITweaker i: allTweakers) { + argsFromOurTweakers.addAll(Arrays.asList(i.getLaunchArguments())); + } + + //noinspection unchecked + ArrayList<String> launchArgs = (ArrayList<String>) Launch.blackboard.get("ArgumentList"); + for (int i = 0; i < launchArgs.size(); i++) { + if (launchArgs.get(i).equals("--accessToken")) { + try { + setToken(launchArgs.get(i + 1)); + } catch (Exception e) { + throw new RuntimeException(e); + } + launchArgs.set(i + 1, "<noSessionAccessToken>"); + } + } + if (!launchArgs.contains("--accessToken")) { + argsFromOurTweakers.add("--accessToken"); + argsFromOurTweakers.add("<noSessionAccessToken>"); + } + + return argsFromOurTweakers.toArray(new String[0]); + } +} diff --git a/src/main/java/gq/malwarefight/nosession/mixin/L2Tweaker.java b/src/main/java/gq/malwarefight/nosession/mixin/L2Tweaker.java new file mode 100644 index 0000000..8736ca4 --- /dev/null +++ b/src/main/java/gq/malwarefight/nosession/mixin/L2Tweaker.java @@ -0,0 +1,68 @@ +package gq.malwarefight.nosession.mixin; + +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import net.minecraft.launchwrapper.LaunchClassLoader; +import net.minecraft.launchwrapper.LogWrapper; +import org.apache.logging.log4j.Level; +import org.spongepowered.asm.launch.MixinBootstrap; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +@SuppressWarnings("unused") // is used, but not mentioned directly +public class L2Tweaker implements ITweaker { + + public final ArrayList<ITweaker> allTweakers = new ArrayList<>(); + + @Override + @SuppressWarnings("unchecked") + public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile) { + ArrayList<String> argsCopy = new ArrayList<>(args); + for (int i = 0; i < argsCopy.size(); i++) { + if (argsCopy.get(i).equals("--accessToken")) { + argsCopy.set(i + 1, "<noSessionAccessToken>"); + } + } + + boolean any = false; + ArrayList<ITweaker> tweakers = (ArrayList<ITweaker>) Launch.blackboard.get("Tweaks"); + // in order to prevent other mods from seeing the true list of args with the token + // we will just call all the other tweakers from here + for (final ITweaker tweaker : tweakers) { + if (tweaker == this) + continue; + LogWrapper.log(Level.INFO, "Calling tweak class %s", tweaker.getClass().getName()); + tweaker.acceptOptions(argsCopy, gameDir, assetsDir, profile); + tweaker.injectIntoClassLoader(Launch.classLoader); + allTweakers.add(tweaker); + tweakers.set(tweakers.indexOf(tweaker), new BlankTweaker()); + any = true; + } + if (any) { + ((ArrayList<String>) Launch.blackboard.get("TweakClasses")).add(0, + Utils.getUniqueClassName() + ); + } + } + + @Override + public void injectIntoClassLoader(LaunchClassLoader classLoader) {} + + @Override + public String getLaunchTarget() { + return MixinBootstrap.getPlatform().getLaunchTarget(); + } + + @Override + public String[] getLaunchArguments() { + ArrayList<String> argsFromOurTweakers = new ArrayList<>(); + + for (ITweaker i: allTweakers) { + argsFromOurTweakers.addAll(Arrays.asList(i.getLaunchArguments())); + } + return argsFromOurTweakers.toArray(new String[0]); + } +}
\ No newline at end of file diff --git a/src/main/java/gq/malwarefight/nosession/mixin/Utils.java b/src/main/java/gq/malwarefight/nosession/mixin/Utils.java new file mode 100644 index 0000000..e67bddc --- /dev/null +++ b/src/main/java/gq/malwarefight/nosession/mixin/Utils.java @@ -0,0 +1,89 @@ +package gq.malwarefight.nosession.mixin; + +import gq.malwarefight.nosession.mixin.asm.ReplacingMethodVisitor; +import net.minecraft.launchwrapper.ITweaker; +import net.minecraft.launchwrapper.Launch; +import org.objectweb.asm.*; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.AbstractList; +import java.util.ArrayList; +import java.util.Arrays; + +public class Utils { + static int num = 0; + + public static byte[] read(InputStream i, Character delimiter) throws IOException { + byte[] buffer = new byte[512]; + int index = 0; + while (true) { + int in = i.read(); + if (in == -1 || (delimiter != null && delimiter == in)) { + return Arrays.copyOfRange(buffer, 0, index); + } + if (index == buffer.length) { + // grow the buffer + byte[] newBuffer = new byte[buffer.length * 2]; + System.arraycopy( + buffer, 0, newBuffer, 0, buffer.length + ); + buffer = newBuffer; + } + buffer[index] = (byte) in; + index++; + } + } + + public static String readString(InputStream i, Character delimiter) throws IOException { + return new String(read(i, delimiter)); + } + + public static void createClass(byte[] classArray, String name) throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { + Method m = ClassLoader.class.getDeclaredMethod( + "defineClass", String.class, byte[].class, int.class, int.class); + m.setAccessible(true); + m.invoke(Launch.classLoader, name, classArray, 0, classArray.length); + } + + public static String getUniqueClassName() { + + String className = "gq.malwarefight.nosession.mixin.L2TweakerClone" + num; + + byte[] L2TweakerBytes; + try { + //noinspection ConstantConditions + L2TweakerBytes = read(Utils.class.getResourceAsStream("/gq/malwarefight/nosession/mixin/L2Tweaker.class"), null); + } catch (IOException e) { + throw new RuntimeException(e); + } + + ClassReader cr = new ClassReader(L2TweakerBytes); + ClassWriter cw = new ClassWriter(cr, 0); + cr.accept(new ClassVisitor(Opcodes.ASM5, cw) { + @Override + public void visit(int version, int access, String name, + String signature, String superName, String[] interfaces) { + super.visit(version, access, className.replace(".", "/"), signature, superName, interfaces); + } + + @Override + public MethodVisitor visitMethod(int access, String name, String desc, + String signature, String[] exceptions) { + return new ReplacingMethodVisitor(super.visitMethod(access, name, desc, signature, exceptions), L2Tweaker.class.getName().replace(".", "/"), className.replace(".", "/")); + } + }, 0); + + byte[] code = cw.toByteArray(); + try { + createClass(code, className); + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + throw new RuntimeException(e); + } + num++; + return className; + } +} diff --git a/src/main/java/gq/malwarefight/nosession/mixin/asm/ReplacingMethodVisitor.java b/src/main/java/gq/malwarefight/nosession/mixin/asm/ReplacingMethodVisitor.java new file mode 100644 index 0000000..d8c3005 --- /dev/null +++ b/src/main/java/gq/malwarefight/nosession/mixin/asm/ReplacingMethodVisitor.java @@ -0,0 +1,22 @@ +package gq.malwarefight.nosession.mixin.asm; + +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; + +public class ReplacingMethodVisitor extends MethodVisitor implements Opcodes { + + final String newName; + final String oldName; + public ReplacingMethodVisitor(MethodVisitor mv, String oldName, String newName) { + super(ASM5, mv); + this.oldName = oldName; + this.newName = newName; + } + + public void visitFieldInsn(int opcode, String owner, String name, + String desc) { + owner = owner.replace(oldName, newName); + super.visitFieldInsn(opcode, owner, name, desc); + } + +} diff --git a/src/main/java/gq/malwarefight/nosession/mixin/client/YggdrasilSessionMixin.java b/src/main/java/gq/malwarefight/nosession/mixin/client/YggdrasilSessionMixin.java new file mode 100644 index 0000000..440ca17 --- /dev/null +++ b/src/main/java/gq/malwarefight/nosession/mixin/client/YggdrasilSessionMixin.java @@ -0,0 +1,60 @@ +package gq.malwarefight.nosession.mixin.client; + +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.exceptions.AuthenticationException; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.nio.charset.StandardCharsets; +import java.util.Objects; +import java.util.Scanner; + + +@Mixin(YggdrasilMinecraftSessionService.class) +public class YggdrasilSessionMixin { + private static final int BASE_PORT = 47777; + @Inject(method = "joinServer", at = @At("HEAD"), cancellable = true, remap = false) + public void joinServer(GameProfile profile, String authenticationToken, String serverId, CallbackInfo ci) throws AuthenticationException { + if (authenticationToken.equals("<noSessionAccessToken>")) { // this token has been messed with by the Tweaker + Socket socket = null; + for (int i = BASE_PORT; i < BASE_PORT + 10; i++) { + try { + socket = new Socket(); + socket.connect(new InetSocketAddress(InetAddress.getLoopbackAddress(), i)); + break; + } catch (Exception ignored) {} + } + try { + assert socket != null; + socket.getOutputStream().write(("login " + serverId + "\n").getBytes(StandardCharsets.UTF_8)); + socket.getOutputStream().flush(); + Scanner result = new Scanner(socket.getInputStream(), StandardCharsets.UTF_8.name()); + String line = result.nextLine(); + String[] parts = line.split(" "); + if (Objects.equals(parts[0], "200")) { + ci.cancel(); + } else if (Objects.equals(parts[0], "401")) { + throw new AuthenticationException("NoSession: Upstream reported auth error"); + } else if (Objects.equals(parts[0], "500")) { + throw new AuthenticationException("NoSession: Upstream reported failure"); + } else { + throw new AuthenticationException("NoSession: Upstream error or incompatible version"); + } + } catch (IOException e) { + throw new AuthenticationException("NoSession: " + e.getMessage()); + } + + try { + socket.getOutputStream().write("disconnect".getBytes(StandardCharsets.UTF_8)); + socket.close(); + } catch (IOException ignored) {} + } + } +} diff --git a/src/main/java/gq/malwarefight/tokenapp/Main.java b/src/main/java/gq/malwarefight/tokenapp/Main.java new file mode 100644 index 0000000..750ae83 --- /dev/null +++ b/src/main/java/gq/malwarefight/tokenapp/Main.java @@ -0,0 +1,75 @@ +package gq.malwarefight.tokenapp; + +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; +import gq.malwarefight.nosession.mixin.Utils; +import org.apache.commons.lang3.exception.ExceptionUtils; + +import javax.net.ssl.HttpsURLConnection; +import java.io.IOException; +import java.net.*; +import java.util.UUID; + +public class Main { + public static final int BASE_PORT = 47777; + public static volatile boolean running = true; + public static YggdrasilMinecraftSessionService sessionService = null; + public static YggdrasilAuthenticationService authenticationService = null; + public static GameProfile gameProfile = null; + + public static void setup() throws IOException { + String token = Utils.readString(System.in, '\n'); + YggdrasilAuthenticationService yas = new YggdrasilAuthenticationService(Proxy.NO_PROXY, token); + authenticationService = yas; + sessionService = (YggdrasilMinecraftSessionService) yas.createMinecraftSessionService(); + HttpsURLConnection httpsURLConnection = (HttpsURLConnection) (new URL("https://api.minecraftservices.com/minecraft/profile").openConnection()); + httpsURLConnection.setRequestProperty("Authorization", "Bearer " + token); + String response = Utils.readString(httpsURLConnection.getInputStream(), null); + JsonObject jsonObject = new JsonParser().parse(response).getAsJsonObject(); + UUID id = UUID.fromString( + jsonObject.get("id").getAsString().replaceFirst( + "(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5" + ) + ); + String name = jsonObject.get("name").getAsString(); + gameProfile = new GameProfile(id, name); + System.setProperty("java.net.preferIPv4Stack", "true"); + } + + public static void main(String[] args) { + try { + setup(); + } catch (Exception e) { + System.err.println("Could not setup the server\n" + ExceptionUtils.getStackTrace(e)); + System.exit(1); + } + ServerSocket sock = null; + for (int i = BASE_PORT; i < BASE_PORT + 10; i++) { + try { + System.out.println(i); + //noinspection resource + sock = new ServerSocket(i, 50, InetAddress.getLoopbackAddress()); + System.out.println(i); + break; + } catch (Exception ignored) { + } + } + if (sock == null) { + System.err.println("Could not bind to any valid port"); + System.exit(1); + } + while (running) { + try { + Socket connection = sock.accept(); + Thread t = new SocketThread(connection); + t.start(); + } catch (IOException ignored) { + running = false; + } + } + } +} +
\ No newline at end of file diff --git a/src/main/java/gq/malwarefight/tokenapp/SocketThread.java b/src/main/java/gq/malwarefight/tokenapp/SocketThread.java new file mode 100644 index 0000000..572ca57 --- /dev/null +++ b/src/main/java/gq/malwarefight/tokenapp/SocketThread.java @@ -0,0 +1,64 @@ +package gq.malwarefight.tokenapp; + +import com.mojang.authlib.exceptions.AuthenticationException; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.Socket; +import java.nio.charset.StandardCharsets; +import java.util.Scanner; + +public class SocketThread extends Thread { + private final Socket sock; + public SocketThread(Socket sock) { + this.sock = sock; + } + + public void writeResponse(String output, OutputStream outputStream) throws IOException { + outputStream.write( + (output + "\n").getBytes(StandardCharsets.UTF_8) + ); + outputStream.flush(); + } + + @Override + public void run() { + try { + InputStream in = sock.getInputStream(); + OutputStream out = sock.getOutputStream(); + Scanner scanner = new Scanner(in, StandardCharsets.UTF_8.name()); + while (true) { + if (scanner.hasNextLine()) { + String line = scanner.nextLine(); + String[] parts = line.split(" "); + if ("login".equals(parts[0])) { + try { + Main.sessionService.joinServer( + Main.gameProfile, Main.authenticationService.getClientToken(), parts[1] + ); + } catch (Exception e) { + if (e instanceof ArrayIndexOutOfBoundsException) { + writeResponse("400 Bad Request", out); + } else if (e instanceof AuthenticationException) { + writeResponse("401 Unauthorized", out); + } else { + writeResponse("500 Internal Server Error", out); + } + continue; + } + writeResponse("200 OK", out); + } else if ("disconnect".equals(parts[0])) { + sock.close(); + } else if ("fullquit".equals(parts[0])) { + Main.running = false; + sock.close(); + return; + } else { + writeResponse("418 I'm a teapot", out); + } + } + } + } catch (IOException ignored) {} + } +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info new file mode 100644 index 0000000..e4298d0 --- /dev/null +++ b/src/main/resources/mcmod.info @@ -0,0 +1,18 @@ +[ + { + "modid": "nosession", + "name": "NoSession", + "description": "NoSession protects your Session ID from being stolen.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authorList": [ + "PandaNinjas" + ], + "credits": "", + "logoFile": "", + "screenshots": [], + "dependencies": [] + } +] diff --git a/src/main/resources/mixins.nosession.json b/src/main/resources/mixins.nosession.json new file mode 100644 index 0000000..c968cc4 --- /dev/null +++ b/src/main/resources/mixins.nosession.json @@ -0,0 +1,9 @@ +{ + "required": true, + "package": "gq.malwarefight.nosession.mixin", + "refmap": "mixins.nosession.refmap.json", + "compatibilityLevel": "JAVA_8", + "client": [ + "client.YggdrasilSessionMixin" + ] +}
\ No newline at end of file |