More fixes for minemeld

Graylog2 · May 9, 2018 · 837663f · 837663f
1 parent c1cb121
commit 837663f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/org/graylog/plugins/threatintel/ThreatIntelPluginModule.java b/src/main/java/org/graylog/plugins/threatintel/ThreatIntelPluginModule.java
@@ -77,7 +77,7 @@ protected void configure() {
         addMessageProcessorFunction(PrivateNetLookupFunction.NAME, PrivateNetLookupFunction.class);
 
         installLookupDataAdapter(AbuseChRansomAdapter.NAME, AbuseChRansomAdapter.class, AbuseChRansomAdapter.Factory.class, AbuseChRansomAdapter.Config.class);
-        installLookupDataAdapter(MineMeldBlockListAdapter.NAME, MineMeldBlockListAdapter.class, MineMeldAdapter.Factory.class, MineMeldBlockListAdapter.Config.class);
+        installLookupDataAdapter(MineMeldBlockListAdapter.NAME, MineMeldBlockListAdapter.class, MineMeldBlockListAdapter.Factory.class, MineMeldBlockListAdapter.Config.class);
         installLookupDataAdapter(SpamhausEDROPDataAdapter.NAME, SpamhausEDROPDataAdapter.class, SpamhausEDROPDataAdapter.Factory.class, SpamhausEDROPDataAdapter.Config.class);
         installLookupDataAdapter(TorExitNodeDataAdapter.NAME, TorExitNodeDataAdapter.class, TorExitNodeDataAdapter.Factory.class, TorExitNodeDataAdapter.Config.class);
         installLookupDataAdapter(WhoisDataAdapter.NAME, WhoisDataAdapter.class, WhoisDataAdapter.Factory.class, WhoisDataAdapter.Config.class);

diff --git a/src/main/java/org/graylog/plugins/threatintel/adapters/minemeld/BlocklistType.java b/src/main/java/org/graylog/plugins/threatintel/adapters/minemeld/BlocklistType.java
@@ -1,4 +1,4 @@
-package org.graylog.plugins.threatintel.adapters.BlockListMineMeld;
+package org.graylog.plugins.threatintel.adapters.minemeld;
 
 import com.google.common.base.MoreObjects;
 

diff --git a/.../adapters/minemeld/BlockListMineMeld.java → ...rs/minemeld/MineMeldBlockListAdapter.java b/.../adapters/minemeld/BlockListMineMeld.java → ...rs/minemeld/MineMeldBlockListAdapter.java
@@ -1,4 +1,4 @@
-package org.graylog.plugins.threatintel.adapters.BlockListMineMeld;
+package org.graylog.plugins.threatintel.adapters.minemeld;
 
 import com.codahale.metrics.MetricRegistry;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
@@ -23,7 +23,6 @@
 import org.joda.time.Period;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import javax.annotation.Nullable;
 import javax.validation.constraints.Min;
 import java.io.IOException;
@@ -74,7 +73,7 @@ public MineMeldBlockListAdapter(@Assisted("id") String id,
 
     @Override
     public void doStart() throws Exception {
-        if (!pluginConfigService.config().getCurrent().mineMeldBlockListEnabled()) {
+        if (!pluginConfigService.config().getCurrent().minemeldEnabled()) {
             throw new AdapterDisabledException("MineMeldAdapter service is disabled, not starting adapter. To enable it please go to System / Configurations.");
         }
         final Config config = ((Config) getConfig());
@@ -93,15 +92,15 @@ protected void doStop() throws Exception {
 
     @Override
     public Duration refreshInterval() {
-        if (!pluginConfigService.config().getCurrent().mineMeldBlockListEnabled()) {
+        if (!pluginConfigService.config().getCurrent().minemeldEnabled()) {
             return Duration.ZERO;
         }
         return Duration.standardSeconds(((Config) getConfig()).refreshInterval());
     }
 
     @Override
     protected void doRefresh(LookupCachePurge cachePurge) throws Exception {
-        if (!pluginConfigService.config().getCurrent().mineMeldBlockListEnabled()) {
+        if (!pluginConfigService.config().getCurrent().minemeldEnabled()) {
             throw new AdapterDisabledException("MineMeldAdapter service is disabled, not refreshing adapter. To enable it please go to System / Configurations.");
         }
         loadData();

diff --git a/...ain/java/org/graylog/plugins/threatintel/functions/global/GlobalDomainLookupFunction.java b/...ain/java/org/graylog/plugins/threatintel/functions/global/GlobalDomainLookupFunction.java
@@ -65,9 +65,12 @@ boolean isEnabled(LookupTableFunction<? extends GenericLookupResult> function) {
         if (function.getClass().equals(AbuseChRansomDomainLookupFunction.class)) {
             return configuration.abusechRansomEnabled();
         }
+        else if (function.getClass().equals(MineMeldDomainLookupFunction.class)) {
+            return configuration.minemeldEnabled();
+        }
         return true;
     }
-
+/*
     @Override
     boolean isEnabled(LookupTableFunction<? extends GenericLookupResult> function) {
         final ThreatIntelPluginConfiguration configuration = this.threatIntelPluginConfiguration();
@@ -76,7 +79,7 @@ boolean isEnabled(LookupTableFunction<? extends GenericLookupResult> function) {
         }
         return true;
     }
-
+  */  
     @Override
     public FunctionDescriptor<GlobalLookupResult> descriptor() {
         return FunctionDescriptor.<GlobalLookupResult>builder()