Merge pull request #13 from OpticFusion1/update

Changes
This commit is contained in:
Cats
2019-03-01 18:56:15 -05:00
committed by GitHub
9 changed files with 93 additions and 57 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>optic_fusion1</groupId>
<artifactId>MCAntiMalware</artifactId>
<version>3.6</version>
<version>3.7</version>
<packaging>jar</packaging>
<build>
<plugins>
@@ -32,12 +32,16 @@ public class DailyLootBox extends Check {
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (current.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
@@ -33,14 +33,19 @@ public class DirectLeaks extends Check {
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (current.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
} catch (IOException ex) {
Logger.getLogger(Minator.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -32,12 +32,16 @@ public class GreifingPlugin extends Check {
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (current.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
@@ -40,35 +40,42 @@ public class ItzPlugin extends Check {
@Override
public boolean process(String fileName, ZipFile zipFile) {
Enumeration zipEntries = zipFile.entries();
Enumeration<? extends ZipEntry> entries = zipFile.entries();
InputStream inputStream = null;
while (zipEntries.hasMoreElements()) {
ZipEntry currentZipEntry = (ZipEntry) zipEntries.nextElement();
while (entries.hasMoreElements()) {
try {
inputStream = zipFile.getInputStream(currentZipEntry);
} catch (IOException ex) {
Logger.getLogger(ItzPlugin.class.getName()).log(Level.SEVERE, null, ex);
}
if (currentZipEntry.getName().endsWith(".class")) {
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
inputStream.close();
} catch (IOException ex) {
Logger.getLogger(ItzPlugin.class.getName()).log(Level.SEVERE, null, ex);
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (getMain().shouldLogDebugMessages()) {
getMain().getLogger().debug("LSF: " + current.getName());
}
if (detect(inputStream)) {
inputStream.close();
return true;
}
if (current.getName().endsWith(".class")) {
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
} catch (IOException ex) {
Logger.getLogger(Minator.class.getName()).log(Level.SEVERE, null, ex);
}
}
if (inputStream != null) {
try {
inputStream.close();
} catch (IOException ex) {
Logger.getLogger(SkySneak.class.getName()).log(Level.SEVERE, null, ex);
Logger.getLogger(MoneroMiner.class.getName()).log(Level.SEVERE, null, ex);
}
}
return false;
@@ -44,6 +44,9 @@ public class LagSignFixer extends Check {
try {
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (getMain().shouldLogDebugMessages()) {
getMain().getLogger().debug("LSF: " + current.getName());
}
if (detect(inputStream)) {
inputStream.close();
return true;
@@ -34,12 +34,16 @@ public class Minator extends Check {
}
}
if (current.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
@@ -32,12 +32,16 @@ public class MoneroMiner extends Check {
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (current.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
@@ -47,14 +47,19 @@ public class Qlutch extends Check {
ZipEntry current = entries.nextElement();
inputStream = zipFile.getInputStream(current);
if (current.getName().endsWith(".class")) {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
try {
ClassReader reader = new ClassReader(inputStream);
ClassNode node = new ClassNode();
reader.accept(node, 0);
if (detect(node)) {
inputStream.close();
return true;
}
} catch (Exception e) {
continue;
}
}
inputStream.close();
} catch (IOException ex) {
Logger.getLogger(Minator.class.getName()).log(Level.SEVERE, null, ex);
}