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

AS1/2: using eval on invalid identifiers

Browse Source
This commit is contained in:
Jindra Petřík
2014-08-23 20:47:00 +02:00
parent cdfb0cf538
commit c8208c0360
3 changed files with 272 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/jpexs/decompiler/flash/action/Deobfuscation.java
+17 -11
View File
@@ -175,18 +175,8 @@ public class Deobfuscation {
return null; return null;
} }
public String deobfuscateName(String s, boolean firstUppercase, String usageType, HashMap<String, String> namesMap, RenameType renameType, Map<String, String> selected) { public static boolean isValidName(String s){
boolean isValid = true; boolean isValid = true;
if (usageType == null) {
usageType = "name";
}
if (selected != null) {
if (selected.containsKey(s)) {
return selected.get(s);
}
}
if (Action.isReservedWord(s)) { if (Action.isReservedWord(s)) {
isValid = false; isValid = false;
} }
@@ -206,6 +196,22 @@ public class Deobfuscation {
isValid = false; isValid = false;
} }
} }
return isValid;
}
public String deobfuscateName(String s, boolean firstUppercase, String usageType, HashMap<String, String> namesMap, RenameType renameType, Map<String, String> selected) {
boolean isValid = true;
if (usageType == null) {
usageType = "name";
}
if (selected != null) {
if (selected.containsKey(s)) {
return selected.get(s);
}
}
isValid = isValidName(s);
if (!isValid) { if (!isValid) {
if (namesMap.containsKey(s)) { if (namesMap.containsKey(s)) {
return namesMap.get(s); return namesMap.get(s);
src/com/jpexs/decompiler/flash/action/model/GetMemberActionItem.java
+106 -109
View File
@@ -1,109 +1,106 @@
/* /*
* Copyright (C) 2010-2014 JPEXS * Copyright (C) 2010-2014 JPEXS
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.jpexs.decompiler.flash.action.model; package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.Action;
import com.jpexs.decompiler.flash.action.swf5.ActionGetMember; import com.jpexs.decompiler.flash.action.Deobfuscation;
import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.flash.action.swf5.ActionGetMember;
import com.jpexs.decompiler.graph.CompilationException; import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItemPos; import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList; import com.jpexs.decompiler.graph.model.LocalData;
import java.util.List; import java.util.ArrayList;
import java.util.List;
public class GetMemberActionItem extends ActionItem {
public class GetMemberActionItem extends ActionItem {
public GraphTargetItem object;
public GraphTargetItem memberName; public GraphTargetItem object;
public GraphTargetItem memberName;
@Override
public List<GraphTargetItem> getAllSubItems() { @Override
List<GraphTargetItem> ret = new ArrayList<>(); public List<GraphTargetItem> getAllSubItems() {
ret.add(object); List<GraphTargetItem> ret = new ArrayList<>();
return ret; ret.add(object);
} return ret;
}
public GetMemberActionItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem memberName) {
super(instruction, PRECEDENCE_PRIMARY); public GetMemberActionItem(GraphSourceItem instruction, GraphTargetItem object, GraphTargetItem memberName) {
this.object = object; super(instruction, PRECEDENCE_PRIMARY);
this.memberName = memberName; this.object = object;
} this.memberName = memberName;
}
@Override
public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { @Override
object.toString(writer, localData); public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
if ((memberName instanceof DirectValueActionItem) && (((DirectValueActionItem) memberName).value instanceof String)) { object.toString(writer, localData);
String memNameStr = (String) ((DirectValueActionItem) memberName).value; if((!(memberName instanceof DirectValueActionItem)) || (!((DirectValueActionItem)memberName).isString()) ||(!Deobfuscation.isValidName(((DirectValueActionItem)memberName).toStringNoQuotes(localData)))){
if (!Action.isReservedWord(memNameStr)) { writer.append("[");
writer.append("."); memberName.toString(writer, localData);
return stripQuotes(memberName, localData, writer); return writer.append("]");
} }
} writer.append(".");
writer.append("["); return stripQuotes(memberName, localData, writer);
memberName.toString(writer, localData); }
return writer.append("]");
@Override
} public List<GraphSourceItemPos> getNeededSources() {
List<GraphSourceItemPos> ret = super.getNeededSources();
@Override ret.addAll(object.getNeededSources());
public List<GraphSourceItemPos> getNeededSources() { ret.addAll(memberName.getNeededSources());
List<GraphSourceItemPos> ret = super.getNeededSources(); return ret;
ret.addAll(object.getNeededSources()); }
ret.addAll(memberName.getNeededSources());
return ret; @Override
} public int hashCode() {
int hash = 5;
@Override hash = 47 * hash + (this.object != null ? this.object.hashCode() : 0);
public int hashCode() { hash = 47 * hash + (this.memberName != null ? this.memberName.hashCode() : 0);
int hash = 5; return hash;
hash = 47 * hash + (this.object != null ? this.object.hashCode() : 0); }
hash = 47 * hash + (this.memberName != null ? this.memberName.hashCode() : 0);
return hash; @Override
} public boolean equals(Object obj) {
if (obj == null) {
@Override return false;
public boolean equals(Object obj) { }
if (obj == null) { if (getClass() != obj.getClass()) {
return false; return false;
} }
if (getClass() != obj.getClass()) { final GetMemberActionItem other = (GetMemberActionItem) obj;
return false; if (this.object != other.object && (this.object == null || !this.object.equals(other.object))) {
} return false;
final GetMemberActionItem other = (GetMemberActionItem) obj; }
if (this.object != other.object && (this.object == null || !this.object.equals(other.object))) { if (this.memberName != other.memberName && (this.memberName == null || !this.memberName.equals(other.memberName))) {
return false; return false;
} }
if (this.memberName != other.memberName && (this.memberName == null || !this.memberName.equals(other.memberName))) { return true;
return false; }
}
return true; @Override
} public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
return toSourceMerge(localData, generator, object, memberName, new ActionGetMember());
@Override }
public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
return toSourceMerge(localData, generator, object, memberName, new ActionGetMember()); @Override
} public boolean hasReturnValue() {
return true;
@Override }
public boolean hasReturnValue() { }
return true;
}
}
src/com/jpexs/decompiler/flash/action/model/GetVariableActionItem.java
+149 -143
View File
@@ -1,143 +1,149 @@
/* /*
* Copyright (C) 2010-2014 JPEXS * Copyright (C) 2010-2014 JPEXS
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.jpexs.decompiler.flash.action.model; package com.jpexs.decompiler.flash.action.model;
import com.jpexs.decompiler.flash.SourceGeneratorLocalData; import com.jpexs.decompiler.flash.SourceGeneratorLocalData;
import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable; import com.jpexs.decompiler.flash.action.Deobfuscation;
import com.jpexs.decompiler.flash.ecma.Undefined; import com.jpexs.decompiler.flash.action.swf4.ActionGetVariable;
import com.jpexs.decompiler.flash.helpers.GraphTextWriter; import com.jpexs.decompiler.flash.ecma.Undefined;
import com.jpexs.decompiler.graph.CompilationException; import com.jpexs.decompiler.flash.helpers.GraphTextWriter;
import com.jpexs.decompiler.graph.GraphSourceItem; import com.jpexs.decompiler.graph.CompilationException;
import com.jpexs.decompiler.graph.GraphSourceItemPos; import com.jpexs.decompiler.graph.GraphSourceItem;
import com.jpexs.decompiler.graph.GraphTargetItem; import com.jpexs.decompiler.graph.GraphSourceItemPos;
import com.jpexs.decompiler.graph.SourceGenerator; import com.jpexs.decompiler.graph.GraphTargetItem;
import com.jpexs.decompiler.graph.model.LocalData; import com.jpexs.decompiler.graph.SourceGenerator;
import java.util.ArrayList; import com.jpexs.decompiler.graph.model.LocalData;
import java.util.List; import java.util.ArrayList;
import java.util.Set; import java.util.List;
import java.util.Set;
public class GetVariableActionItem extends ActionItem {
public class GetVariableActionItem extends ActionItem {
public GraphTargetItem name;
private GraphTargetItem computedValue; public GraphTargetItem name;
private Object computedResult; private GraphTargetItem computedValue;
private boolean computedCompiletime = false; private Object computedResult;
private boolean computedVariableComputed = false; private boolean computedCompiletime = false;
private boolean computedVariableComputed = false;
@Override
public List<GraphTargetItem> getAllSubItems() { @Override
List<GraphTargetItem> ret = new ArrayList<>(); public List<GraphTargetItem> getAllSubItems() {
ret.add(name); List<GraphTargetItem> ret = new ArrayList<>();
return ret; ret.add(name);
} return ret;
}
public GetVariableActionItem(GraphSourceItem instruction, GraphTargetItem value) {
super(instruction, PRECEDENCE_PRIMARY); public GetVariableActionItem(GraphSourceItem instruction, GraphTargetItem value) {
this.name = value; super(instruction, PRECEDENCE_PRIMARY);
} this.name = value;
}
@Override
public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException { @Override
return stripQuotes(name, localData, writer); public GraphTextWriter appendTo(GraphTextWriter writer, LocalData localData) throws InterruptedException {
} if((!(name instanceof DirectValueActionItem)) || (!((DirectValueActionItem)name).isString()) ||(!Deobfuscation.isValidName(((DirectValueActionItem)name).toStringNoQuotes(localData)))){
writer.append("eval(");
@Override name.appendTo(writer, localData);
public List<GraphSourceItemPos> getNeededSources() { return writer.append(")");
List<GraphSourceItemPos> ret = super.getNeededSources(); }
ret.addAll(name.getNeededSources()); return stripQuotes(name, localData, writer);
return ret; }
}
@Override
@Override public List<GraphSourceItemPos> getNeededSources() {
public boolean isVariableComputed() { List<GraphSourceItemPos> ret = super.getNeededSources();
return true; ret.addAll(name.getNeededSources());
} return ret;
}
@Override
public boolean isCompileTime(Set<GraphTargetItem> dependencies) { @Override
if (computedValue == null) { public boolean isVariableComputed() {
return false; return true;
} }
return computedCompiletime;
} @Override
public boolean isCompileTime(Set<GraphTargetItem> dependencies) {
@Override if (computedValue == null) {
public Object getResult() { return false;
if (computedValue == null) { }
return new Undefined(); return computedCompiletime;
} }
return computedResult;
} @Override
public Object getResult() {
public void setComputedValue(GraphTargetItem computedValue) { if (computedValue == null) {
this.computedValue = computedValue; return new Undefined();
if (computedValue != null) { }
computedCompiletime = computedValue.isCompileTime(); return computedResult;
if (computedCompiletime) { }
computedResult = computedValue.getResult();
} public void setComputedValue(GraphTargetItem computedValue) {
computedVariableComputed = computedValue.isVariableComputed(); this.computedValue = computedValue;
} if (computedValue != null) {
} computedCompiletime = computedValue.isCompileTime();
if (computedCompiletime) {
@Override computedResult = computedValue.getResult();
public int hashCode() { }
int hash = 3; computedVariableComputed = computedValue.isVariableComputed();
hash = 13 * hash + (this.name != null ? this.name.hashCode() : 0); }
return hash; }
}
@Override
@Override public int hashCode() {
public boolean equals(Object obj) { int hash = 3;
if (obj == null) { hash = 13 * hash + (this.name != null ? this.name.hashCode() : 0);
return false; return hash;
} }
if (getClass() != obj.getClass()) {
return false; @Override
} public boolean equals(Object obj) {
final GetVariableActionItem other = (GetVariableActionItem) obj; if (obj == null) {
if (this.name != other.name && (this.name == null || !this.name.equals(other.name))) { return false;
return false; }
} if (getClass() != obj.getClass()) {
return true; return false;
} }
final GetVariableActionItem other = (GetVariableActionItem) obj;
@Override if (this.name != other.name && (this.name == null || !this.name.equals(other.name))) {
public boolean valueEquals(GraphTargetItem obj) { return false;
if (obj == null) { }
return false; return true;
} }
if (getClass() != obj.getClass()) {
return false; @Override
} public boolean valueEquals(GraphTargetItem obj) {
final GetVariableActionItem other = (GetVariableActionItem) obj; if (obj == null) {
if (this.name != other.name && (this.name == null || !this.name.valueEquals(other.name))) { return false;
return false; }
} if (getClass() != obj.getClass()) {
return true; return false;
} }
final GetVariableActionItem other = (GetVariableActionItem) obj;
@Override if (this.name != other.name && (this.name == null || !this.name.valueEquals(other.name))) {
public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException { return false;
return toSourceMerge(localData, generator, name, new ActionGetVariable()); }
} return true;
}
@Override
public boolean hasReturnValue() { @Override
return true; public List<GraphSourceItem> toSource(SourceGeneratorLocalData localData, SourceGenerator generator) throws CompilationException {
} return toSourceMerge(localData, generator, name, new ActionGetVariable());
} }
@Override
public boolean hasReturnValue() {
return true;
}
}