Skip to content

[CYB-149] DNS Query timeout causes NullPointerException in NsLookup #35

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
carolynduby merged 1 commit into from
Jun 9, 2023
Merged

[CYB-149] DNS Query timeout causes NullPointerException in NsLookup #35

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
2 changes: 1 addition & 1 deletion flink-cyber/cyber-functions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.2.2</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
30 changes: 22 additions & 8 deletions flink-cyber/cyber-functions/src/main/java/com/cloudera/cyber/libs/hostnames/NsLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import com.github.benmanes.caffeine.cache.CacheLoader;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import lombok.extern.slf4j.Slf4j;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
import org.xbill.DNS.Lookup;
Expand All @@ -32,6 +33,7 @@
import java.util.stream.Stream;

@CyberFunction("nslookup")
@Slf4j
public class NsLookup extends AbstractStringScalarFunction {

private LoadingCache<NsLookupQuery, List<NsLookupRecord>> cache = Caffeine.newBuilder()
Expand All @@ -42,15 +44,27 @@ public class NsLookup extends AbstractStringScalarFunction {
@Override
public List<NsLookupRecord> load(@Nonnull NsLookupQuery key) throws Exception {
try {
Record[] records = new Lookup(key.getQuery(), key.getType()).run();
return Stream.of(records).map(r -> NsLookupRecord.builder()
.type(Type.string(r.getType()))
.name(r.getName().toString(true))
.result(r.rdataToString()
)
.build()
).collect(Collectors.toList());
Lookup lookup = new Lookup(key.getQuery(), key.getType());
Record[] records = lookup.run();
if (lookup.getResult() == Lookup.SUCCESSFUL) {
if (records != null) {
return Stream.of(records).map(r -> NsLookupRecord.builder()
.type(Type.string(r.getType()))
.name(r.getName().toString(true))
.result(r.rdataToString()
)
.build()
).collect(Collectors.toList());
} else {
log.warn("Dns Lookup query='{}' type='{}' returned null records", key.getQuery(), key.getType());
return null;
}
} else {
log.error("Dns Lookup query='{}' type='{}' failed with error {}", key.getQuery(), key.getType(), lookup.getErrorString());
return null;
}
} catch (TextParseException e) {
log.error(String.format("Dns Lookup query='%s' type='%s' failed.", key.getQuery(), key.getType()), e);
return null;
}
}
Expand Down
1 change: 1 addition & 0 deletions ...k-cyber/cyber-functions/src/test/java/com/cloudera/cyber/libs/hostnames/TestNsLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ public void testDns() {
List<NsLookupRecord> results = new NsLookup().eval("www.google.com", "AAAA");
assertThat(results, hasSize(greaterThan(0)));
}

@Test
public void testDnsMx() {
List<NsLookupRecord> results = new NsLookup().eval("google.com", "MX");
Expand Down