ftpd 1.1.1 → 2.0.0

data/features/support/test_server_files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TestServerFiles
 
   def add_file(path)

data/ftpd.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ftpd 1.1.1 ruby lib
+# stub: ftpd 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "1.1.1"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Wayne Conrad"]
-  s.date = "2014-11-22"
+  s.date = "2016-06-02"
   s.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."
   s.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [
@@ -106,6 +106,7 @@ Gem::Specification.new do |s|
     "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",
@@ -190,6 +191,9 @@ Gem::Specification.new do |s|
     "lib/ftpd/connection_throttle.rb",
     "lib/ftpd/connection_tracker.rb",
     "lib/ftpd/data_connection_helper.rb",
+    "lib/ftpd/data_server_factory.rb",
+    "lib/ftpd/data_server_factory/random_ephemeral_port.rb",
+    "lib/ftpd/data_server_factory/specific_port_range.rb",
     "lib/ftpd/disk_file_system.rb",
     "lib/ftpd/error.rb",
     "lib/ftpd/exception_translator.rb",
@@ -222,6 +226,7 @@ Gem::Specification.new do |s|
     "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",
@@ -234,11 +239,12 @@ Gem::Specification.new do |s|
     "spec/server_spec.rb",
     "spec/spec_helper.rb",
     "spec/telnet_spec.rb",
-    "spec/translate_exceptions_spec.rb"
+    "spec/translate_exceptions_spec.rb",
+    "testlib/network.rb"
   ]
   s.homepage = "http://github.com/wconrad/ftpd"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.4"
+  s.rubygems_version = "2.4.8"
   s.summary = "Pure Ruby FTP server library"
 
   if s.respond_to? :specification_version then
@@ -246,10 +252,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<memoizer>, ["~> 1.0"])
-      s.add_development_dependency(%q<cucumber>, ["~> 1.3"])
+      s.add_development_dependency(%q<cucumber>, ["~> 2.0"])
       s.add_development_dependency(%q<double-bag-ftps>, ["~> 0.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<rake>, ["~> 10.3"])
+      s.add_development_dependency(%q<rake>, ["~> 11.1"])
       s.add_development_dependency(%q<redcarpet>, ["~> 3.1"])
       s.add_development_dependency(%q<rspec>, ["~> 3.1"])
       s.add_development_dependency(%q<rspec-its>, ["~> 1.0"])
@@ -257,10 +263,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yard>, ["~> 0.8.7"])
     else
       s.add_dependency(%q<memoizer>, ["~> 1.0"])
-      s.add_dependency(%q<cucumber>, ["~> 1.3"])
+      s.add_dependency(%q<cucumber>, ["~> 2.0"])
       s.add_dependency(%q<double-bag-ftps>, ["~> 0.1"])
       s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<rake>, ["~> 10.3"])
+      s.add_dependency(%q<rake>, ["~> 11.1"])
       s.add_dependency(%q<redcarpet>, ["~> 3.1"])
       s.add_dependency(%q<rspec>, ["~> 3.1"])
       s.add_dependency(%q<rspec-its>, ["~> 1.0"])
@@ -269,10 +275,10 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<memoizer>, ["~> 1.0"])
-    s.add_dependency(%q<cucumber>, ["~> 1.3"])
+    s.add_dependency(%q<cucumber>, ["~> 2.0"])
     s.add_dependency(%q<double-bag-ftps>, ["~> 0.1"])
     s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<rake>, ["~> 10.3"])
+    s.add_dependency(%q<rake>, ["~> 11.1"])
     s.add_dependency(%q<redcarpet>, ["~> 3.1"])
     s.add_dependency(%q<rspec>, ["~> 3.1"])
     s.add_dependency(%q<rspec-its>, ["~> 1.0"])

data/lib/ftpd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Standard libraries
 require 'fileutils'
 require 'forwardable'

data/lib/ftpd/auth_levels.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ftpd
 
   # Authorization levels for FtpServer#auth_level

data/lib/ftpd/cmd_abor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_allo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_appe.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_auth.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_cdup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_cwd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_dele.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_eprt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_epsv.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
+require_relative 'data_server_factory'
 
 module Ftpd
 
@@ -17,8 +20,7 @@ module Ftpd
           if protocol_code
             ensure_protocol_supported protocol_code
           end
-          interface = socket.addr[3]
-          self.data_server = TCPServer.new(interface, 0)
+          self.data_server = data_server_factory.make_tcp_server
           port = data_server.addr[1]
           reply "229 Entering extended passive mode (|||#{port}|)"
         end

data/lib/ftpd/cmd_feat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_mdtm.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true 
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_mkd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_mode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_nlst.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_noop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_opts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_pasv.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
+require_relative 'data_server_factory'
 
 module Ftpd
 
@@ -10,9 +13,8 @@ module Ftpd
       if data_server
         reply "200 Already in passive mode"
       else
-        interface = socket.addr[3]
-        self.data_server = TCPServer.new(interface, 0)
-        ip = data_server.addr[3]
+        self.data_server = data_server_factory.make_tcp_server
+        ip = config.nat_ip || data_server.addr[3]
         port = data_server.addr[1]
         quads = [
           ip.scan(/\d+/),

data/lib/ftpd/cmd_pbsz.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_port.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_prot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_pwd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_quit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_rein.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_rename.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_rest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_retr.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_rmd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_site.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_size.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_smnt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_stat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_stor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_stou.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_stru.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_syst.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/cmd_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'command_handler'
 
 module Ftpd

data/lib/ftpd/command_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'data_connection_helper'
 require_relative 'error'
 require_relative 'file_system_helper'
@@ -55,6 +57,7 @@ module Ftpd
     :data_port,
     :data_server,
     :data_server=,
+    :data_server_factory,
     :data_type,
     :data_type=,
     :ensure_logged_in,

data/lib/ftpd/command_handler_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ftpd
 
   class CommandHandlerFactory