Skip to content

Fix signers not propagated to class if present #1097

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.

Sign up for GitHub

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

Open
zomabies wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix signers not propagated to class if present #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
85 changes: 60 additions & 25 deletions src/main/java/net/fabricmc/loader/impl/launch/knot/KnotClassDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,18 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.security.CodeSigner;
import java.security.CodeSource;
import java.security.cert.Certificate;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.jar.Attributes;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.zip.CRC32;
import java.util.zip.ZipEntry;
Expand Down Expand Up @@ -69,16 +72,19 @@ final class KnotClassDelegate<T extends ClassLoader & ClassLoaderAccess> impleme
private static final boolean LOG_CLASS_LOAD_ERRORS = LOG_CLASS_LOAD || SystemProperties.isSet(SystemProperties.DEBUG_LOG_CLASS_LOAD_ERRORS);
private static final boolean LOG_TRANSFORM_ERRORS = SystemProperties.isSet(SystemProperties.DEBUG_LOG_TRANSFORM_ERRORS);
private static final boolean DISABLE_ISOLATION = SystemProperties.isSet(SystemProperties.DEBUG_DISABLE_CLASS_PATH_ISOLATION);
private static final boolean DISABLE_JAR_SIGNERS = SystemProperties.isSet(SystemProperties.DEBUG_DISABLE_JAR_SIGNERS);

static final class Metadata {
static final Metadata EMPTY = new Metadata(null, null);
static final Metadata EMPTY = new Metadata(null, null, false);

final Manifest manifest;
final CodeSource codeSource;
final boolean isManifestSigned;

Metadata(Manifest manifest, CodeSource codeSource) {
Metadata(Manifest manifest, CodeSource codeSource, boolean isManifestSigned) {
this.manifest = manifest;
this.codeSource = codeSource;
this.isManifestSigned = isManifestSigned;
}
}

Expand Down Expand Up @@ -189,7 +195,7 @@ public void setValidParentClassPath(Collection<Path> paths) {

@Override
public Manifest getManifest(Path codeSource) {
return getMetadata(LoaderUtil.normalizeExistingPath(codeSource)).manifest;
return getMetadata(LoaderUtil.normalizeExistingPath(codeSource), null).manifest;
}

@Override
Expand Down Expand Up @@ -373,14 +379,14 @@ private Metadata getMetadata(String name) {
URL url = classLoader.getResource(fileName);
if (url == null || !hasRegularCodeSource(url)) return Metadata.EMPTY;

return getMetadata(getCodeSource(url, fileName));
return getMetadata(getCodeSource(url, fileName), fileName);
}

private Metadata getMetadata(Path codeSource) {
return metadataCache.computeIfAbsent(codeSource, (Path path) -> {
private Metadata getMetadata(Path codeSource, String fileName) {
Metadata metadata = metadataCache.computeIfAbsent(codeSource, (Path path) -> {
Manifest manifest = null;
CodeSource cs = null;
Certificate[] certificates = null;
CodeSource cs;
boolean isManifestSigned = false;

try {
if (Files.isDirectory(path)) {
Expand All @@ -389,39 +395,68 @@ private Metadata getMetadata(Path codeSource) {
URLConnection connection = new URL("jar:" + path.toUri().toString() + "!/").openConnection();

if (connection instanceof JarURLConnection) {
manifest = ((JarURLConnection) connection).getManifest();
certificates = ((JarURLConnection) connection).getCertificates();
JarFile jarFile = ((JarURLConnection) connection).getJarFile();
manifest = jarFile.getManifest();

if (!DISABLE_JAR_SIGNERS && manifest != null) {
JarEntry jarEntry = jarFile.getJarEntry(JarFile.MANIFEST_NAME);
isManifestSigned = jarEntry.getCodeSigners() != null; // signed jar
}
}

if (manifest == null) {
try (FileSystemUtil.FileSystemDelegate jarFs = FileSystemUtil.getJarFileSystem(path, false)) {
manifest = ManifestUtil.readManifestFromBasePath(jarFs.get().getRootDirectories().iterator().next());
}
}

// TODO
/* JarEntry codeEntry = codeSourceJar.getJarEntry(filename);

if (codeEntry != null) {
cs = new CodeSource(codeSourceURL, codeEntry.getCodeSigners());
} */
}
} catch (IOException | FileSystemNotFoundException e) {
if (FabricLauncherBase.getLauncher().isDevelopment()) {
Log.warn(LogCategory.KNOT, "Failed to load manifest", e);
}
}

if (cs == null) {
try {
cs = new CodeSource(UrlUtil.asUrl(path), certificates);
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
try {
cs = new CodeSource(UrlUtil.asUrl(path), (CodeSigner[]) null);
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}

return new Metadata(manifest, cs);
return new Metadata(manifest, cs, isManifestSigned);
});

if (DISABLE_JAR_SIGNERS || !metadata.isManifestSigned) {
return metadata; // fast path for directory/unsigned jar
}

// obtain signers from filename
try {
boolean multiRelease = false;
Attributes attributes = metadata.manifest.getMainAttributes(); // manifest never null here

if (attributes != null) {
// handles multi-release jars
// fix file not found exception when loaded class is inside multi-release dir
multiRelease = "true".equalsIgnoreCase(attributes.getValue("Multi-Release"));
}

URLConnection connection = new URL("jar:" + codeSource.toUri().toString() + "!/" + (multiRelease ? "#runtime" : "")).openConnection();

if (connection instanceof JarURLConnection) {
JarFile jarFile = ((JarURLConnection) connection).getJarFile();

JarEntry jarEntry = jarFile.getJarEntry(fileName);
CodeSigner[] codeSigners = jarEntry.getCodeSigners();
CodeSource signedCodeSource = new CodeSource(metadata.codeSource.getLocation(), codeSigners);
return new Metadata(metadata.manifest, signedCodeSource, true);
}
} catch (IOException e) {
if (FabricLauncherBase.getLauncher().isDevelopment()) {
Log.warn(LogCategory.KNOT, "Failed to read JAR", e);
}
}

return metadata;
}

private byte[] getPostMixinClassByteArray(String name, boolean allowFromParent) {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/fabricmc/loader/impl/util/SystemProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public final class SystemProperties {
public static final String DEBUG_LOG_TRANSFORM_ERRORS = "fabric.debug.logTransformErrors";
// disables system class path isolation, allowing bogus lib accesses (too early, transient jars)
public static final String DEBUG_DISABLE_CLASS_PATH_ISOLATION = "fabric.debug.disableClassPathIsolation";
// disables signers from being available in ProtectionDomain/Class#getSigners for signed JARs
public static final String DEBUG_DISABLE_JAR_SIGNERS = "fabric.debug.disableJarSigners";
// disables mod load order shuffling to be the same in-dev as in production
public static final String DEBUG_DISABLE_MOD_SHUFFLE = "fabric.debug.disableModShuffle";
// workaround for bad load order dependencies
Expand Down