Merge pull request #35 from defold/validate-yaml-before-parsing

Validate manifest YAML before parsing.
defold · Mar 30, 2017 · 51c1751 · 51c1751
2 parents e5eb9da + 846757a
commit 51c1751
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/server/src/main/java/com/defold/extender/Extender.java b/server/src/main/java/com/defold/extender/Extender.java
@@ -112,8 +112,15 @@ private File uniqueTmpFile(String prefix, String suffix) {
         return file;
     }
 
-    private ManifestConfiguration loadManifest(File manifest) throws IOException {
-        return new Yaml().loadAs(FileUtils.readFileToString(manifest), ManifestConfiguration.class);
+    private ManifestConfiguration loadManifest(File manifest) throws IOException, ExtenderException {
+        String yaml = FileUtils.readFileToString(manifest);
+
+        if (yaml.contains("\t")) {
+            throw new ExtenderException("Manifest files (ext.manifest) are YAML files and cannot contain tabs. " +
+                    "Indentation should be done with spaces.");
+        }
+
+        return new Yaml().loadAs(yaml, ManifestConfiguration.class);
     }
 
     static List<File> filterFiles(Collection<File> files, String re) {