ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Field mover

Browse Source
This commit is contained in:
Adam
2015-08-15 14:54:48 -04:00
parent fc3c0a258f
commit 8a7e1d1f97
11 changed files with 263 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
src/main/java/info/sigterm/deob/Deob.java
View File

@@ -1,16 +1,6 @@
package info.sigterm.deob; package info.sigterm.deob;
import info.sigterm.deob.deobfuscators.ConstantParameter; import info.sigterm.deob.deobfuscators.FieldMover;
import info.sigterm.deob.deobfuscators.IllegalStateExceptions;
import info.sigterm.deob.deobfuscators.MethodInliner;
import info.sigterm.deob.deobfuscators.MethodMover;
import info.sigterm.deob.deobfuscators.ModularArithmeticDeobfuscation;
import info.sigterm.deob.deobfuscators.RenameUnique;
import info.sigterm.deob.deobfuscators.RuntimeExceptions;
import info.sigterm.deob.deobfuscators.UnreachedCode;
import info.sigterm.deob.deobfuscators.UnusedFields;
import info.sigterm.deob.deobfuscators.UnusedMethods;
import info.sigterm.deob.deobfuscators.UnusedParameters;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
@@ -45,66 +35,68 @@ public class Deob
// bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
// System.out.println("rename unique took " + bdur/1000L + " seconds"); // System.out.println("rename unique took " + bdur/1000L + " seconds");
// remove except RuntimeException // // remove except RuntimeException
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new RuntimeExceptions().run(group); // new RuntimeExceptions().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("runtime exception took " + bdur/1000L + " seconds"); // System.out.println("runtime exception took " + bdur/1000L + " seconds");
//
// remove unused methods // // remove unused methods
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedMethods().run(group); // new UnusedMethods().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused methods took " + bdur/1000L + " seconds"); // System.out.println("unused methods took " + bdur/1000L + " seconds");
//
new UnreachedCode().run(group); // new UnreachedCode().run(group);
//
// remove illegal state exceptions, frees up some parameters // // remove illegal state exceptions, frees up some parameters
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new IllegalStateExceptions().run(group); // new IllegalStateExceptions().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("illegal state exception took " + bdur/1000L + " seconds"); // System.out.println("illegal state exception took " + bdur/1000L + " seconds");
//
// remove constant logically dead parameters // // remove constant logically dead parameters
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new ConstantParameter().run(group); // new ConstantParameter().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("constant param took " + bdur/1000L + " seconds"); // System.out.println("constant param took " + bdur/1000L + " seconds");
//
// remove unhit blocks // // remove unhit blocks
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnreachedCode().run(group); // new UnreachedCode().run(group);
//new UnusedBlocks().run(group); // //new UnusedBlocks().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused blocks took " + bdur/1000L + " seconds"); // System.out.println("unused blocks took " + bdur/1000L + " seconds");
//
// remove unused parameters // // remove unused parameters
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedParameters().run(group); // new UnusedParameters().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused params took " + bdur/1000L + " seconds"); // System.out.println("unused params took " + bdur/1000L + " seconds");
//
// remove jump obfuscation // // remove jump obfuscation
//new Jumps().run(group); // //new Jumps().run(group);
//
// remove unused fields // // remove unused fields
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedFields().run(group); // new UnusedFields().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused fields took " + bdur/1000L + " seconds"); // System.out.println("unused fields took " + bdur/1000L + " seconds");
//
// remove unused methods, again? // // remove unused methods, again?
bstart = System.currentTimeMillis(); // bstart = System.currentTimeMillis();
new UnusedMethods().run(group); // new UnusedMethods().run(group);
bdur = System.currentTimeMillis() - bstart; // bdur = System.currentTimeMillis() - bstart;
System.out.println("unused methods took " + bdur/1000L + " seconds"); // System.out.println("unused methods took " + bdur/1000L + " seconds");
//
//
new MethodInliner().run(group); // new MethodInliner().run(group);
// new ModularArithmeticDeobfuscation().run(group); // new ModularArithmeticDeobfuscation().run(group);
new MethodMover().run(group); //new MethodMover().run(group);
new FieldMover().run(group);
saveJar(group, args[1]); saveJar(group, args[1]);

5
src/main/java/info/sigterm/deob/Field.java
View File

