Skip to content

Cleanup #5

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

Merged
serj merged 1 commit into from
Dec 19, 2025
Merged

Cleanup #5

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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: CI

permissions:
contents: read

on:
push:
branches: [main, release]
Expand Down
2 changes: 1 addition & 1 deletion core/analysis/src/main/java/com/github/serj/jcapslock/analyzer/CallGraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public static Graph buildUnifiedGraphProto(

// Create SootGraphBuilder for SootUp-aware graph construction
SootGraphBuilder sootBuilder = new SootGraphBuilder();
GraphProtoBuilder graphBuilder = sootBuilder.getBuilder();
GraphProtoBuilder graphBuilder = sootBuilder.builder();
Map<MethodSignature, Integer> methodToFunctionId = new HashMap<>();

// Create implicit capability detector
Expand Down
19 changes: 8 additions & 11 deletions core/analysis/src/main/java/com/github/serj/jcapslock/analyzer/SootGraphBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,30 @@
import capslock.proto.CapabilityOuterClass.Capability;
import capslock.proto.GraphOuterClass.Graph;
import sootup.core.model.SootMethod;
import sootup.core.signatures.PackageName;
import sootup.core.types.ClassType;

/**
* Extension of GraphProtoBuilder that adds SootUp-specific methods.
* Wraps GraphProtoBuilder for use in static analysis with SootUp.
*/
public class SootGraphBuilder {

private final GraphProtoBuilder builder;
public record SootGraphBuilder(GraphProtoBuilder builder) {

public SootGraphBuilder() {
this.builder = new GraphProtoBuilder();
}

public SootGraphBuilder(GraphProtoBuilder builder) {
this.builder = builder;
this(new GraphProtoBuilder());
}

/**
* Get the underlying GraphProtoBuilder.
*/
public GraphProtoBuilder getBuilder() {
@Override
public GraphProtoBuilder builder() {
return builder;
}

/**
* Add a function from a SootUp SootMethod.
*
* @param method The SootMethod to add
* @return The index of the added function
*/
Expand All @@ -49,7 +46,7 @@ public int addFunction(SootMethod method) {
*/
public int addRootFunction(SootMethod method) {
ClassType classType = method.getDeclaringClassType();
sootup.core.signatures.PackageName pkg = classType.getPackageName();
PackageName pkg = classType.getPackageName();
String packageName = pkg != null ? pkg.getName() : "";
builder.markPackageAsRoot(packageName);
return addFunction(method);
Expand Down Expand Up @@ -88,7 +85,7 @@ public int getFunctionIndex(String fullyQualifiedName) {
return builder.getFunctionIndex(fullyQualifiedName);
}

public capslock.proto.GraphOuterClass.Graph build() {
public Graph build() {
return builder.build();
}

Expand Down
17 changes: 0 additions & 17 deletions core/src/main/java/com/github/serj/jcapslock/capability/CapabilityMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.nio.file.Path;
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;
Expand Down Expand Up @@ -242,20 +241,4 @@ public static void reset() {
SAFE_CLASSES.clear();
loadDefaultMappings();
}

/**
* Get all safe methods.
* Returns an immutable view.
*/
public static Set<String> getSafeMethods() {
return Collections.unmodifiableSet(new HashSet<>(SAFE_METHODS));
}

/**
* Get all safe classes (classes where all methods are safe).
* Returns an immutable view.
*/
public static Set<String> getSafeClasses() {
return Collections.unmodifiableSet(new HashSet<>(SAFE_CLASSES));
}
}
45 changes: 0 additions & 45 deletions core/src/main/java/com/github/serj/jcapslock/model/DependencyInfo.java
View file
Open in desktop

This file was deleted.

73 changes: 27 additions & 46 deletions examples/compress-test/src/main/java/com/example/CompressExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import org.apache.commons.compress.utils.IOUtils;
import org.apache.commons.compress.compressors.zstandard.ZstdUtils;
import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
import org.apache.commons.compress.compressors.brotli.BrotliUtils;
import org.apache.commons.compress.archivers.zip.ExtraFieldUtils;

import java.io.*;
import java.nio.file.Files;
Expand All @@ -32,22 +29,16 @@ public class CompressExample {
*/
public void createZipArchive(Path sourceDir, Path outputFile) throws IOException {
try (ZipArchiveOutputStream zipOut = new ZipArchiveOutputStream(
Files.newOutputStream(outputFile))) {

Files.walk(sourceDir)
.filter(Files::isRegularFile)
.forEach(path -> {
try {
ZipArchiveEntry entry = new ZipArchiveEntry(
sourceDir.relativize(path).toString());
entry.setSize(Files.size(path));
zipOut.putArchiveEntry(entry);
Files.copy(path, zipOut);
zipOut.closeArchiveEntry();
} catch (IOException e) {
System.err.println("Error adding file to zip: " + e.getMessage());
}
});
Files.newOutputStream(outputFile));
var paths = Files.walk(sourceDir)) {

for (Path path : paths.filter(Files::isRegularFile).toList()) {
ZipArchiveEntry entry = new ZipArchiveEntry(sourceDir.relativize(path).toString());
entry.setSize(Files.size(path));
zipOut.putArchiveEntry(entry);
Files.copy(path, zipOut);
zipOut.closeArchiveEntry();
}
}
}

Expand All @@ -68,13 +59,17 @@ public void extractArchive(Path archiveFile, Path destDir) throws Exception {
continue;
}

Path outputPath = destDir.resolve(entry.getName());
// in case of refactoring we want to avid path traversals
Path outputPath = destDir.resolve(entry.getName()).normalize();
if (!outputPath.startsWith(destDir)) {
throw new IOException("Archive entry is outside of the target directory: " + entry.getName());
}
if (entry.isDirectory()) {
Files.createDirectories(outputPath);
} else {
Files.createDirectories(outputPath.getParent());
try (OutputStream out = Files.newOutputStream(outputPath)) {
IOUtils.copy(archiveIn, out);
archiveIn.transferTo(out);
}
}
}
Expand All @@ -90,7 +85,7 @@ public void compressFileGzip(Path inputFile, Path outputFile) throws IOException
OutputStream out = Files.newOutputStream(outputFile);
GzipCompressorOutputStream gzipOut = new GzipCompressorOutputStream(out)) {

IOUtils.copy(in, gzipOut);
in.transferTo(gzipOut);
}
}

Expand All @@ -100,23 +95,18 @@ public void compressFileGzip(Path inputFile, Path outputFile) throws IOException
*/
public void createTarArchive(Path sourceDir, Path outputFile) throws IOException {
try (TarArchiveOutputStream tarOut = new TarArchiveOutputStream(
Files.newOutputStream(outputFile))) {
Files.newOutputStream(outputFile));
var paths = Files.walk(sourceDir)) {
tarOut.setLongFileMode(TarArchiveOutputStream.LONGFILE_POSIX);

Files.walk(sourceDir)
.filter(Files::isRegularFile)
.forEach(path -> {
try {
TarArchiveEntry entry = new TarArchiveEntry(
path.toFile(),
sourceDir.relativize(path).toString());
tarOut.putArchiveEntry(entry);
Files.copy(path, tarOut);
tarOut.closeArchiveEntry();
} catch (IOException e) {
System.err.println("Error adding file to tar: " + e.getMessage());
}
});
for (Path path : paths.filter(Files::isRegularFile).toList()) {
TarArchiveEntry entry = new TarArchiveEntry(
path.toFile(),
sourceDir.relativize(path).toString());
tarOut.putArchiveEntry(entry);
Files.copy(path, tarOut);
tarOut.closeArchiveEntry();
}
}
}

Expand All @@ -134,15 +124,6 @@ public void checkAvailableFormats() {

System.out.println(" Zstandard (zstd) support: " + zstdAvailable);
System.out.println(" Brotli support: " + brotliAvailable);

// ExtraFieldUtils also uses reflection for registering handlers
// This also triggers CAPABILITY_REFLECT
try {
// Register a custom extra field (uses reflection internally)
ExtraFieldUtils.register(ZipArchiveEntry.class);
} catch (Exception e) {
// Expected - just demonstrating the reflection usage
}
}

/**
Expand Down
32 changes: 22 additions & 10 deletions maven-plugin/src/main/java/com/github/serj/jcapslock/maven/OptionalDependencyResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@
import org.w3c.dom.NodeList;

import com.github.serj.jcapslock.util.JavaUtils;
import org.xml.sax.SAXException;

import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.http.HttpClient;
Expand Down Expand Up @@ -305,21 +308,30 @@ private List<OptionalDependency> fetchFromRemotePom(Artifact artifact) {
return Collections.emptyList();
}

/**
* Creates a secure DocumentBuilder with XXE protections enabled.
* Screw XML and all those design patterns below
*/
@SuppressWarnings("HttpUrlsUsage") // These are XML feature URIs, not network URLs
private static Document createSecureDocument(InputStream is) throws ParserConfigurationException, IOException, SAXException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
factory.setXIncludeAware(false);
factory.setExpandEntityReferences(false);
factory.setNamespaceAware(true);
DocumentBuilder builder = factory.newDocumentBuilder();
return builder.parse(is);
}

/**
* Parse POM to extract optional dependencies.
*/
private List<OptionalDependency> parsePom(InputStream is) {
try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
factory.setXIncludeAware(false);
factory.setExpandEntityReferences(false);
factory.setNamespaceAware(true);
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(is);
Document doc = createSecureDocument(is);

List<OptionalDependency> result = new ArrayList<>();
NodeList dependencies = doc.getElementsByTagName("dependency");
Expand Down