ftpd 0.1.1 → 0.2.0

data/lib/ftpd/session.rb

@@ -24,7 +24,7 @@ module Ftpd
     end
 
     def run
-      reply "220 FakeFtpServer"
+      reply "220 ftpd"
       @state = :user
       catch :done do
         loop do
@@ -37,7 +37,7 @@ module Ftpd
             end
             method = 'cmd_' + command
             unless self.class.private_method_defined?(method)
-              error "502 Command not implemented: #{command}"
+              unimplemented
             end
             send(method, argument)
           rescue CommandError => e
@@ -89,6 +89,17 @@ module Ftpd
       "user",
     ]
 
+    def cmd_allo(argument)
+      ensure_logged_in
+      syntax_error unless argument =~ /^\d+( R \d+)?$/
+      command_not_needed
+    end
+
+    def cmd_syst(argument)
+      syntax_error if argument
+      reply "215 UNIX Type: L8"
+    end
+
     def cmd_user(argument)
       syntax_error unless argument
       bad_sequence unless @state == :user
@@ -101,6 +112,10 @@ module Ftpd
       error "503 Bad sequence of commands"
     end
 
+    def unimplemented
+      error "502 Command not implemented"
+    end
+
     def cmd_pass(argument)
       syntax_error unless argument
       bad_sequence unless @state == :password
@@ -143,6 +158,7 @@ module Ftpd
     def cmd_stor(argument)
       close_data_server_socket_when_done do
         ensure_logged_in
+        ensure_write_supported
         path = argument
         syntax_error unless path
         path = File.expand_path(path, @name_prefix)
@@ -157,6 +173,7 @@ module Ftpd
     def cmd_retr(argument)
       close_data_server_socket_when_done do
         ensure_logged_in
+        ensure_read_supported
         path = argument
         syntax_error unless path
         path = File.expand_path(path, @name_prefix)
@@ -169,6 +186,7 @@ module Ftpd
 
     def cmd_dele(argument)
       ensure_logged_in
+      ensure_delete_supported
       path = argument
       error "501 Path required" unless path
       path = File.expand_path(path, @name_prefix)
@@ -179,38 +197,29 @@ module Ftpd
     end
 
     def cmd_list(argument)
-      ls(argument, :list_long)
-    end
-
-    def cmd_nlst(argument)
-      ls(argument, :list_short)
-    end
-
-    def ls(path, file_system_method)
       close_data_server_socket_when_done do
         ensure_logged_in
+        ensure_list_supported
+        path = argument
         path ||= '.'
         path = File.expand_path(path, @name_prefix)
-        list = @file_system.send(file_system_method, path)
+        list = @file_system.list(path)
         transmit_file(list, 'A')
       end
     end
 
-    def realpath(pathname)
-      handle_system_error do
-        basename = File.basename(pathname.to_s)
-        if is_glob?(basename)
-          pathname.dirname.realpath + basename
-        else
-          pathname.realpath
-        end
+    def cmd_nlst(argument)
+      close_data_server_socket_when_done do
+        ensure_logged_in
+        ensure_name_list_supported
+        path = argument
+        path ||= '.'
+        path = File.expand_path(path, @name_prefix)
+        list = @file_system.name_list(path)
+        transmit_file(list, 'A')
       end
     end
 
-    def is_glob?(filename)
-      filename =~ /[.*]/
-    end
-
     def cmd_type(argument)
       ensure_logged_in
       syntax_error unless argument =~ /^(\S)(?: (\S+))?$/
@@ -317,6 +326,36 @@ module Ftpd
       end
     end
 
+    def ensure_write_supported
+      unless @file_system.respond_to?(:write)
+        unimplemented
+      end
+    end
+
+    def ensure_read_supported
+      unless @file_system.respond_to?(:read)
+        unimplemented
+      end
+    end
+
+    def ensure_delete_supported
+      unless @file_system.respond_to?(:delete)
+        unimplemented
+      end
+    end
+
+    def ensure_list_supported
+      unless @file_system.respond_to?(:list)
+        unimplemented
+      end
+    end
+
+    def ensure_name_list_supported
+      unless @file_system.respond_to?(:name_list)
+        unimplemented
+      end
+    end
+
     def tls_enabled?
       @tls != :off
     end
@@ -413,18 +452,6 @@ module Ftpd
       @file_system = FileSystemErrorTranslator.new(file_system)
     end
 
