Browse Source

first commit

master
Adrian Siekierka 1 year ago
commit
5c6277aac0

+ 19
- 0
LICENSE View File

@@ -0,0 +1,19 @@
Copyright (c) 2019 Adrian Siekierka

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

+ 73
- 0
build.gradle View File

@@ -0,0 +1,73 @@
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
jcenter()
}
dependencies {
classpath "gradle.plugin.net.minecrell:licenser:0.4.1"
}
}

apply plugin: 'java'
apply plugin: 'eclipse'
apply plugin: 'idea'
apply plugin: 'maven-publish'

sourceCompatibility = 1.8

def ENV = System.getenv()
if (ENV.BUILD_NUMBER) {
version = version + "." + "${System.getenv().BUILD_NUMBER}"
}

group = 'pl.asie.csrg2tiny'
archivesBaseName = project.name.toLowerCase()

repositories {
mavenCentral()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net'
}
}

dependencies {
compile 'org.ow2.asm:asm:7.1'
compile 'org.ow2.asm:asm-commons:7.1'
}

apply plugin: net.minecrell.gradle.licenser.Licenser

license {
header file('LICENSE')
include '**/*.java'
}

jar {
manifest {
attributes 'Implementation-Title': 'csrg2tiny',
'Implementation-Version': version,
'Main-Class': "pl.asie.csrg2tiny.Main"
}
}

task allJar(type: Jar) {
from {
configurations.compile.collect {
it.isDirectory() ? it : zipTree(it)
}
}
manifest {
attributes 'Implementation-Title': 'csrg2tiny',
'Implementation-Version': version,
'Main-Class': "pl.asie.csrg2tiny.Main"
}
classifier = 'all'
with jar
}

artifacts {
archives allJar
}

+ 2
- 0
gradle.properties View File

@@ -0,0 +1,2 @@
name = csrg2tiny
version = 0.1.0

BIN
gradle/wrapper/gradle-wrapper.jar View File


+ 6
- 0
gradle/wrapper/gradle-wrapper.properties View File

@@ -0,0 +1,6 @@
#Tue Aug 16 01:28:54 BST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

+ 164
- 0
gradlew View File

@@ -0,0 +1,164 @@
#!/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"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

+ 90
- 0
gradlew.bat View File

@@ -0,0 +1,90 @@
@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

@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=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@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 Windowz variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_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=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
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

+ 2
- 0
settings.gradle View File

@@ -0,0 +1,2 @@
rootProject.name = 'csrg2tiny'


+ 97
- 0
src/main/java/pl/asie/csrg2tiny/ClassDataLookup.java View File

