3 files changed, 39 insertions, 0 deletions
diff --git a/README.md b/README.md
index 10e9c63..1f46676 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,25 @@
 
     ./gradlew runClient
 
+Relies on a running agent.
+
+Exposes a web application on `localhost:8080`.
+
+### Fetcher
+
+    ./gradlew runFetcher
+
+Sends system information to an agent.
+
+### Interpreter
+
+    ./gradlew runInterpreter
+    # to suppress Gradle's output
+    ./gradlew runInterpreter --quiet
+
+Reads queries from standard input and outputs results to standard output, using
+a hard-coded test hierarchy.
+
 ### Tests
 
     ./gradlew test
diff --git a/src/main/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementation.java b/src/main/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementation.java
index 4ac6f5c..d2e808a 100644
--- a/src/main/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementation.java
+++ b/src/main/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementation.java
@@ -8,6 +8,9 @@ import java.util.List;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+
 
 import pl.edu.mimuw.cloudatlas.interpreter.Interpreter;
 import pl.edu.mimuw.cloudatlas.interpreter.InterpreterException;
@@ -58,6 +61,11 @@ public class ApiImplementation implements Api {
     }
 
     public void installQuery(String name, String queryCode) throws RemoteException {
+        Pattern queryNamePattern = Pattern.compile("&[a-zA-Z][\\w_]*");
+        Matcher matcher = queryNamePattern.matcher(name);
+        if (!matcher.matches()) {
+            throw new RemoteException("Invalid query identifier");
+        }
         try {
             ValueQuery query = new ValueQuery(queryCode);
             Attribute attributeName = new Attribute(name);
diff --git a/src/test/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementationTests.java b/src/test/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementationTests.java
index d98377c..c964ed9 100644
--- a/src/test/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementationTests.java
+++ b/src/test/java/pl/edu/mimuw/cloudatlas/agent/ApiImplementationTests.java
@@ -102,6 +102,18 @@ public class ApiImplementationTests {
         assertAttributeInZmiEquals("num_processes", new ValueInt(799l), "/");
     }
 
+    @Test
+    public void testInstallQueryWithInvalidNameFails() throws Exception {
+        String name = "query";
+        String queryCode = "SELECT 1 AS one";
+        try {
+            api.installQuery(name, queryCode);
+            assertTrue("should have thrown", false);
+        } catch (Exception e) {
+            assertEquals("Invalid query identifier", e.getMessage());
+        }
+    }
+
     public void assertAttributeInZmiEquals(String attribute, Value expected, String zmiPath) throws Exception {
         AttributesMap attributes = api.getZoneAttributeValues(zmiPath);
         assertEquals(expected, attributes.get(attribute));