-    def child_path_of?(parent, child)
-      child.cleanpath.to_s.index(parent.cleanpath.to_s) == 0
-    end
-
-    def handle_system_error
-      begin
-        yield
-      rescue SystemCallError => e
-        error "550 #{e}"
-      end
-    end
-
     def transmit_file(contents, data_type = @data_type)
       open_data_connection do |data_socket|
         contents = unix_to_nvt_ascii(contents) if data_type == 'A'
@@ -477,6 +504,10 @@ module Ftpd
       ].compact.join(' ')
     end
 
+    def command_not_needed
+      reply '202 Command not needed at this site'
+    end
+
     def encrypt_data?
       @data_channel_protection_level != :clear
     end

data/spec/disk_file_system_spec.rb

@@ -155,10 +155,10 @@ module Ftpd
 
     end
 
-    describe '#list_short' do
+    describe '#name_list' do
 
       subject do
-        disk_file_system.list_short(path)
+        disk_file_system.name_list(path)
       end
 
       shared_examples 'returns short list of root' do
@@ -195,10 +195,10 @@ module Ftpd
 
     end
 
-    describe '#list_long' do
+    describe '#list' do
 
       subject do
-        disk_file_system.list_long(path)
+        disk_file_system.list(path)
       end
 
       shared_examples 'returns long list of root' do

data/spec/file_system_error_translator_spec.rb

@@ -0,0 +1,43 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+module Ftpd
+  describe FileSystemErrorTranslator do
+
+    class MockFileSystem
+
+      def with_error
+        raise FileSystemError, 'An error occurred'
+      end
+
+      def without_error
+        123
+      end
+
+    end
+
+    subject(:translator) do
+      FileSystemErrorTranslator.new(MockFileSystem.new)
+    end
+
+    context 'missing method' do
+      specify do
+        expect {
+          translator.no_such_method
+        }.to raise_error NoMethodError, /no_such_method/
+      end
+    end
+
+    context 'no exception' do
+      its(:without_error) {should == 123}
+    end
+
+    context 'exception' do
+      specify do
+        expect {
+          translator.with_error
+        }.to raise_error CommandError, '450 An error occurred'
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
-  TLS, and is suitable for use by a program such as a test fixture or small FTP daemon.
+  TLS, and can be used as part of a test fixture or to embed in another program.
 email: wconrad@yagni.com
 executables: []
 extensions: []
@@ -132,6 +132,7 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
+- Changelog.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
@@ -142,6 +143,7 @@ files:
 - examples/hello_world.rb
 - features/example/example.feature
 - features/example/step_definitions/example_server.rb
+- features/ftp_server/allo.feature
 - features/ftp_server/command_errors.feature
 - features/ftp_server/concurrent_sessions.feature
 - features/ftp_server/debug.feature
@@ -164,6 +166,7 @@ files:
 - features/ftp_server/step_definitions/debug.rb
 - features/ftp_server/step_definitions/test_server.rb
 - features/ftp_server/syntax_errors.feature
+- features/ftp_server/syst.feature
 - features/ftp_server/type.feature
 - features/step_definitions/client.rb
 - features/step_definitions/client_and_server_files.rb
@@ -172,8 +175,9 @@ files:
 - features/step_definitions/connect.rb
 - features/step_definitions/delete.rb
 - features/step_definitions/directories.rb
-- features/step_definitions/error.rb
+- features/step_definitions/error_replies.rb
 - features/step_definitions/file_structure.rb
+- features/step_definitions/generic_send.rb
 - features/step_definitions/get.rb
 - features/step_definitions/invalid_commands.rb
 - features/step_definitions/line_endings.rb
@@ -187,6 +191,8 @@ files:
 - features/step_definitions/quit.rb
 - features/step_definitions/server_files.rb
 - features/step_definitions/stop_server.rb
+- features/step_definitions/success_replies.rb
+- features/step_definitions/system.rb
 - features/step_definitions/type.rb
 - features/support/env.rb
 - features/support/example_server.rb
@@ -221,6 +227,7 @@ files:
 - sandbox/em-server.rb
 - spec/disk_file_system_spec.rb
 - spec/exception_translator_spec.rb
+- spec/file_system_error_translator_spec.rb
 - spec/spec_helper.rb
 - spec/translate_exceptions_spec.rb
 homepage: http://github.com/wconrad/ftpd
@@ -238,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 564915969
+      hash: 198418525
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: