Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement jar scanner to check files for Fractureiser malware #49

Merged
merged 1 commit into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'com.gradle.plugin-publish' version '1.1.0'
}

version = '2.7.5'
version = '2.8.0'
group = 'com.modrinth.minotaur'
archivesBaseName = 'Minotaur'
description = 'Modrinth plugin for publishing builds to the website!'
Expand All @@ -21,6 +21,8 @@ dependencies {
compileOnly gradleApi()
compileOnly group: 'org.jetbrains', name: 'annotations', version: '+'
api group: 'dev.masecla', name: 'Modrinth4J', version: '2.1.0'
api group: 'org.ow2.asm', name: 'asm', version: '9.5'
api group: 'org.ow2.asm', name: 'asm-tree', version: '9.5'
compileOnly group: 'io.papermc.paperweight', name: 'paperweight-userdev', version: '1.5.2'
}

Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/modrinth/minotaur/TaskModrinthUpload.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.google.gson.GsonBuilder;
import com.modrinth.minotaur.dependencies.Dependency;
import com.modrinth.minotaur.responses.ResponseUpload;
import com.modrinth.minotaur.scanner.JarInfectionScanner;
import io.papermc.paperweight.userdev.PaperweightUserExtension;
import masecla.modrinth4j.endpoints.version.CreateVersion.CreateVersionRequest;
import masecla.modrinth4j.main.ModrinthAPI;
Expand All @@ -22,7 +23,10 @@

import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.zip.ZipException;
import java.util.zip.ZipFile;

import static com.modrinth.minotaur.Util.*;

Expand Down Expand Up @@ -195,6 +199,17 @@ && getProject().getExtensions().findByName("loom") != null) {
files.add(resolvedFile);
});

// Scan detected files for presence of the Fractureiser malware
files.forEach(file -> {
try (ZipFile zipFile = new ZipFile(file)) {
JarInfectionScanner.scan(getLogger(), zipFile);
} catch (ZipException e) {
getLogger().warn("Failed to scan {}. Not a valid zip or jar file", file.getName(), e);
} catch (IOException e) {
throw new GradleException(String.format("Failed to scan %s", file.getName()), e);
}
});

// Start construction of the actual request!
CreateVersionRequest data = CreateVersionRequest.builder()
.projectId(id)
Expand Down
177 changes: 177 additions & 0 deletions src/main/java/com/modrinth/minotaur/scanner/JarInfectionScanner.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
package com.modrinth.minotaur.scanner;

import org.gradle.api.GradleException;
import org.gradle.api.logging.Logger;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.tree.*;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.ZipFile;

import static org.objectweb.asm.Opcodes.*;

