Add check that plugin must specify at least site or jvm

elastic · Jul 22, 2015 · 4a9b5b4 · 4a9b5b4
1 parent 19aef2f
commit 4a9b5b4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java b/core/src/main/java/org/elasticsearch/plugins/PluginInfo.java
@@ -96,6 +96,9 @@ public static PluginInfo readFromProperties(Path dir) throws IOException {
         }
         boolean jvm = Boolean.parseBoolean(props.getProperty("jvm"));
         boolean site = Boolean.parseBoolean(props.getProperty("site"));
+        if (jvm == false && site == false) {
+            throw new IllegalArgumentException("Plugin [" + name + "] must be at least a jvm or site plugin");
+        }
         boolean isolated = true;
         String classname = "NA";
         if (jvm) {

diff --git a/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java b/core/src/test/java/org/elasticsearch/plugins/PluginInfoTests.java
@@ -37,6 +37,7 @@
 import static org.hamcrest.Matchers.contains;
 
 public class PluginInfoTests extends ElasticsearchTestCase {
+
     void writeProperties(Path pluginDir, String... stringProps) throws IOException {
         assert stringProps.length % 2 == 0;
         Files.createDirectories(pluginDir);
@@ -91,6 +92,19 @@ public void testReadFromPropertiesVersionMissing() throws Exception {
         }
     }
 
+    public void testReadFromPropertiesJvmAndSiteMissing() throws Exception {
+        Path pluginDir = createTempDir().resolve("fake-plugin");
+        writeProperties(pluginDir,
+            "description", "fake desc",
+            "version", "1.0");
+        try {
+            PluginInfo.readFromProperties(pluginDir);
+            fail("expected jvm or site exception");
+        } catch (IllegalArgumentException e) {
+            assertTrue(e.getMessage().contains("must be at least a jvm or site plugin"));
+        }
+    }
+
     public void testReadFromPropertiesElasticsearchVersionMissing() throws Exception {
         Path pluginDir = createTempDir().resolve("fake-plugin");
         writeProperties(pluginDir,