Better path related methods...

macmade · Feb 20, 2012 · 442227a · 442227a
1 parent edcd8c5
commit 442227a
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 29 deletions.
diff --git a/EOSFTPServer/FTPServer/Classes/EOSFTPServer.h b/EOSFTPServer/FTPServer/Classes/EOSFTPServer.h
@@ -84,6 +84,7 @@ FOUNDATION_EXPORT EOSFTPServerCommand EOSFTPServerCommandNOOP;
 @class EOSFTPServerUser;
 @class EOSFTPServerConnection;
 @class AsyncSocket;
+@class EOSFile;
 
 @interface EOSFTPServer: NSObject
 {
@@ -138,8 +139,8 @@ FOUNDATION_EXPORT EOSFTPServerCommand EOSFTPServerCommandNOOP;
 - ( NSString * )messageForReplyCode: ( EOSFTPServerReplyCode )code;
 - ( void )processCommand: ( NSString * )command connection: ( EOSFTPServerConnection * )connection;
 - ( NSString * )formattedMessage: ( NSString * )message code: ( EOSFTPServerReplyCode )code;
-- ( NSString * )absolutePathForConnection: ( EOSFTPServerConnection * )connection subPath: ( NSString * )path;
-- ( NSString * )serverPathForConnection: ( EOSFTPServerConnection * )connection subPath: ( NSString * )path;
+- ( EOSFile * )fileAtPath: ( NSString * )path connection: ( EOSFTPServerConnection * )connection;
+- ( NSString * )serverPathForFile: ( EOSFile * )file;
 - ( NSUInteger )getPASVDataPort;
 
 @end
diff --git a/EOSFTPServer/FTPServer/Classes/EOSFTPServer.m b/EOSFTPServer/FTPServer/Classes/EOSFTPServer.m
@@ -45,6 +45,7 @@
 #import "EOSFTPServerConnection.h"
 #import "NSString+EOS.h"
 #import "AsyncSocket.h"
+#import "EOSFile.h"
 
 NSString * const EOSFTPServerException = @"EOSFTPServerException";
 
@@ -93,7 +94,6 @@ @implementation EOSFTPServer
 @synthesize welcomeMessage      = _welcomeMessage;
 @synthesize quitMessage         = _quitMessage;
 @synthesize chroot              = _chroot;
-@synthesize rootDirectory       = _rootDirectory;
 @synthesize allowAnonymousUsers = _allowAnonymousUsers;
 @synthesize delegate            = _delegate;
 
@@ -946,50 +946,56 @@ - ( NSString * )formattedMessage: ( NSString * )message code: ( EOSFTPServerRepl
     return formattedMessage;
 }
 
-- ( NSString * )absolutePathForConnection: ( EOSFTPServerConnection * )connection subPath: ( NSString * )path
+- ( EOSFile * )fileAtPath: ( NSString * )path connection: ( EOSFTPServerConnection * )connection
 {
-    NSString * root;
-
-    root = ( [ _rootDirectory hasSuffix: @"/" ] ) ? [ _rootDirectory substringToIndex: _rootDirectory.length - 2 ] : _rootDirectory;
-
-    if( [ path hasPrefix: @"/" ] == NO )
+    if( path.length == 0 )
+    {
+        path = connection.currentDirectory;
+    }
+    else if( [ path hasPrefix: @"/" ] == NO )
     {
         path = [ connection.currentDirectory stringByAppendingPathComponent: path ];
     }
+    else if( _chroot == YES && [ path isEqualToString: @"/" ] == YES )
+    {
+        path = _rootDirectory;
+    }
+    else if( _chroot == YES && [ path hasPrefix: @"/" ] == YES )
+    {
+        path = [ _rootDirectory stringByAppendingPathComponent: path ];
+    }
 
-    if( _chroot == YES )
+    if( _chroot == YES && [ path hasPrefix: _rootDirectory ] == NO )
     {
-        if( [ path hasPrefix: root ] == NO )
-        {
-            return nil;
-        }
+        return nil;
+    }
+
+    if( [ [ NSFileManager defaultManager ] fileExistsAtPath: path ] == NO )
+    {
+        return nil;
     }
 
-    return ( [ [ NSFileManager defaultManager ] fileExistsAtPath: path ] ) ? path : nil;
+    return [ EOSFile fileWithPath: path ];
 }
 
-- ( NSString * )serverPathForConnection: ( EOSFTPServerConnection * )connection subPath: ( NSString * )path
+- ( NSString * )serverPathForFile: ( EOSFile * )file
 {
-    NSString * root;
-    NSString * absolutePath;
-
-
-    root         = ( [ _rootDirectory hasSuffix: @"/" ] ) ? [ _rootDirectory substringToIndex: _rootDirectory.length - 2 ] : _rootDirectory;
-    absolutePath = [ self absolutePathForConnection: connection subPath: path ];
-
-    if( absolutePath == nil )
+    if( file == nil )
     {
         return nil;
     }
 
-    if( _chroot == YES )
+    if( _chroot == NO )
     {
-        absolutePath = [ absolutePath substringFromIndex: root.length ];
-
-        return ( [ absolutePath hasPrefix: @"/" ] == YES ) ? [ absolutePath substringFromIndex: 1 ] : absolutePath;
+        return file.path;
+    }
+
+    if( [ file.path hasPrefix: _rootDirectory ] == YES )
+    {
+        return [ file.path substringFromIndex: _rootDirectory.length - 1 ];
     }
 
-    return absolutePath;
+    return nil;
 }
 
 - ( NSUInteger )getPASVDataPort
@@ -1011,4 +1017,42 @@ - ( NSUInteger )getPASVDataPort
     return port;
 }
 
+- ( NSString * )rootDirectory
+{
+    @synchronized( self )
+    {
+        return _rootDirectory;
+    }
+}
+
+- ( void )setRootDirectory: ( NSString * )path
+{
+    BOOL isDir;
+
+    @synchronized( self )
+    {
+        [ _rootDirectory release ];
+
+        isDir          = NO;
+        _rootDirectory = nil;
+
+        if( [ path hasSuffix: @"/" ] == NO )
+        {
+            path = [ path stringByAppendingString: @"/" ];
+        }
+
+        if( [ [ NSFileManager defaultManager ] fileExistsAtPath: path isDirectory: &isDir ] == NO )
+        {
+            @throw [ NSException exceptionWithName: EOSFTPServerException reason: [ NSString stringWithFormat: @"Path %@ does not exist", path ] userInfo: nil ];
+        }
+
+        if( isDir == NO )
+        {
+            @throw [ NSException exceptionWithName: EOSFTPServerException reason: [ NSString stringWithFormat: @"Path %@ is not a directory", path ] userInfo: nil ];
+        }
+
+        _rootDirectory = [ path copy ];
+    }
+}
+
 @end