Changeset 4595

Timestamp:

Oct 21, 2008, 9:44:33 AM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #1142 Batch importer plug-ins should handle lack of USE permission better.

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java (modified) (9 diffs)

trunk/src/plugins/core/net/sf/basedb/plugins/batchimport/AbstractItemImporter.java

@@ -61 +61 @@
 import net.sf.basedb.core.NumberOutOfRangeException;
 import net.sf.basedb.core.Permission;
+import net.sf.basedb.core.PermissionDeniedException;
 import net.sf.basedb.core.Platform;
 import net.sf.basedb.core.PlatformVariant;
@@ -240 +241 @@
     );
   
+  private static final PluginParameter<String> lackOfUsePermissionOnReferencedItemErrorParameter = new PluginParameter<String>(
+      "lackOfUsePermissionOnReferencedItemError",
+      "Lack of use permission on referenced item",
+      "What to do if the plug-in finds a referenced item and has no permission to use it.\n\n"+
+      "ignore = Do not set/update the reference\n" +
+      "fail = Stop with an error message",
+      new StringParameterType(255, null, false, 1, 0, 0, 
+        Arrays.asList( new String[] { "ignore", "fail"} ))
+    );
   public AbstractItemImporter()
   {}
@@ -404 +414 @@
         storeValue(job, request, numberFormatErrorParameter);
         storeValue(job, request, numberOutOfRangeErrorParameter);
+        storeValue(job, request, lackOfUsePermissionOnReferencedItemErrorParameter);
         
         // Save context info
@@ -465 +476 @@
   private boolean failIfNotFoundReference;
   private boolean failIfMultipleFoundReferences;
+  private boolean failIfNoUsePermissionOnReference;
   
   // Status report
@@ -518 +530 @@
     this.failIfNotFoundReference = "fail".equals(getErrorOption("referenceNotFoundError"));
     this.failIfMultipleFoundReferences = "fail".equals(getErrorOption("multipleReferencesFoundError"));
+    this.failIfNoUsePermissionOnReference = "fail".equals(getErrorOption("lackOfUsePermissionOnReferencedItemError"));
     this.cropStrings = "crop".equals(getErrorOption("stringTooLongError"));
 
@@ -1489 +1502 @@
     delegates to {@link IdMethod#prepareQuery(DbControl, ItemQuery)} and
     then adds {@link Include} options: MINE, IN_PROJECT, SHARED and OTHERS.
-    The query will only search for items that the logged in user has 
-    USE permission for.
-    
+        
     @param dc A DbControl used for database access
     @param idMethod The identification method to use
@@ -1501 +1512 @@
     query = idMethod.prepareQuery(dc, query);
     query.include(Include.MINE, Include.IN_PROJECT, Include.SHARED, Include.OTHERS);
-    query.setItemPermission(Permission.USE);
     return query;
   }
@@ -1544 +1554 @@
         }
       }
-      else if (result.size() > 1)
-      {
-        // Several items found
-        if (failIfMultipleFoundReferences)
-        {
-          throw new BaseException("Found " + result.size() + " " + itemType + " [" +idMethod + "=" + identifier + "]");
-        }
-      }
       else
       {
-        item = result.get(0);
-      }
-      itemCache.put(cacheKey, item);
+        // Pick out items where use-permission is granted
+        List<T> accessibleItems = new ArrayList<T>();
+        for (T t : result)
+        {
+          if (t.hasPermission(Permission.USE)) 
+          {
+            accessibleItems.add(t);
+          }
+        }
+        if (accessibleItems.size() > 1)
+        {
+          // Several items found
+          if (failIfMultipleFoundReferences)
+          {
+            throw new BaseException("Found " + accessibleItems.size() + " " + itemType + " [" +idMethod + "=" + identifier + "]");
+          }
+        }
+        else if (accessibleItems.size() == 0)
+        {
+          // No use permission on item
+          if (failIfNoUsePermissionOnReference)
+          {
+            throw new PermissionDeniedException(Permission.USE, itemType+"[" +idMethod + "=" + identifier + "]");
+          }         
+        }
+        else
+        {
+          item = accessibleItems.get(0);
+        }
+        itemCache.put(cacheKey, item);
+      }
     }
     return item;
@@ -1746 +1776 @@
       if (!updateMode) parameters.add(itemExistsErrorParameter);
       parameters.add(multipleItemsFoundErrorParameter);
+      parameters.add(lackOfUsePermissionOnReferencedItemErrorParameter);
       parameters.add(referenceNotFoundErrorParameter);
       parameters.add(multipleReferencesFoundErrorParameter);