27/4/2014 0:53

Updated validation for schema name - it cannot be fs.chunks or fs.files - these names are reserved for GridFS DB.
MarianMacik · Apr 26, 2014 · 579a5a4 · 579a5a4
1 parent b8f0ac0
commit 579a5a4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/main/java/cz/muni/fi/pv168/kartoteka/SchemaManagerBean.java b/src/main/java/cz/muni/fi/pv168/kartoteka/SchemaManagerBean.java
@@ -295,8 +295,8 @@ public void addSchema(List<Entry<ObjectId, String>> schemas, String selectedDB)
         if (newSchemaToAdd.getTitle().equals("")) {
             FacesContext.getCurrentInstance().addMessage("schemaValidationErrorMessage", new FacesMessage(FacesMessage.SEVERITY_WARN, "Schema must be named!", null));
             return;
-        } else if (newSchemaToAdd.getTitle().contains("$") || newSchemaToAdd.getTitle().startsWith("system.")) {
-            FacesContext.getCurrentInstance().addMessage("schemaValidationErrorMessage", new FacesMessage(FacesMessage.SEVERITY_WARN, "Schema name must not contain $ or starts with 'system.' prefix!", null));
+        } else if (newSchemaToAdd.getTitle().contains("$") || newSchemaToAdd.getTitle().startsWith("system.") || newSchemaToAdd.getTitle().equals("fs.files") || newSchemaToAdd.getTitle().equals("fs.chunks")) {
+            FacesContext.getCurrentInstance().addMessage("schemaValidationErrorMessage", new FacesMessage(FacesMessage.SEVERITY_WARN, "Schema name must not contain $ or starts with 'system.' prefix or be 'fs.files' or 'fs.chunks'!", null));
             return;
             //schema must be unique
         } else if (schemaNames.contains(newSchemaToAdd.getTitle())) {
@@ -679,8 +679,8 @@ private boolean invalidSchemaName(String title, List<Map.Entry<ObjectId, String>
         if (title.equals("")) {
             FacesContext.getCurrentInstance().addMessage("schemaNameErrorMessage", new FacesMessage(FacesMessage.SEVERITY_WARN, "Schema must be named!", null));
             return true;
-        } else if (title.contains("$") || title.startsWith("system.")) {
-            FacesContext.getCurrentInstance().addMessage("schemaNameErrorMessage", new FacesMessage(FacesMessage.SEVERITY_WARN, "Schema name must not contain $ or starts with 'system.' prefix!", null));
+        } else if (title.contains("$") || title.startsWith("system.") || title.equals("fs.files") || title.equals("fs.chunks")) {
+            FacesContext.getCurrentInstance().addMessage("schemaNameErrorMessage", new FacesMessage(FacesMessage.SEVERITY_WARN, "Schema name must not contain $ or starts with 'system.' prefix or be 'fs.files' or 'fs.chunks'!", null));
             return true;
             //schema must be unique
         } else if (schemaNames.contains(title)) {