ftpd 2.0.1 → 2.0.2

data/lib/ftpd/session.rb

@@ -49,44 +49,35 @@ module Ftpd
       @command_loop.read_and_execute_commands
     end
 
-    private
-
-    def register_commands
-      handlers = CommandHandlerFactory.standard_command_handlers
-      handlers.each do |klass|
-        @command_handlers << klass.new(self)
-      end
-    end
-
     def valid_command?(command)
       @command_handlers.has?(command)
     end
-
+    
     def execute_command command, argument
       @command_handlers.execute command, argument
     end
-
+    
     def ensure_logged_in
       return if @logged_in
       error "Not logged in", 530
     end
-
+    
     def ensure_tls_supported
       unless tls_enabled?
         error "TLS not enabled", 534
       end
     end
-
+    
     def ensure_not_epsv_all
       if @epsv_all
         error "Not allowed after EPSV ALL", 501
       end
     end
-
+    
     def tls_enabled?
       @config.tls != :off
     end
-
+    
     def ensure_protocol_supported(protocol_code)
       unless @protocols.supports_protocol?(protocol_code)
         protocol_list = @protocols.protocol_codes.join(',')
@@ -94,15 +85,15 @@ module Ftpd
               "use (#{protocol_list})", 522)
       end
     end
-
+    
     def supported_commands
       @command_handlers.commands.map(&:upcase)
     end
