mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +02:00
Code Issues Wiki Activity

[436604] [dstore] deleting symbolic links can delete files

Browse source
This commit is contained in:
Dave McKnight 2014-06-04 12:09:55 -04:00
parent 0c964e7365
commit 6a94a5d148
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2013 IBM Corporation and others. * Copyright (c) 2007, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -18,6 +18,7 @@
* David McKnight (IBM) - [342450][dstore] Real files should not be deleted when deleting a symbolic link * 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 * David McKnight (IBM) - [392012] [dstore] make server safer for delete operations
* David McKnight (IBM) - [414016] [dstore] new server audit log requirements * David McKnight (IBM) - [414016] [dstore] new server audit log requirements
* David McKnight (IBM) - [436604] [dstore] deleting symbolic links can delete files
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.dstore.universal.miners.filesystem; package org.eclipse.rse.internal.dstore.universal.miners.filesystem;
@ -161,7 +162,11 @@ public class DeleteThread extends SecuredThread implements ICancellableHandler {
String[] auditData = new String[] {"DELETE", deleteObj.getAbsolutePath(), null, null}; String[] auditData = new String[] {"DELETE", deleteObj.getAbsolutePath(), null, null};
UniversalServerUtilities.logAudit(auditData, _dataStore); UniversalServerUtilities.logAudit(auditData, _dataStore);
if (classification != null && classification.startsWith("symbolic link")){ //$NON-NLS-1$ // can't rely on classification anymore to determine link
// instead use canonical path
String canonicalPath = deleteObj.getCanonicalPath();
if (!canonicalPath.equals(path)){
//if (classification != null && classification.startsWith("symbolic link")){ //$NON-NLS-1$
// only delete the link - no the actual file or folder contents // only delete the link - no the actual file or folder contents
deleteObj.delete(); deleteObj.delete();
} }