@@ -57,6 +57,11 @@ public class Field
{ {
return fields; return fields;
} }
public void setFields(Fields fields)
{
this.fields = fields;
}
public short getAccessFlags() public short getAccessFlags()
{ {

2
src/main/java/info/sigterm/deob/attributes/code/Instruction.java
View File

@@ -222,7 +222,7 @@ public abstract class Instruction
{ {
} }
public void renameField(Field f, String name) public void renameField(Field f, info.sigterm.deob.pool.Field name)
{ {
} }

4
src/main/java/info/sigterm/deob/attributes/code/Instructions.java
View File

@@ -232,10 +232,10 @@ public class Instructions
i.renameClass(cf, name); i.renameClass(cf, name);
} }
public void renameField(Field f, String name) public void renameField(Field f, info.sigterm.deob.pool.Field newField)
{ {
for (Instruction i : instructions) for (Instruction i : instructions)
i.renameField(f, name); i.renameField(f, newField);
} }
public void renameMethod(Method oldMethod, info.sigterm.deob.pool.Method newMethod) public void renameMethod(Method oldMethod, info.sigterm.deob.pool.Method newMethod)

2
src/main/java/info/sigterm/deob/attributes/code/instruction/types/FieldInstruction.java
View File

@@ -5,4 +5,6 @@ import info.sigterm.deob.pool.Field;
public interface FieldInstruction public interface FieldInstruction
{ {
public Field getField(); public Field getField();
public info.sigterm.deob.Field getMyField();
} }

21
src/main/java/info/sigterm/deob/attributes/code/instructions/GetField.java
View File

@@ -61,6 +61,20 @@ public class GetField extends Instruction implements GetFieldInstruction
return field; return field;
} }
@Override
public info.sigterm.deob.Field getMyField()
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
if (cf == null)
return null;
info.sigterm.deob.Field f2 = cf.findFieldDeep(nat);
return f2;
}
@Override @Override
public void renameClass(ClassFile cf, String name) public void renameClass(ClassFile cf, String name)
{ {
@@ -72,7 +86,7 @@ public class GetField extends Instruction implements GetFieldInstruction
} }
@Override @Override
public void renameField(info.sigterm.deob.Field f, String name) public void renameField(info.sigterm.deob.Field f, Field newField)
{ {
Class clazz = field.getClassEntry(); Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType(); NameAndType nat = field.getNameAndType();
@@ -85,9 +99,6 @@ public class GetField extends Instruction implements GetFieldInstruction
assert f2 != null; assert f2 != null;
if (f2 == f) if (f2 == f)
{ field = newField;
NameAndType newNat = new NameAndType(name, nat.getDescriptorType());
field = new Field(clazz, newNat);
}
} }
} }

19
src/main/java/info/sigterm/deob/attributes/code/instructions/GetStatic.java
View File

@@ -73,6 +73,20 @@ public class GetStatic extends Instruction implements GetFieldInstruction
{ {
return field; return field;
} }
@Override
public info.sigterm.deob.Field getMyField()
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
if (cf == null)
return null;
info.sigterm.deob.Field f2 = cf.findFieldDeep(nat);
return f2;
}
@Override @Override
public void renameClass(ClassFile cf, String name) public void renameClass(ClassFile cf, String name)
@@ -85,7 +99,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction
} }
@Override @Override
public void renameField(info.sigterm.deob.Field f, String name) public void renameField(info.sigterm.deob.Field f, Field newField)
{ {
Class clazz = field.getClassEntry(); Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType(); NameAndType nat = field.getNameAndType();
@@ -99,8 +113,7 @@ public class GetStatic extends Instruction implements GetFieldInstruction
if (f2 == f) if (f2 == f)
{ {
NameAndType newNat = new NameAndType(name, nat.getDescriptorType()); field = newField;
field = new Field(clazz, newNat);
} }
} }
} }

19
src/main/java/info/sigterm/deob/attributes/code/instructions/PutField.java
View File

@@ -55,6 +55,20 @@ public class PutField extends Instruction implements SetFieldInstruction
{ {
return field; return field;
} }
@Override
public info.sigterm.deob.Field getMyField()
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
if (cf == null)
return null;
info.sigterm.deob.Field f2 = cf.findFieldDeep(nat);
return f2;
}
@Override @Override
public void renameClass(ClassFile cf, String name) public void renameClass(ClassFile cf, String name)
@@ -67,7 +81,7 @@ public class PutField extends Instruction implements SetFieldInstruction
} }
@Override @Override
public void renameField(info.sigterm.deob.Field f, String name) public void renameField(info.sigterm.deob.Field f, Field newField)
{ {
Class clazz = field.getClassEntry(); Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType(); NameAndType nat = field.getNameAndType();
@@ -80,8 +94,7 @@ public class PutField extends Instruction implements SetFieldInstruction
if (f2 == f) if (f2 == f)
{ {
NameAndType newNat = new NameAndType(name, nat.getDescriptorType()); field = newField;
field = new Field(clazz, newNat);
} }
} }
} }

19
src/main/java/info/sigterm/deob/attributes/code/instructions/PutStatic.java
View File

@@ -55,6 +55,20 @@ public class PutStatic extends Instruction implements SetFieldInstruction
return field; return field;
} }
@Override
public info.sigterm.deob.Field getMyField()
{
Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType();
ClassFile cf = this.getInstructions().getCode().getAttributes().getClassFile().getGroup().findClass(clazz.getName());
if (cf == null)
return null;
info.sigterm.deob.Field f2 = cf.findFieldDeep(nat);
return f2;
}
@Override @Override
public void renameClass(ClassFile cf, String name) public void renameClass(ClassFile cf, String name)
{ {
@@ -66,7 +80,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction
} }
@Override @Override
public void renameField(info.sigterm.deob.Field f, String name) public void renameField(info.sigterm.deob.Field f, Field newField)
{ {
Class clazz = field.getClassEntry(); Class clazz = field.getClassEntry();
NameAndType nat = field.getNameAndType(); NameAndType nat = field.getNameAndType();
@@ -79,8 +93,7 @@ public class PutStatic extends Instruction implements SetFieldInstruction
if (f2 == f) if (f2 == f)
{ {
NameAndType newNat = new NameAndType(name, nat.getDescriptorType()); field = newField;
field = new Field(clazz, newNat);
} }
} }
} }

124
src/main/java/info/sigterm/deob/deobfuscators/FieldMover.java Normal file
View File

@@ -0,0 +1,124 @@
package info.sigterm.deob.deobfuscators;
import info.sigterm.deob.ClassFile;
import info.sigterm.deob.ClassGroup;
import info.sigterm.deob.Deobfuscator;
import info.sigterm.deob.Field;
import info.sigterm.deob.Method;
import info.sigterm.deob.attributes.Code;
import info.sigterm.deob.attributes.code.Instruction;
import info.sigterm.deob.attributes.code.instruction.types.FieldInstruction;
import info.sigterm.deob.pool.NameAndType;
import java.util.Collection;
import org.apache.commons.collections4.map.MultiValueMap;
public class FieldMover implements Deobfuscator
{
private ClassGroup group;
private MultiValueMap<Field, ClassFile> fields = new MultiValueMap<>();
private void findUses()
{
fields.clear();
for (ClassFile cf : group.getClasses())
{
for (Method m : cf.getMethods().getMethods())
{
Code code = m.getCode();
if (code == null)
continue;
for (Instruction i : code.getInstructions().getInstructions())
{
if (!(i instanceof FieldInstruction))
continue;
FieldInstruction fi = (FieldInstruction) i;
Field field = fi.getMyField();
if (field == null)
continue;
if (!field.isStatic())
continue;
if (fields.containsKey(field))
{
Collection<ClassFile> col = fields.getCollection(field);
if (!col.contains(cf))
fields.put(field, cf);
}
else
fields.put(field, cf);
}
}
}
}
private int moveFields()
{
int count = 0;
for (Field field : fields.keySet())
{
Collection<ClassFile> cfs = fields.getCollection(field);
if (cfs.size() != 1)
{
// XXX clinit
continue;
}
ClassFile cf = cfs.iterator().next();
if (field.getFields().getClassFile() == cf)
continue;
moveField(field, cf);
++count;
}
return count;
}
private void moveField(Field field, ClassFile to)
{
assert field.getFields().getClassFile() != to;
info.sigterm.deob.pool.Field newField = new info.sigterm.deob.pool.Field(
new info.sigterm.deob.pool.Class(to.getName()),
new NameAndType(field.getName(), field.getType())
);
// move on instructions
for (ClassFile cf : group.getClasses())
{
for (Method m : cf.getMethods().getMethods())
{
Code code = m.getCode();
if (code == null)
continue;
code.getInstructions().renameField(field, newField);
}
}
// move the field
field.getFields().getFields().remove(field);
to.getFields().getFields().add(field);
field.setFields(to.getFields());
}
@Override
public void run(ClassGroup group)
{
group.buildClassGraph();
this.group = group;
findUses();
moveFields();
}
}

6
src/main/java/info/sigterm/deob/deobfuscators/RenameUnique.java
View File

@@ -95,7 +95,11 @@ public class RenameUnique implements Deobfuscator
if (method.getCode() != null) if (method.getCode() != null)
{ {
Instructions instructions = method.getCode().getInstructions(); Instructions instructions = method.getCode().getInstructions();
instructions.renameField(field, name); info.sigterm.deob.pool.Field newField = new info.sigterm.deob.pool.Field(
new info.sigterm.deob.pool.Class(c.getName()),
new NameAndType(name, field.getType())
);
instructions.renameField(field, newField);
} }
} }
} }