Changeset 2021

Timestamp:

02/09/2010 02:23:49 PM (6 months ago)

Author:

djb61

Message:

Make the MKD command resolve out a symlink as the parent of the new directory before attempting to create the new directory. Additionally resovle out symlinks in VirtualFileSystem.getInodeByPath() so that a CWD with an absolute path containing symlinks works correctly. This fixes #258

Location:

trunk/src

Files:

• master/src/org/drftpd/vfs/VirtualFileSystem.java (modified) (1 diff)
• plugins/org.drftpd.commands.dir/src/org/drftpd/commands/dir/Dir.java (modified) (1 diff)

trunk/src/master/src/org/drftpd/vfs/VirtualFileSystem.java

@@ -190 +190 @@
                         if (inode.isDirectory()) {
                                 walker = (VirtualFileSystemDirectory) inode;
+                        } else if (inode.isLink()) {
+                                walker = (VirtualFileSystemDirectory) getInodeByPath(((VirtualFileSystemLink)inode).getLinkPath());
                         } else { // We better be at the end of the array
                                 if (x != values.length - 1) {

trunk/src/plugins/org.drftpd.commands.dir/src/org/drftpd/commands/dir/Dir.java

@@ -258 +258 @@
 
                 try {
+                        try {
+                                if (!fakeDirectory.getParent().equals(request.getCurrentDirectory()) && 
+                                                InodeHandle.isLink(fakeDirectory.getParent().getPath())) {
+                                        fakeDirectory = new LinkHandle(fakeDirectory.getParent().getPath())
+                                        .getTargetDirectory(session.getUserNull(request.getUser()))
+                                        .getNonExistentDirectoryHandle(dirName);
+                                }
+                        } catch (FileNotFoundException e1) {
+                                return new CommandResponse(550, "Parent directory does not exist");
+                        } catch (ObjectNotValidException e) {
+                                return new CommandResponse(550, "Parent directory does not exist");
+                        }
                         DirectoryHandle newDir = null;
                         try {