LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 09:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding class with obfuscated identifier fix.

Browse Source 
Obfuscated class/packages ordering fix.
This commit is contained in:
Jindra Petřík
2025-07-27 12:38:08 +02:00
parent da140c09b8
commit c87dc16ae3
9 changed files with 112 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java
+10 -2
View File
@@ -729,11 +729,19 @@ public class IdentifiersDeobfuscation {
/**
* Unescapes deobfuscated identifier
* @param swf SWF
* @param s String
* @return Unescaped string
*/
public static String unescapeOIdentifier(String s) {
public static String unescapeOIdentifier(SWF swf, String s) {
StringBuilder ret = new StringBuilder(s.length());
Map<String, String> map = swf.getObfuscatedIdentifiersMap();
for (Map.Entry<String, String> entry : map.entrySet()) {
if (s.equals(entry.getValue())) {
return entry.getKey();
}
}
if (s.length() < 2) {
return s;
}
@@ -793,7 +801,7 @@ public class IdentifiersDeobfuscation {
@SuppressWarnings("unchecked")
public static GraphTextWriter writeCurrentScriptReplacements(GraphTextWriter writer, Set<String> usedDeobfuscations, SWF swf) {
if (!usedDeobfuscations.isEmpty()) {
if (!usedDeobfuscations.isEmpty() && Configuration.autoDeobfuscateIdentifiers.get()) {
writer.newLine();
List<String> commentLines = new ArrayList<>();
Map<String, String> fullMap = swf.getObfuscatedIdentifiersMap();
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
+5
View File
@@ -624,6 +624,11 @@ public class ScriptPack extends AS3ClassTreeItem {
abc.script_info.get(scriptIndex).setModified(false);
}
@Override
protected SWF getSwf() {
return abc.getSwf();
}
/**
* Label with address.
*/
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/timeline/AS3Package.java
+59 -7
View File
@@ -16,16 +16,21 @@
*/
package com.jpexs.decompiler.flash.timeline;
import com.jpexs.decompiler.flash.AppResources;
import com.jpexs.decompiler.flash.IdentifiersDeobfuscation;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.ClassPath;
import com.jpexs.decompiler.flash.abc.ScriptPack;
import com.jpexs.decompiler.flash.treeitems.AS3ClassTreeItem;
import com.jpexs.decompiler.flash.treeitems.Openable;
import com.jpexs.decompiler.graph.DottedChain;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import natorder.NaturalOrderComparator;
@@ -46,12 +51,34 @@ public class AS3Package extends AS3ClassTreeItem {
*/
public String packageName;
private final String DEFAULT_PACKAGE_NAME = AppResources.translate("package.default");
/**
* All subPackages
*/
@SuppressWarnings("unchecked")
private final Map<String, AS3Package> subPackages = new TreeMap<>(new NaturalOrderComparator());
private final Map<String, AS3Package> subPackages = new TreeMap<>(new Comparator<String>() {
NaturalOrderComparator noc = new NaturalOrderComparator();
@Override
public int compare(String o1, String o2) {
if (Objects.equals(o1, o2)) {
return 0;
}
if (DEFAULT_PACKAGE_NAME.equals(o1)) {
return -1;
}
if (DEFAULT_PACKAGE_NAME.equals(o2)) {
return 1;
}
return noc.compare(o1, o2);
}
}
);
/**
* All scripts in this package
*/
@@ -101,6 +128,7 @@ public class AS3Package extends AS3ClassTreeItem {
/**
* Constructor.
*
* @param packageName Package name
* @param openable Openable
* @param flat Whether the package is flat = in the format "mypkg.sub1.sub2"
@@ -113,7 +141,7 @@ public class AS3Package extends AS3ClassTreeItem {
* itself, index of scriptInfo
*/
public AS3Package(String packageName, Openable openable, boolean flat, boolean defaultPackage, ABC abc, boolean partOfCompoundScript, Integer compoundScriptIndex) {
super(packageName, "", null);
super(packageName, "", null);
this.flat = flat;
this.openable = openable;
this.packageName = packageName;
@@ -247,9 +275,10 @@ public class AS3Package extends AS3ClassTreeItem {
*
* @param script ScriptPack
*/
public void addScriptPack(ScriptPack script) {
ClassPath cp = script.getClassPath();
scripts.put(cp.className + cp.namespaceSuffix, script);
public void addScriptPack(ScriptPack script) {
/*ClassPath cp = script.getClassPath();
scripts.put(cp.className + cp.namespaceSuffix, script);*/
scripts.put(script.getPrintableNameWithNamespaceSuffix(), script);
sortedScripts = null;
}
@@ -259,7 +288,12 @@ public class AS3Package extends AS3ClassTreeItem {
* @param subPackage Subpackage
*/
public void addSubPackage(AS3Package subPackage) {
subPackages.put(subPackage.getNameWithNamespaceSuffix(), subPackage);
if (subPackage.isDefaultPackage()) {
subPackages.put(DEFAULT_PACKAGE_NAME, subPackage);
} else {
subPackages.put(subPackage.getPrintableNameWithNamespaceSuffix(), subPackage);
}
//subPackages.put(subPackage.getNameWithNamespaceSuffix(), subPackage);
sortedPackages = null;
}
@@ -270,6 +304,12 @@ public class AS3Package extends AS3ClassTreeItem {
* @return Subpackage
*/
public AS3Package getSubPackage(String packageName) {
/*String printableName;
if (packageName.equals(DEFAULT_PACKAGE_NAME)) {
printableName = DEFAULT_PACKAGE_NAME;
} else {
printableName = DottedChain.parseNoSuffix(packageName).toPrintableString(new LinkedHashSet<>(), getSwf(), true);
}*/
return subPackages.get(packageName);
}
@@ -380,4 +420,16 @@ public class AS3Package extends AS3ClassTreeItem {
}
return false;
}
@Override
protected SWF getSwf() {
Openable op = getOpenable();
if (op instanceof SWF) {
return (SWF) op;
}
if (op instanceof ABC) {
return ((ABC) op).getSwf();
}
return null;
}
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/treeitems/AS3ClassTreeItem.java
+2
View File
@@ -106,4 +106,6 @@ public abstract class AS3ClassTreeItem implements TreeItem {
public String toString() {
return getPrintableNameWithNamespaceSuffix();
}
protected abstract SWF getSwf();
}
libsrc/ffdec_lib/src/com/jpexs/decompiler/graph/DottedChain.java
+3 -2
View File
@@ -156,10 +156,11 @@ public class DottedChain implements Serializable, Comparable<DottedChain> {
/**
* Parses a dotted chain from a deobfuscated string.
*
* @param swf SWF
* @param name Name
* @return Dotted chain
*/
public static final DottedChain parsePrintable(String name) {
public static final DottedChain parsePrintable(SWF swf, String name) {
if (name == null) {
return DottedChain.EMPTY;
} else if (name.isEmpty()) {
@@ -168,7 +169,7 @@ public class DottedChain implements Serializable, Comparable<DottedChain> {
String[] parts = name.split("\\.");
List<PathPart> newParts = new ArrayList<>();
for (String part : parts) {
newParts.add(new PathPart(IdentifiersDeobfuscation.unescapeOIdentifier(part), false, ""));
newParts.add(new PathPart(IdentifiersDeobfuscation.unescapeOIdentifier(swf, part), false, ""));
}
DottedChain ret = new DottedChain();
libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java
+3 -2
View File
@@ -256,12 +256,13 @@ public class Helper {
/**
* Unescape export name
* @param swf SWF
* @param s Input string
* @return Unescaped string
*/
public static String unescapeExportname(String s) {
public static String unescapeExportname(SWF swf, String s) {
if (s.startsWith("__Packages.")) {
return DottedChain.parsePrintable(s).toRawString();
return DottedChain.parsePrintable(swf, s).toRawString();
}
return unescapePCodeString(s);
}