Skip to content
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

Jump to bottom

Fix lookup table used in tor_lookup() function #71

Merged
merged 1 commit into from Nov 29, 2017
Merged

Fix lookup table used in tor_lookup() function #71

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/main/java/org/graylog/plugins/threatintel/functions/tor/TorExitNodeLookupFunction.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@ public class TorExitNodeLookupFunction extends LookupTableFunction<GenericLookup

public static final String NAME = "tor_lookup";
private static final String VALUE = "ip_address";
private static final String LOOKUP_TABLE_NAME = "abuse-ch-ransomware-domains";
private static final String LOOKUP_TABLE_NAME = "tor-exit-node-list";

private final ParameterDescriptor<String, String> valueParam = ParameterDescriptor.string(VALUE).description("The IP to look up.").build();

Expand All @@ -41,12 +41,13 @@ public GenericLookupResult evaluate(FunctionArgs args, EvaluationContext context
LOG.debug("Running Tor exit node lookup for IP [{}].", ip);

final LookupResult lookupResult = this.lookupFunction.lookup(ip.trim());
if (lookupResult != null && !lookupResult.isEmpty() && lookupResult.singleValue() != null) {
if (lookupResult.singleValue() instanceof Boolean) {
return (Boolean)lookupResult.singleValue() ? GenericLookupResult.TRUE : GenericLookupResult.FALSE;
if (lookupResult != null && !lookupResult.isEmpty()) {
final Object value = lookupResult.singleValue();
if (value instanceof Boolean) {
return (Boolean) value ? GenericLookupResult.TRUE : GenericLookupResult.FALSE;
}
if (lookupResult.singleValue() instanceof String) {
return Boolean.valueOf((String) lookupResult.singleValue()) ? GenericLookupResult.TRUE : GenericLookupResult.FALSE;
if (value instanceof String) {
return Boolean.valueOf((String) value) ? GenericLookupResult.TRUE : GenericLookupResult.FALSE;
}
}

Expand Down