Mirror von
https://github.com/PaperMC/Velocity.git
synchronisiert 2024-12-23 23:00:35 +01:00
Introduce velocity.natives-tmpdir property for properly handling noexec /tmp
Dieser Commit ist enthalten in:
Ursprung
d8dba8a96c
Commit
e06e2e4cf9
@ -12,6 +12,7 @@ import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
|
||||
public class Natives {
|
||||
@ -23,12 +24,12 @@ public class Natives {
|
||||
private static Runnable copyAndLoadNative(String path) {
|
||||
return () -> {
|
||||
try {
|
||||
Path tempFile = Files.createTempFile("native-", path.substring(path.lastIndexOf('.')));
|
||||
InputStream nativeLib = Natives.class.getResourceAsStream(path);
|
||||
if (nativeLib == null) {
|
||||
throw new IllegalStateException("Native library " + path + " not found.");
|
||||
}
|
||||
|
||||
Path tempFile = createTemporaryNativeFilename(path.substring(path.lastIndexOf('.')));
|
||||
Files.copy(nativeLib, tempFile, StandardCopyOption.REPLACE_EXISTING);
|
||||
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
|
||||
try {
|
||||
@ -49,6 +50,15 @@ public class Natives {
|
||||
};
|
||||
}
|
||||
|
||||
private static Path createTemporaryNativeFilename(String ext) throws IOException {
|
||||
String temporaryFolderPath = System.getProperty("velocity.natives-tmpdir");
|
||||
if (temporaryFolderPath != null) {
|
||||
return Files.createTempFile(Paths.get(temporaryFolderPath), "native-", ext);
|
||||
} else {
|
||||
return Files.createTempFile("native-", ext);
|
||||
}
|
||||
}
|
||||
|
||||
public static final NativeCodeLoader<VelocityCompressorFactory> compress = new NativeCodeLoader<>(
|
||||
ImmutableList.of(
|
||||
new NativeCodeLoader.Variant<>(NativeConstraints.MACOS,
|
||||
|
@ -23,6 +23,12 @@ public class Velocity {
|
||||
if (System.getProperty("io.netty.allocator.maxOrder") == null) {
|
||||
System.setProperty("io.netty.allocator.maxOrder", "9");
|
||||
}
|
||||
|
||||
// If Velocity's natives are being extracted to a different temporary directory, make sure the
|
||||
// Netty natives are extracted there as well
|
||||
if (System.getProperty("velocity.natives-tmpdir") != null) {
|
||||
System.setProperty("io.netty.native.workdir", System.getProperty("velocity.natives-tmpdir"));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren