Skip to content

Fix/iplist blocklist scan perf 2 #324

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

Closed
hansott wants to merge 2 commits into from
+11 −12
Closed

Fix/iplist blocklist scan perf 2 #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a2a934
Replace linear IP blocklist scan with indexed trie lookup
Jul 14, 2026
14382c1
Load JaCoCo before our agent
hansott Jul 14, 2026
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
8 changes: 7 additions & 1 deletion agent_api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ dependencies {
test {
jvmArgs '--add-opens', 'java.base/java.util=ALL-UNNAMED'
jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED'
jvmArgs "-javaagent:${project.rootDir}/dist/agent.jar=mode=daemon-disabled"
jvmArgs '-Dnet.bytebuddy.experimental=true' // Mockito support.

systemProperty 'AIK_agent_dir', "${project.rootDir}/dist"
Expand All @@ -64,6 +63,13 @@ test {
jacoco {
enabled = true
}
doFirst {
// JaCoCo's javaagent must load before our own agent.jar. Our agent registers a
// retransformation-capable ByteBuddy transformer; if it loads first, JaCoCo silently
// stops recording coverage for almost every class, not just the ones we instrument.
jvmArgs jacoco.getAsJvmArg(), "-javaagent:${project.rootDir}/dist/agent.jar=mode=daemon-disabled"
jacoco.enabled = false
}
}

jacocoTestReport {
Expand Down
15 changes: 4 additions & 11 deletions agent_api/src/main/java/dev/aikido/agent_api/helpers/net/IPList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@

import inet.ipaddr.IPAddress;
import inet.ipaddr.IPAddressString;

import java.util.HashSet;
import java.util.Set;
import inet.ipaddr.format.util.DualIPv4v6Tries;

public class IPList {
private Set<IPAddress> ipAddresses;
private final DualIPv4v6Tries ipAddresses;

public IPList() {
this.ipAddresses = new HashSet<>();
this.ipAddresses = new DualIPv4v6Tries();
}

public void add(String ipOrCIDR) {
Expand Down Expand Up @@ -56,12 +54,7 @@ public boolean matches(String ip) {
}

private boolean containsAddress(IPAddress ipAddress) {
for (IPAddress subnet : ipAddresses) {
if (subnet.contains(ipAddress)) {
return true;
}
}
return false;
return ipAddresses.elementContains(ipAddress);
}
public int length() {
return ipAddresses.size();
Expand Down
Loading