From a0c27a69019f890e4891898c1693ffb720838512 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Thu, 28 Apr 2022 15:25:46 +0200 Subject: [PATCH 1/8] Add JarReader --- .../net/fabricmc/mappingio/MappingReader.java | 11 +- .../fabricmc/mappingio/format/JarReader.java | 170 ++++++++++++++++++ .../mappingio/format/MappingFormat.java | 3 +- 3 files changed, 181 insertions(+), 3 deletions(-) create mode 100644 src/main/java/net/fabricmc/mappingio/format/JarReader.java diff --git a/src/main/java/net/fabricmc/mappingio/MappingReader.java b/src/main/java/net/fabricmc/mappingio/MappingReader.java index 93b5f22d..d1bfca32 100644 --- a/src/main/java/net/fabricmc/mappingio/MappingReader.java +++ b/src/main/java/net/fabricmc/mappingio/MappingReader.java @@ -27,6 +27,7 @@ import java.util.List; import net.fabricmc.mappingio.format.EnigmaReader; +import net.fabricmc.mappingio.format.JarReader; import net.fabricmc.mappingio.format.MappingFormat; import net.fabricmc.mappingio.format.ProGuardReader; import net.fabricmc.mappingio.format.SrgReader; @@ -69,6 +70,8 @@ public static MappingFormat detectFormat(Reader reader) throws IOException { case "MD:": case "FD:": return MappingFormat.SRG; + case "PK\u0003": + return MappingFormat.JAR; } String headerStr = String.valueOf(buffer, 0, pos); @@ -141,8 +144,12 @@ public static void read(Path file, MappingFormat format, MappingVisitor visitor) } if (format.hasSingleFile()) { - try (Reader reader = Files.newBufferedReader(file)) { - read(reader, format, visitor); + if (format == MappingFormat.JAR) { + JarReader.read(file, visitor); + } else { + try (Reader reader = Files.newBufferedReader(file)) { + read(reader, format, visitor); + } } } else { switch (format) { diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java new file mode 100644 index 00000000..1e8a3ead --- /dev/null +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2021 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.mappingio.format; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.ByteBuffer; +import java.nio.channels.SeekableByteChannel; +import java.nio.file.FileSystem; +import java.nio.file.FileSystemAlreadyExistsException; +import java.nio.file.FileSystems; +import java.nio.file.FileVisitResult; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.SimpleFileVisitor; +import java.nio.file.attribute.BasicFileAttributes; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Locale; + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.FieldVisitor; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; + +import net.fabricmc.mappingio.MappingVisitor; + +public class JarReader { + public static void read(Path path, MappingVisitor mappingVisitor) throws IOException { + mappingVisitor.visitNamespaces("jar", new ArrayList()); + processFile(path, null, new AnalyzingVisitor(mappingVisitor)); + } + + private static final class DirVisitor extends SimpleFileVisitor { + DirVisitor(AnalyzingVisitor visitor) { + this.visitor = visitor; + } + + @Override + public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { + buffer = processFile(file, buffer, visitor); + + return FileVisitResult.CONTINUE; + } + + private final AnalyzingVisitor visitor; + ByteBuffer buffer; + } + + @SuppressWarnings("resource") + private static ByteBuffer processFile(Path file, ByteBuffer buffer, AnalyzingVisitor visitor) throws IOException { + String fileName = file.getFileName().toString().toLowerCase(Locale.ENGLISH); + + if (fileName.endsWith(".jar")) { + URI uri = file.toUri(); + + try { + uri = new URI("jar:".concat(uri.getScheme()), uri.getHost(), uri.getPath(), uri.getFragment()); + } catch (URISyntaxException e) { + throw new IOException(e); + } + + FileSystem fs = null; + boolean closeFs = false; + + try { + try { + fs = FileSystems.newFileSystem(uri, Collections.emptyMap()); + closeFs = true; + } catch (FileSystemAlreadyExistsException e) { + fs = FileSystems.getFileSystem(uri); + } + + DirVisitor dirVisitor = new DirVisitor(visitor); + + for (Path rootDir : fs.getRootDirectories()) { + Files.walkFileTree(rootDir, dirVisitor); + } + + buffer = dirVisitor.buffer; + } finally { + if (closeFs) fs.close(); + } + } else if (fileName.endsWith(".class")) { + try (SeekableByteChannel channel = Files.newByteChannel(file)) { + if (buffer == null) buffer = ByteBuffer.allocate((int) Math.min(channel.size() + 1, 100_000_000)); + + while (channel.read(buffer) >= 0) { + if (!buffer.hasRemaining()) { + ByteBuffer newBuffer = ByteBuffer.allocate(buffer.capacity() * 2); + buffer.flip(); + newBuffer.put(buffer); + buffer = newBuffer; + } + } + } + + buffer.flip(); + processClass(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining(), visitor); + buffer.clear(); + } + + return buffer; + } + + private static void processClass(byte[] classBytes, int offset, int length, AnalyzingVisitor visitor) { + ClassReader reader = new ClassReader(classBytes, offset, length); + reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG); + } + + private static final class AnalyzingVisitor extends ClassVisitor { + AnalyzingVisitor(MappingVisitor mappingVisitor) { + super(Integer.getInteger("mappingIo.asmApiVersion", Opcodes.ASM9)); + + this.mappingVisitor = mappingVisitor; + } + + @Override + public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { + try { + mappingVisitor.visitClass(name); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Override + public FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) { + try { + mappingVisitor.visitField(name, descriptor); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return null; + } + + @Override + public MethodVisitor visitMethod(int access, String name, String descriptor, String signature, String[] exceptions) { + try { + mappingVisitor.visitMethod(name, descriptor); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return null; + } + + private final MappingVisitor mappingVisitor; + } +} diff --git a/src/main/java/net/fabricmc/mappingio/format/MappingFormat.java b/src/main/java/net/fabricmc/mappingio/format/MappingFormat.java index ce8ae97f..877e3342 100644 --- a/src/main/java/net/fabricmc/mappingio/format/MappingFormat.java +++ b/src/main/java/net/fabricmc/mappingio/format/MappingFormat.java @@ -24,7 +24,8 @@ public enum MappingFormat { SRG("SRG", "srg", false, false, false, false, false), TSRG("TSRG", "tsrg", false, false, false, false, false), TSRG2("TSRG2", "tsrg", true, false, false, true, false), - PROGUARD("ProGuard", "map", false, true, false, false, false); + PROGUARD("ProGuard", "map", false, true, false, false, false), + JAR("JAR", "jar", false, true, false, true, true); MappingFormat(String name, String fileExt, boolean hasNamespaces, boolean hasFieldDescriptors, From 9f8341a0d036d7da1f11603d716a74dfc99aac31 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Thu, 28 Apr 2022 18:50:25 +0200 Subject: [PATCH 2/8] Skip classes in META-INF and doc-files folders --- .../net/fabricmc/mappingio/format/JarReader.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java index 1e8a3ead..f1477a73 100644 --- a/src/main/java/net/fabricmc/mappingio/format/JarReader.java +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -98,6 +98,18 @@ private static ByteBuffer processFile(Path file, ByteBuffer buffer, AnalyzingVis if (closeFs) fs.close(); } } else if (fileName.endsWith(".class")) { + Path parent = file.getParent(); + + while (parent != file.getRoot()) { + String parentDir = parent.getName(parent.getNameCount() - 1).toString(); + + if (parentDir.equals("META-INF") || parentDir.equals("doc-files")) { + return buffer; + } + + parent = parent.getParent(); + } + try (SeekableByteChannel channel = Files.newByteChannel(file)) { if (buffer == null) buffer = ByteBuffer.allocate((int) Math.min(channel.size() + 1, 100_000_000)); From 4f0342bfce742f946e5c2d0e1e11462c3807c898 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Fri, 29 Apr 2022 13:25:33 +0200 Subject: [PATCH 3/8] Skip classes in folders with names containing "-" --- src/main/java/net/fabricmc/mappingio/format/JarReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java index f1477a73..1a90da32 100644 --- a/src/main/java/net/fabricmc/mappingio/format/JarReader.java +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -103,7 +103,7 @@ private static ByteBuffer processFile(Path file, ByteBuffer buffer, AnalyzingVis while (parent != file.getRoot()) { String parentDir = parent.getName(parent.getNameCount() - 1).toString(); - if (parentDir.equals("META-INF") || parentDir.equals("doc-files")) { + if (parentDir.contains("-")) { return buffer; } From b2e7b0ef8260a2ac5facef6901aa7bfa244b6eae Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Fri, 29 Apr 2022 13:34:40 +0200 Subject: [PATCH 4/8] Skip jars in doc-files folders --- .../net/fabricmc/mappingio/format/JarReader.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java index 1a90da32..08438dd2 100644 --- a/src/main/java/net/fabricmc/mappingio/format/JarReader.java +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -68,6 +68,18 @@ private static ByteBuffer processFile(Path file, ByteBuffer buffer, AnalyzingVis String fileName = file.getFileName().toString().toLowerCase(Locale.ENGLISH); if (fileName.endsWith(".jar")) { + Path parent = file.getParent(); + + while (parent != file.getRoot()) { + String parentDir = parent.getName(parent.getNameCount() - 1).toString(); + + if (parentDir.equals("doc-files")) { + return buffer; + } + + parent = parent.getParent(); + } + URI uri = file.toUri(); try { From 6b52aed5ffbd1034706425b7b158d79b6337df02 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Wed, 11 May 2022 22:29:17 +0200 Subject: [PATCH 5/8] Use ZipFile in JarReader --- .../fabricmc/mappingio/format/JarReader.java | 127 +++--------------- 1 file changed, 16 insertions(+), 111 deletions(-) diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java index 08438dd2..8de7c2f0 100644 --- a/src/main/java/net/fabricmc/mappingio/format/JarReader.java +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -17,21 +17,12 @@ package net.fabricmc.mappingio.format; import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.ByteBuffer; -import java.nio.channels.SeekableByteChannel; -import java.nio.file.FileSystem; -import java.nio.file.FileSystemAlreadyExistsException; -import java.nio.file.FileSystems; -import java.nio.file.FileVisitResult; -import java.nio.file.Files; +import java.io.InputStream; import java.nio.file.Path; -import java.nio.file.SimpleFileVisitor; -import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; -import java.util.Collections; -import java.util.Locale; +import java.util.Enumeration; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -43,109 +34,26 @@ public class JarReader { public static void read(Path path, MappingVisitor mappingVisitor) throws IOException { - mappingVisitor.visitNamespaces("jar", new ArrayList()); - processFile(path, null, new AnalyzingVisitor(mappingVisitor)); - } - - private static final class DirVisitor extends SimpleFileVisitor { - DirVisitor(AnalyzingVisitor visitor) { - this.visitor = visitor; - } - - @Override - public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { - buffer = processFile(file, buffer, visitor); - - return FileVisitResult.CONTINUE; - } - - private final AnalyzingVisitor visitor; - ByteBuffer buffer; - } - - @SuppressWarnings("resource") - private static ByteBuffer processFile(Path file, ByteBuffer buffer, AnalyzingVisitor visitor) throws IOException { - String fileName = file.getFileName().toString().toLowerCase(Locale.ENGLISH); - - if (fileName.endsWith(".jar")) { - Path parent = file.getParent(); - - while (parent != file.getRoot()) { - String parentDir = parent.getName(parent.getNameCount() - 1).toString(); - - if (parentDir.equals("doc-files")) { - return buffer; - } + AnalyzingVisitor analyzingVisitor = new AnalyzingVisitor(mappingVisitor); - parent = parent.getParent(); - } - - URI uri = file.toUri(); - - try { - uri = new URI("jar:".concat(uri.getScheme()), uri.getHost(), uri.getPath(), uri.getFragment()); - } catch (URISyntaxException e) { - throw new IOException(e); - } - - FileSystem fs = null; - boolean closeFs = false; - - try { - try { - fs = FileSystems.newFileSystem(uri, Collections.emptyMap()); - closeFs = true; - } catch (FileSystemAlreadyExistsException e) { - fs = FileSystems.getFileSystem(uri); - } - - DirVisitor dirVisitor = new DirVisitor(visitor); - - for (Path rootDir : fs.getRootDirectories()) { - Files.walkFileTree(rootDir, dirVisitor); - } - - buffer = dirVisitor.buffer; - } finally { - if (closeFs) fs.close(); - } - } else if (fileName.endsWith(".class")) { - Path parent = file.getParent(); + ZipFile zipFile = new ZipFile(path.toFile()); + Enumeration entries = zipFile.entries(); - while (parent != file.getRoot()) { - String parentDir = parent.getName(parent.getNameCount() - 1).toString(); + mappingVisitor.visitNamespaces("jar", new ArrayList()); - if (parentDir.contains("-")) { - return buffer; - } + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + String entryName = entry.getName(); - parent = parent.getParent(); + if (entryName.endsWith(".class") && !entryName.contains("-")) { + processClass(zipFile.getInputStream(entry), analyzingVisitor); } - - try (SeekableByteChannel channel = Files.newByteChannel(file)) { - if (buffer == null) buffer = ByteBuffer.allocate((int) Math.min(channel.size() + 1, 100_000_000)); - - while (channel.read(buffer) >= 0) { - if (!buffer.hasRemaining()) { - ByteBuffer newBuffer = ByteBuffer.allocate(buffer.capacity() * 2); - buffer.flip(); - newBuffer.put(buffer); - buffer = newBuffer; - } - } - } - - buffer.flip(); - processClass(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining(), visitor); - buffer.clear(); } - - return buffer; } - private static void processClass(byte[] classBytes, int offset, int length, AnalyzingVisitor visitor) { - ClassReader reader = new ClassReader(classBytes, offset, length); - reader.accept(visitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG); + private static void processClass(InputStream inputStream, AnalyzingVisitor analyzingVisitor) throws IOException { + ClassReader reader = new ClassReader(inputStream); + reader.accept(analyzingVisitor, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG); } private static final class AnalyzingVisitor extends ClassVisitor { @@ -160,7 +68,6 @@ public void visit(int version, int access, String name, String signature, String try { mappingVisitor.visitClass(name); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } } @@ -170,7 +77,6 @@ public FieldVisitor visitField(int access, String name, String descriptor, Strin try { mappingVisitor.visitField(name, descriptor); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } @@ -182,7 +88,6 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str try { mappingVisitor.visitMethod(name, descriptor); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } From c095c312fbeb45b1707526eec6a8f965ad984287 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Wed, 11 May 2022 22:29:48 +0200 Subject: [PATCH 6/8] Read Windows executables with JarReader --- src/main/java/net/fabricmc/mappingio/MappingReader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/mappingio/MappingReader.java b/src/main/java/net/fabricmc/mappingio/MappingReader.java index d1bfca32..c76e20da 100644 --- a/src/main/java/net/fabricmc/mappingio/MappingReader.java +++ b/src/main/java/net/fabricmc/mappingio/MappingReader.java @@ -70,7 +70,8 @@ public static MappingFormat detectFormat(Reader reader) throws IOException { case "MD:": case "FD:": return MappingFormat.SRG; - case "PK\u0003": + case "PK\u0003": // zip/jar + case "MZ\ufffd": // windows exe return MappingFormat.JAR; } From f6536fa94a23ad88bbbb73ae9851285db13bd670 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Wed, 11 May 2022 23:32:55 +0200 Subject: [PATCH 7/8] Allow dashes in filenames in JarReader --- src/main/java/net/fabricmc/mappingio/format/JarReader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java index 8de7c2f0..4ffc5747 100644 --- a/src/main/java/net/fabricmc/mappingio/format/JarReader.java +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -44,8 +44,9 @@ public static void read(Path path, MappingVisitor mappingVisitor) throws IOExcep while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); String entryName = entry.getName(); + String parentName = Path.of(entryName).getParent().toString(); - if (entryName.endsWith(".class") && !entryName.contains("-")) { + if (entryName.endsWith(".class") && !parentName.contains("-")) { processClass(zipFile.getInputStream(entry), analyzingVisitor); } } From 41a64841bccba2fa4e481350dc78e44b7c205f06 Mon Sep 17 00:00:00 2001 From: jackassmc <84429870+jackassmc@users.noreply.github.com> Date: Thu, 12 May 2022 00:03:29 +0200 Subject: [PATCH 8/8] Fix parent path --- src/main/java/net/fabricmc/mappingio/format/JarReader.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/mappingio/format/JarReader.java b/src/main/java/net/fabricmc/mappingio/format/JarReader.java index 4ffc5747..3d2882f4 100644 --- a/src/main/java/net/fabricmc/mappingio/format/JarReader.java +++ b/src/main/java/net/fabricmc/mappingio/format/JarReader.java @@ -19,6 +19,7 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Enumeration; import java.util.zip.ZipEntry; @@ -44,7 +45,7 @@ public static void read(Path path, MappingVisitor mappingVisitor) throws IOExcep while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); String entryName = entry.getName(); - String parentName = Path.of(entryName).getParent().toString(); + String parentName = Paths.get("/", entryName).getParent().toString(); if (entryName.endsWith(".class") && !parentName.contains("-")) { processClass(zipFile.getInputStream(entry), analyzingVisitor);