-
+    
     def pwd(status_code)
       reply %Q(#{status_code} "#{@name_prefix}" is current directory)
     end
-
+    
     FORMAT_TYPES = {
       'N'=>['Non-print', true],
       'T'=>['Telnet format effectors', true],
@@ -120,20 +111,16 @@ module Ftpd
       @command_sequence_checker.expect command
     end
 
-    def set_file_system(file_system)
-      @file_system = file_system
-    end
-
     def command_not_needed
       reply '202 Command not needed at this site'
     end
-
+    
     def close_data_server_socket
       return unless @data_server
       @data_server.close
       @data_server = nil
     end
-
+    
     def reply(s)
       if @config.response_delay.to_i != 0
         @config.log.warn "#{@config.response_delay} second delay before replying"
@@ -143,6 +130,43 @@ module Ftpd
       @socket.write s + "\r\n"
     end
 
+    def login(*auth_tokens)
+      user = auth_tokens.first
+      unless authenticate(*auth_tokens)
+        failed_auth
+        error "Login incorrect", 530
+      end
+      reply "230 Logged in"
+      set_file_system @config.driver.file_system(user)
+      @logged_in = true
+      reset_failed_auths
+    end
+
+    def set_active_mode_address(address, port)
+      if port > 0xffff || port < 1024 && !@config.allow_low_data_ports
+        error "Command not implemented for that parameter", 504
+      end
+      @data_hostname = address
+      @data_port = port
+    end
+
+    def server_name_and_version
+      "#{@config.server_name} #{@config.server_version}"
+    end
+
+    private
+
+    def register_commands
+      handlers = CommandHandlerFactory.standard_command_handlers
+      handlers.each do |klass|
+        @command_handlers << klass.new(self)
+      end
+    end
+    
+    def set_file_system(file_system)
+      @file_system = file_system
+    end
+    
     def init_command_sequence_checker
       checker = CommandSequenceChecker.new
       checker.must_expect 'acct'
@@ -157,19 +181,7 @@ module Ftpd
       end
       @config.driver.authenticate(*args)
     end
-
-    def login(*auth_tokens)
-      user = auth_tokens.first
-      unless authenticate(*auth_tokens)
-        failed_auth
-        error "Login incorrect", 530
-      end
-      reply "230 Logged in"
-      set_file_system @config.driver.file_system(user)
-      @logged_in = true
-      reset_failed_auths
-    end
-
+    
     def set_socket_options
       disable_nagle @socket
       receive_oob_data_inline @socket
@@ -195,15 +207,7 @@ module Ftpd
         throw :done
       end
     end
-
-    def set_active_mode_address(address, port)
-      if port > 0xffff || port < 1024 && !@config.allow_low_data_ports
-        error "Command not implemented for that parameter", 504
-      end
-      @data_hostname = address
-      @data_port = port
-    end
-
+    
     def initialize_session
       @logged_in = false
       @data_type = 'A'
@@ -218,10 +222,6 @@ module Ftpd
       close_data_server_socket
       reset_failed_auths
     end
-
-    def server_name_and_version
-      "#{@config.server_name} #{@config.server_version}"
-    end
-
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Wayne Conrad
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
@@ -54,24 +54,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,10 +142,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
-description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
-  TLS, IPV6, passive and active mode, and is unconditionally compliant per RFC-1123.  It
-  can be used as part of a test fixture or embedded in a program.
-email: wconrad@yagni.com
+description: "ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
+  TLS, IPV6, passive and active mode, and is unconditionally compliant per \x01.  It
+  can be used as part of a test fixture or embedded in a program."
+email: kf7qga@gmail.com
 executables:
 - ftpdrb
 extensions: []
@@ -167,7 +153,6 @@ extra_rdoc_files:
 - LICENSE.md
 - README.md
 files:
-- ".travis.yml"
 - ".yardopts"
 - Changelog.md
 - Gemfile
@@ -183,111 +168,7 @@ files:
 - examples/example.rb
 - examples/example_spec.rb
 - examples/hello_world.rb
-- features/example/eplf.feature
-- features/example/example.feature
-- features/example/read_only.feature
-- features/example/step_definitions/example_server.rb
-- features/ftp_server/abort.feature
-- features/ftp_server/allo.feature
-- features/ftp_server/append.feature
-- features/ftp_server/cdup.feature
-- features/ftp_server/command_errors.feature
-- features/ftp_server/concurrent_sessions.feature
-- features/ftp_server/delay_after_failed_login.feature
-- features/ftp_server/delete.feature
-- features/ftp_server/directory_navigation.feature
-- features/ftp_server/disconnect_after_failed_logins.feature
-- features/ftp_server/eprt.feature
-- features/ftp_server/epsv.feature
-- features/ftp_server/features.feature
-- features/ftp_server/file_structure.feature
-- features/ftp_server/get.feature
-- features/ftp_server/get_ipv6.feature
-- features/ftp_server/get_tls.feature
-- features/ftp_server/help.feature
-- features/ftp_server/implicit_tls.feature
-- features/ftp_server/invertability.feature
-- features/ftp_server/list.feature
-- features/ftp_server/list_tls.feature
-- features/ftp_server/logging.feature
-- features/ftp_server/login_auth_level_account.feature
-- features/ftp_server/login_auth_level_password.feature
-- features/ftp_server/login_auth_level_user.feature
-- features/ftp_server/max_connections.feature
-- features/ftp_server/mdtm.feature
-- features/ftp_server/mkdir.feature
-- features/ftp_server/mode.feature
-- features/ftp_server/name_list.feature
-- features/ftp_server/name_list_tls.feature
-- features/ftp_server/noop.feature
-- features/ftp_server/options.feature
-- features/ftp_server/pasv.feature
-- features/ftp_server/port.feature
-- features/ftp_server/put.feature
-- features/ftp_server/put_tls.feature
-- features/ftp_server/put_unique.feature
-- features/ftp_server/quit.feature
-- features/ftp_server/reinitialize.feature
-- features/ftp_server/rename.feature
-- features/ftp_server/rmdir.feature
-- features/ftp_server/site.feature
-- features/ftp_server/size.feature
-- features/ftp_server/status.feature
-- features/ftp_server/step_definitions/logging.rb
-- features/ftp_server/step_definitions/test_server.rb
-- features/ftp_server/structure_mount.feature
-- features/ftp_server/syntax_errors.feature
-- features/ftp_server/syst.feature
-- features/ftp_server/timeout.feature
-- features/ftp_server/type.feature
-- features/step_definitions/append.rb
-- features/step_definitions/client.rb
-- features/step_definitions/client_and_server_files.rb
-- features/step_definitions/client_files.rb
-- features/step_definitions/command.rb
-- features/step_definitions/connect.rb
-- features/step_definitions/delete.rb
-- features/step_definitions/directory_navigation.rb
-- features/step_definitions/error_replies.rb
-- features/step_definitions/features.rb
-- features/step_definitions/file_structure.rb
-- features/step_definitions/generic_send.rb
-- features/step_definitions/get.rb
-- features/step_definitions/help.rb
-- features/step_definitions/invalid_commands.rb
-- features/step_definitions/ipv6.rb
-- features/step_definitions/line_endings.rb
-- features/step_definitions/list.rb
-- features/step_definitions/login.rb
-- features/step_definitions/mkdir.rb
-- features/step_definitions/mode.rb
-- features/step_definitions/mtime.rb
-- features/step_definitions/noop.rb
-- features/step_definitions/options.rb
-- features/step_definitions/passive.rb
-- features/step_definitions/pending.rb
-- features/step_definitions/port.rb
-- features/step_definitions/put.rb
-- features/step_definitions/quit.rb
-- features/step_definitions/rename.rb
-- features/step_definitions/rmdir.rb
-- features/step_definitions/server_files.rb
-- features/step_definitions/server_title.rb
-- features/step_definitions/size.rb
-- features/step_definitions/status.rb
-- features/step_definitions/success_replies.rb
-- features/step_definitions/system.rb
-- features/step_definitions/timing.rb
-- features/step_definitions/type.rb
-- features/support/env.rb
-- features/support/example_server.rb
-- features/support/file_templates/ascii_unix
-- features/support/file_templates/ascii_windows
-- features/support/file_templates/binary
-- features/support/test_client.rb
-- features/support/test_file_templates.rb
-- features/support/test_server.rb
-- features/support/test_server_files.rb
+- examples/write_only.rb
 - ftpd.gemspec
 - insecure-test-cert.pem
 - lib/ftpd.rb
@@ -366,30 +247,6 @@ files:
 - lib/ftpd/temp_dir.rb
 - lib/ftpd/tls_server.rb
 - lib/ftpd/translate_exceptions.rb
-- rake_tasks/cucumber.rake
-- rake_tasks/default.rake
-- rake_tasks/jeweler.rake
-- rake_tasks/spec.rake
-- rake_tasks/test.rake
-- rake_tasks/yard.rake
-- spec/command_sequence_checker_spec.rb
-- spec/connection_throttle_spec.rb
-- spec/connection_tracker_spec.rb
-- spec/data_server_factory_spec.rb
-- spec/disk_file_system_spec.rb
-- spec/exception_translator_spec.rb
-- spec/file_info_spec.rb
-- spec/ftp_server_error_spec.rb
-- spec/list_format/eplf_spec.rb
-- spec/list_format/ls_spec.rb
-- spec/list_path_spec.rb
-- spec/null_logger_spec.rb
-- spec/protocols_spec.rb
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- spec/telnet_spec.rb
-- spec/translate_exceptions_spec.rb
-- testlib/network.rb
 homepage: http://github.com/wconrad/ftpd
 licenses:
 - MIT
@@ -402,7 +259,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -410,8 +267,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library
 test_files: []
+has_rdoc: 

data/.travis.yml

@@ -1,6 +0,0 @@
-language: ruby
-rvm:
-- 1.9.3
-- 2.0
-- 2.1
-- 2.2

data/features/example/eplf.feature

@@ -1,14 +0,0 @@
-Feature: Example
-
-  As a programmer
-  I want to enable EPLF list format
-  So that I can test this library with an EPLF client
-
-  Background:
-    Given the example has argument "--eplf"
-    And the example server is started
-
-  Scenario: List directory
-    Given a successful login
-    When the client successfully lists the directory
-    Then the list should be in EPLF format

data/features/example/example.feature

@@ -1,18 +0,0 @@
-Feature: Example
-
-  As a programmer
-  I want to connect to the example
-  So that I can try this libary with an arbitrary FTP client
-
-  Background:
-    Given the example server is started
-
-  Scenario: Normal connection
-    Given a successful login
-    Then the server returns no error
-    And the client should be logged in
-
-  Scenario: Fetch README
-    Given a successful login
-    When the client successfully gets text "README"
-    Then the local file "README" should match the remote file