Changeset 3011

Timestamp:

Dec 8, 2006, 1:04:29 PM (16 years ago)

Author:

Martin Svensson

Message:

Fixes #444 Plugins should check that they are allowed to create/overwrite files

Location:

trunk/src

Files:

• core/net/sf/basedb/core/plugin/AbstractExporterPlugin.java (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/HelpExporter.java (modified) (2 diffs)
• plugins/core/net/sf/basedb/plugins/PlateMappingExporter.java (modified) (1 diff)
• plugins/core/net/sf/basedb/plugins/PluginConfigurationExporter.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/plugin/AbstractExporterPlugin.java

@@ -332 +332 @@
     return value == null ? false : value;
   }
+  
+  /**
+      See if file path already exists and if it's allowed to overwrite it.      
+      @param strPath The file path to be checked.
+      @param overwrite TRUE If it is allowed to overwrite the file, FALSE otherwise.
+      @return FALSE If the file path exists and isn't allowed to be overwritten or TRUE otherwise.
+  */
+  protected boolean pathCanBeUsed(String strPath, boolean overwrite)
+  {   
+    DbControl dc = sc.newDbControl();
+    Path path = new Path(strPath, Path.Type.FILE);
+    File file = File.getByPath(dc, path, true);
+    
+    if (!overwrite && file.isInDatabase() && !file.isRemoved())
+    {
+      dc.close();
+      return false;     
+    }
+    else
+    {
+      dc.close();
+      return true;
+    }
+  }
 }

trunk/src/plugins/core/net/sf/basedb/plugins/HelpExporter.java

@@ -202 +202 @@
           response.setError(errors.size() + " invalid parameters were found in the request",errors);
           return;
-        }
-
+        }       
+        
         storeValue(job, request, ri.getParameter("client"));
         if (request.getParameterValue(SAVE_AS) == null)
@@ -218 +218 @@
         else
         {
+          if (!pathCanBeUsed((String)request.getParameterValue(ri.getParameter(SAVE_AS).getName()), 
+              (Boolean)request.getParameterValue(ri.getParameter(OVERWRITE).getName())))
+          {
+            response.setError("File exists: " + (String)request.getParameterValue(ri.getParameter(SAVE_AS).getName()), null);
+            return;
+          }
           storeValue(job, request, ri.getParameter(SAVE_AS));
           storeValue(job, request, ri.getParameter(OVERWRITE));

trunk/src/plugins/core/net/sf/basedb/plugins/PlateMappingExporter.java

@@ -216 +216 @@
         else
         {
+          if (!pathCanBeUsed((String)request.getParameterValue(ri.getParameter(SAVE_AS).getName()), 
+              (Boolean)request.getParameterValue(ri.getParameter(OVERWRITE).getName())))
+          {
+            response.setError("File exists: " + (String)request.getParameterValue(ri.getParameter(SAVE_AS).getName()), null);
+            return;
+          }
           storeValue(job, request, ri.getParameter(SAVE_AS));
           storeValue(job, request, ri.getParameter(OVERWRITE));

trunk/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationExporter.java

@@ -176 +176 @@
         else
         {
+          if (!pathCanBeUsed((String)request.getParameterValue(ri.getParameter(SAVE_AS).getName()), 
+              (Boolean)request.getParameterValue(ri.getParameter(OVERWRITE).getName())))
+          {
+            response.setError("File exists: " + (String)request.getParameterValue(ri.getParameter(SAVE_AS).getName()), null);
+            return;
+          }
           storeValue(job, request, ri.getParameter(SAVE_AS));
           storeValue(job, request, ri.getParameter(OVERWRITE));