@@ -0,0 +1,97 @@
/*
* Copyright (c) 2019 Adrian Siekierka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package pl.asie.csrg2tiny;

import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.Opcodes;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;

public class ClassDataLookup {
private final Map<String, String> descriptors = new HashMap<>();
private final List<String> rootClasses = new ArrayList<>();

private class Visitor extends ClassVisitor {
private String name;

public Visitor() {
super(Opcodes.ASM7);
}

@Override
public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {
this.name = name;
if (name.indexOf('/') < 0) {
rootClasses.add(name);
}

super.visit(version, access, name, signature, superName, interfaces);
}

@Override
public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) {
descriptors.put(this.name + "::" + name, descriptor);

return super.visitField(access, name, descriptor, signature, value);
}
}

public ClassDataLookup(Path path) throws IOException {
File file = path.toFile();

try (FileInputStream is = new FileInputStream(file); JarInputStream jis = new JarInputStream(is)) {
JarEntry entry;
while ((entry = jis.getNextJarEntry()) != null) {
if (entry.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(jis);
reader.accept(new Visitor(), ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
jis.closeEntry();
}
}
}
}

public List<String> getRootClasses() {
return rootClasses;
}

public String findFieldDescriptor(String owner, String name) {
String key = owner + "::" + name;
String value = descriptors.get(key);
if (value == null) {
throw new RuntimeException("Could not find descriptor for " + key + "!");
}
return value;
}
}

+ 171
- 0
src/main/java/pl/asie/csrg2tiny/Main.java View File

@@ -0,0 +1,171 @@
/*
* Copyright (c) 2019 Adrian Siekierka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package pl.asie.csrg2tiny;

import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.*;

public class Main {
public static void main(String[] args) {
if (args.length < 7) {
System.out.println("Usage: csrg2tiny <obfuscated JAR> <cl.csrg> <members.csrg> <package in dot form> <output.tiny> <obf namespace> <deobf namespace>");
return;
}

if (args[3].endsWith(".")) {
throw new RuntimeException("Package must not end with a dot!");
} else if (args[3].indexOf('/') >= 0) {
throw new RuntimeException("Package must not contain slashes! Use dot form.");
}

System.out.println("Reading obfuscated JAR file...");

ClassDataLookup classDataLookup;
try {
classDataLookup = new ClassDataLookup(new File(args[0]).toPath());
} catch (IOException e) {
throw new RuntimeException("Failed reading obfuscatted JAR file!", e);
}

Map<String, List<String>> lines = new TreeMap<>(Comparator.naturalOrder());
Map<String, String> deobfToObfClass = new HashMap<>();
Map<String, String> obfToNewClass = new HashMap<>();
Path clCsrg = new File(args[1]).toPath();
Path mbCsrg = new File(args[2]).toPath();
String tpkg = args[3].replace('.', '/');
if (!tpkg.isEmpty()) tpkg += "/";
final String pkg = tpkg;
Path outTiny = new File(args[4]).toPath();

System.out.println("Reading CSRG files...");

try {
Files.lines(clCsrg, StandardCharsets.UTF_8).forEach((line) -> {
line = line.trim();
if (line.startsWith("#")) return;

String[] entries = line.split(" ");
if (entries.length == 2) {
List<String> l = lines.computeIfAbsent(entries[0], (e) -> new ArrayList<>());
if (l.size() >= 1) {
System.err.println("Warning: duplicate entry: " + l.get(0));
l.clear();
}
l.add("CLASS\t" + entries[0] + "\t" + pkg + entries[1]);
deobfToObfClass.put(entries[1], entries[0]);
obfToNewClass.put(entries[0], pkg + entries[1]);
} else {
System.err.println("Invalid cl.csrg line: " + line);
}
});
} catch (IOException e) {
throw new RuntimeException("Failed reading cl.csrg file!", e);
}

for (String c : classDataLookup.getRootClasses()) {
if (c.indexOf('$') > 0) {
// catch missing inner classes
String unmappedPart = "";
String mappedPart = c;
int idx;
while ((idx = mappedPart.lastIndexOf('$')) > 0) {
if (obfToNewClass.containsKey(mappedPart)) {
break;
}

unmappedPart = mappedPart.substring(idx);
mappedPart = mappedPart.substring(0, idx);
}

if (mappedPart.isEmpty() || unmappedPart.isEmpty()) {
continue;
}

String oldClass = mappedPart + unmappedPart;
String newClass = obfToNewClass.get(mappedPart) + unmappedPart;

System.err.println("Found unmapped inner class: " + oldClass + " -> " + newClass);
lines.computeIfAbsent(oldClass, (a) -> new ArrayList<>()).add("CLASS\t" + oldClass + "\t" + newClass);
}
}

MethodSignatureConverter methodDescConv = new MethodSignatureConverter(deobfToObfClass);

try {
Files.lines(mbCsrg, StandardCharsets.UTF_8).forEach((line) -> {
line = line.trim();
if (line.startsWith("#")) return;

String[] entries = line.split(" ");
if (entries.length != 3 && entries.length != 4) {
System.err.println("Invalid members.csrg line: " + line);
}

String obfClass = deobfToObfClass.get(entries[0]);
if (obfClass == null) {
String newClass = pkg + entries[0].substring(entries[0].lastIndexOf('/') + 1);
deobfToObfClass.put(entries[0], entries[0]);
lines.put(entries[0], new ArrayList<>());
lines.get(entries[0]).add("CLASS\t" + entries[0] + "\t" + newClass);
obfClass = entries[0];
}

List<String> l = lines.get(obfClass);
if (l == null) {
throw new RuntimeException("Could not find classes entry for " + entries[0] + "!");
}

if (entries.length == 3) {
// field
l.add("FIELD\t" + obfClass + "\t" + classDataLookup.findFieldDescriptor(obfClass, entries[1]) + "\t" + entries[1] + "\t" + entries[2]);
} else if (entries.length == 4) {
// method
l.add("METHOD\t" + obfClass + "\t" + methodDescConv.mapMethodDesc(entries[2]) + "\t" + entries[1] + "\t" + entries[3]);
}
});
} catch (IOException e) {
throw new RuntimeException("Failed reading members.csrg file!", e);
}

System.out.println("Writing Tiny file...");

try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
baos.write(("v1\t" + args[5] + "\t" + args[6] + "\n").getBytes(StandardCharsets.UTF_8));
for (Map.Entry<String, List<String>> lineEntry : lines.entrySet()) {
for (String s : lineEntry.getValue()) {
baos.write(s.getBytes(StandardCharsets.UTF_8));
baos.write('\n');
}
}
Files.write(outTiny, baos.toByteArray());
} catch (IOException e) {
throw new RuntimeException("Failed writing Tiny file!", e);
}

System.out.println("Done!");
}
}

+ 40
- 0
src/main/java/pl/asie/csrg2tiny/MethodSignatureConverter.java View File

@@ -0,0 +1,40 @@
/*
* Copyright (c) 2019 Adrian Siekierka
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package pl.asie.csrg2tiny;

import org.objectweb.asm.commons.Remapper;

import java.util.Map;

class MethodSignatureConverter extends Remapper {
private final Map<String, String> classConversionMap;

public MethodSignatureConverter(Map<String, String> classConversionMap) {
this.classConversionMap = classConversionMap;
}

@Override
public String map(final String internalName) {
return classConversionMap.getOrDefault(internalName, internalName);
}
}

Loading…
Cancel
Save