[392012] [dstore] make server safer for delete operations

rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/UniversalFileSystemMiner.java

@@ -45,6 +45,7 @@
  * David McKnight   (IBM) - [371401] [dstore][multithread] avoid use of static variables - causes memory leak after disconnect
  * Noriaki Takatsu  (IBM) - [380562] [multithread][dstore] File Search is not canceled by the client UI on disconnect
  * David McKnight   (IBM)        - [390037] [dstore] Duplicated items in the System view
+ * David McKnight   (IBM)        - [392012] [dstore] make server safer for delete operations
  *******************************************************************************/
 
 package org.eclipse.rse.dstore.universal.miners;
@@ -53,6 +54,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.ServerSocket;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -462,6 +464,7 @@ public class UniversalFileSystemMiner extends Miner {
 	public void updateCancellableThreads(DataElement command, ICancellableHandler thread)
 	{
 		//First Check to make sure that there are no "zombie" threads
+		List threadsToRemove = new ArrayList();
 		Iterator iter = _cancellableThreads.keySet().iterator();
 		try
 		{
@@ -472,7 +475,12 @@ public class UniversalFileSystemMiner extends Miner {
 				if ((theThread == null) ||
 						theThread.isDone() || theThread.isCancelled())
 				{
-					_cancellableThreads.remove(threadElement);
+					threadsToRemove.add(threadElement);
+				}
+			}
+			if (!threadsToRemove.isEmpty()){
+				for (int i = 0; i < threadsToRemove.size(); i++){
+					_cancellableThreads.remove(threadsToRemove.get(i));
 				}
 			}
 		}
@@ -645,10 +653,24 @@ public class UniversalFileSystemMiner extends Miner {
 	 * Method to Delete a file or folder.
 	 */
 	public DataElement handleDelete(DataElement subject, DataElement status, boolean refreshDataStore) {
+		// first make sure this is a valid object to delete
+		String type = subject.getType();	
+		if (IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR.equals(type) ||
+			IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR.equals(type) ||
+			IUniversalDataStoreConstants.UNIVERSAL_ARCHIVE_FILE_DESCRIPTOR.equals(type) ||
+			IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR.equals(type) ||
+			IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR.equals(type) ||
+			IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR.equals(type)){
+			
 			DeleteThread deleteThread = new DeleteThread(subject,  this, _dataStore, false, status);
 			deleteThread.start();
 
 			updateCancellableThreads(status.getParent(), deleteThread);
+		}
+		else {
+			UniversalServerUtilities.logWarning(getName(), "illegal deletion type: " + type, _dataStore); //$NON-NLS-1$
+			statusCancelled(status);
+		}
 
 		return status;
 	}
@@ -659,10 +681,10 @@ public class UniversalFileSystemMiner extends Miner {
 		deleteThread.start();
 
 		updateCancellableThreads(status.getParent(), deleteThread);
-
 		return status;
 	}
 	
+
 	/**
 	 * Method to Rename a file or folder.
 	 */

rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/filesystem/DeleteThread.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2011 IBM Corporation and others.
+ * Copyright (c) 2007, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
  * David McKnight   (IBM)        - [264607] Unable to delete a broken symlink
  * David McKnight   (IBM)        - [321026][dstore] Broken symbolic link can't be removed
  * David McKnight   (IBM)        - [342450][dstore] Real files should not be deleted when deleting a symbolic link
+ * David McKnight   (IBM)        - [392012] [dstore] make server safer for delete operations
  *******************************************************************************/
 package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
 
@@ -119,15 +120,21 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler {
 	}
 	private DataElement handleDelete(DataElement subject, DataElement thisStatus) throws SystemMessageException
 	{
-
 		String type = subject.getType();
 		if (type.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FILE_DESCRIPTOR)
 				|| type.equals(IUniversalDataStoreConstants.UNIVERSAL_VIRTUAL_FOLDER_DESCRIPTOR)) {
 			return handleDeleteFromArchive(subject, thisStatus);
 		}
+		else if (IUniversalDataStoreConstants.UNIVERSAL_FOLDER_DESCRIPTOR.equals(type) ||
+				IUniversalDataStoreConstants.UNIVERSAL_FILE_DESCRIPTOR.equals(type) ||
+				IUniversalDataStoreConstants.UNIVERSAL_ARCHIVE_FILE_DESCRIPTOR.equals(type) ||
+				IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR.equals(type)){			
 			
-		File deleteObj = new File(subject.getAttribute(DE.A_VALUE)
+			String path = subject.getAttribute(DE.A_VALUE)+ File.separatorChar + subject.getName();			
-				+ File.separatorChar + subject.getName());
+			if (path.equals(""+File.separatorChar)){ // no path provided //$NON-NLS-1$
+				return _miner.statusCancelled(_status);
+			}
+			File deleteObj = new File(path);
 			DataElement deObj = null;
 	
 			String attributes = subject.getSource();
@@ -210,6 +217,10 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler {
 				}
 			}
 			_dataStore.refresh(subject);
+		}
+		else {
+			_dataStore.trace("attempt to delete "+subject + " prevented");  //$NON-NLS-1$//$NON-NLS-2$
+		}
 		return _miner.statusDone(_status);
 
 	}
@@ -254,7 +265,7 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler {
 	public void deleteDir(File fileObj, DataElement status) {
 		try {
 			File list[] = fileObj.listFiles();
-			for (int i = 0; i < list.length; ++i) {
+			for (int i = 0; i < list.length && !_isCancelled; ++i) {
 				if (list[i].isFile()) {
 					if (!(list[i].delete())) {
 						status.setAttribute(DE.A_SOURCE, IServiceConstants.FAILED);

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/files/DStoreFileService.java

@@ -1524,7 +1524,12 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 	public void delete(String remoteParent, String fileName, IProgressMonitor monitor) throws SystemMessageException
 	{
 		String remotePath = remoteParent + getSeparator(remoteParent) + fileName;
-		DataElement de = getElementFor(remotePath);
+
+		// always get a fresh element for deletions (spiriting could cause issues on server-side)
+		DataElement universaltemp = getMinerElement();
+		String normalizedPath = PathUtility.normalizeUnknown(remotePath);
+		DataElement de = universaltemp.getDataStore().createObject(universaltemp, IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR, normalizedPath, normalizedPath, "", false); //$NON-NLS-1$
+
 		// if we don't have a proper element, we won't have a command descriptor
 		if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
 			// need to fetch
@@ -1568,12 +1573,16 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
 			delete(remoteParents[0], fileNames[0], monitor);
 			return;
 		}
-
+		DataElement universaltemp = getMinerElement();
 		ArrayList dataElements = new ArrayList(remoteParents.length);
 		for (int i = 0; i < remoteParents.length; i++)
 		{
 			String remotePath = remoteParents[i] + getSeparator(remoteParents[i]) + fileNames[i];
-			DataElement de = getElementFor(remotePath);
+			
+			// always get a fresh element for deletions (spiriting could cause issues on server-side)
+			String normalizedPath = PathUtility.normalizeUnknown(remotePath);
+			DataElement de = universaltemp.getDataStore().createObject(universaltemp, IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR, normalizedPath, normalizedPath, "", false); //$NON-NLS-1$
+
 			// if we don't have a proper element, we won't have a command descriptor
 			if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
 				// need to fetch
@@ -1633,7 +1642,11 @@ public class DStoreFileService extends AbstractDStoreService implements IFileSer
  			 newPath = remoteParent + getSeparator(remoteParent) + newName;
  		}
 
- 		DataElement de = getElementFor(oldPath);
+ 		// always get a fresh element for renames (spiriting could cause issues on server-side)
+		DataElement universaltemp = getMinerElement();
+		String normalizedPath = PathUtility.normalizeUnknown(oldPath);
+		DataElement de = universaltemp.getDataStore().createObject(universaltemp, IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR, normalizedPath, normalizedPath, "", false); //$NON-NLS-1$
+ 		
 		// if we don't have a proper element, we won't have a command descriptor
 		if (de.getType().equals(IUniversalDataStoreConstants.UNIVERSAL_FILTER_DESCRIPTOR)){
 			// need to fetch