/**
* Jar Scanner to scan for the Fractureiser malware
* Contains code copied from <a href="https://github.com/MCRcortex/nekodetector/blob/master/src/main/java/me/cortex/jarscanner/Detector.java">...</a>
* with permission
*/
public class JarInfectionScanner {

public static void scan(Logger logger, ZipFile file) {
try {
boolean matches = file.stream()
.filter(entry -> entry.getName().endsWith(".class"))
.anyMatch(entry -> {
try {
return scanClass(readAllBytes(file.getInputStream(entry)));
} catch (IOException e) {
throw new RuntimeException(e);
}
});
try {
file.close();
} catch (IOException e) {
e.printStackTrace();
}
if (!matches)
return;
throw new GradleException(String.format("!!!! %s is infected with Fractureiser", file.getName()));
} catch (Exception e) {
logger.error("Failed to scan {}", file.getName(), e);
}

logger.info("Fractureiser not detected in {}", file.getName());
}

private static final AbstractInsnNode[] SIG1 = new AbstractInsnNode[] {
new TypeInsnNode(NEW, "java/lang/String"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new TypeInsnNode(NEW, "java/lang/String"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new MethodInsnNode(INVOKESTATIC, "java/lang/Class", "forName", "(Ljava/lang/String;)Ljava/lang/Class;"),
new MethodInsnNode(INVOKEVIRTUAL, "java/lang/Class", "getConstructor", "([Ljava/lang/Class;)Ljava/lang/reflect/Constructor;"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new MethodInsnNode(INVOKESPECIAL, "java/net/URL", "<init>", "(Ljava/lang/String;Ljava/lang/String;ILjava/lang/String;)V"),
new MethodInsnNode(INVOKEVIRTUAL, "java/lang/reflect/Constructor", "newInstance", "([Ljava/lang/Object;)Ljava/lang/Object;"),
new MethodInsnNode(INVOKESTATIC, "java/lang/Class", "forName", "(Ljava/lang/String;ZLjava/lang/ClassLoader;)Ljava/lang/Class;"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new MethodInsnNode(INVOKEVIRTUAL, "java/lang/Class", "getMethod", "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;"),
new MethodInsnNode(INVOKEVIRTUAL, "java/lang/reflect/Method", "invoke", "(Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;"),
};

private static final AbstractInsnNode[] SIG2 = new AbstractInsnNode[] {
new MethodInsnNode(INVOKESTATIC, "java/lang/Runtime", "getRuntime", "()Ljava/lang/Runtime;"),
new MethodInsnNode(INVOKESTATIC, "java/util/Base64", "getDecoder", "()Ljava/util/Base64$Decoder;"),
new MethodInsnNode(INVOKEVIRTUAL, "java/lang/String", "INVOKEVIRTUAL", "(Ljava/lang/String;)Ljava/lang/String;"),//TODO:FIXME: this might not be in all of them
new MethodInsnNode(INVOKEVIRTUAL, "java/util/Base64$Decoder", "decode", "(Ljava/lang/String;)[B"),
new MethodInsnNode(INVOKESPECIAL, "java/lang/String", "<init>", "([B)V"),
new MethodInsnNode(INVOKEVIRTUAL, "java/io/File", "getPath", "()Ljava/lang/String;"),
new MethodInsnNode(INVOKEVIRTUAL, "java/lang/Runtime", "exec", "([Ljava/lang/String;)Ljava/lang/Process;"),
};

private static boolean same(AbstractInsnNode a, AbstractInsnNode b) {
if (a instanceof TypeInsnNode) {
return ((TypeInsnNode)a).desc.equals(((TypeInsnNode)b).desc);
}
if (a instanceof MethodInsnNode) {
return ((MethodInsnNode)a).owner.equals(((MethodInsnNode)b).owner) && ((MethodInsnNode)a).desc.equals(((MethodInsnNode)b).desc);
}
if (a instanceof InsnNode) {
return true;
}
throw new IllegalArgumentException("TYPE NOT ADDED");
}

private static boolean scanClass(byte[] clazz) {
ClassReader reader = new ClassReader(clazz);
ClassNode node = new ClassNode();
try {
reader.accept(node, 0);
} catch (Exception e) {
return false;//Yes this is very hacky but should never happen with valid clasees
}
for (MethodNode method : node.methods) {
{
//Method 1, this is a hard detect, if it matches this it is 100% chance infected
boolean match = true;
int j = 0;
for (int i = 0; i < method.instructions.size() && j < SIG1.length; i++) {
if (method.instructions.get(i).getOpcode() == -1) {
continue;
}
if (method.instructions.get(i).getOpcode() == SIG1[j].getOpcode()) {
if (!same(method.instructions.get(i), SIG1[j++])) {
match = false;
break;
}
}
}
if (j != SIG1.length) {
match = false;
}
if (match) {
return true;
}
}

{
//Method 2, this is a near hard detect, if it matches this it is 95% chance infected
boolean match = false;
outer:
for (int q = 0; q < method.instructions.size(); q++) {
int j = 0;
for (int i = q; i < method.instructions.size() && j < SIG2.length; i++) {
if (method.instructions.get(i).getOpcode() != SIG2[j].getOpcode()) {
continue;
}

if (method.instructions.get(i).getOpcode() == SIG2[j].getOpcode()) {
if (!same(method.instructions.get(i), SIG2[j++])) {
continue outer;
}
}
}
if (j == SIG2.length) {
match = true;
break;
}
}
if (match) {
return true;
}
}
}
return false;
}

// Java 8 equivalent of InputStream.readAllBytes()
private static byte[] readAllBytes(InputStream inputStream) throws IOException {
final int bufLen = 1024;
byte[] buf = new byte[bufLen];
int readLen;
IOException exception = null;

try {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();

while ((readLen = inputStream.read(buf, 0, bufLen)) != -1)
outputStream.write(buf, 0, readLen);

return outputStream.toByteArray();
} catch (IOException e) {
exception = e;
throw e;
} finally {
if (exception == null) inputStream.close();
else try {
inputStream.close();
} catch (IOException e) {
exception.addSuppressed(e);
}
}
}
}
Loading