ftpd 1.1.1 → 2.0.0

data/features/step_definitions/features.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully requests features$/ do
   @feature_reply = client.raw "FEAT"
 end

data/features/step_definitions/file_structure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully sets file structure "(.*?)"$/ do
 |file_structure|
   client.raw 'STRU', file_structure

data/features/step_definitions/generic_send.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully sends "(.*?)"$/ do |command|
   @reply = client.raw command
 end

data/features/step_definitions/get.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully gets (text|binary) "(.*?)"$/ \
 do |mode, remote_path|
   client.get mode, remote_path

data/features/step_definitions/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully asks for help(?: for "(.*?)")?$/ do
 |command|
   @help_reply = client.help(command)

data/features/step_definitions/invalid_commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client sends an empty command$/ do
   capture_error do
     client.raw ''

data/features/step_definitions/ipv6.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require_relative "../../testlib/network"
+
+include TestLib::Network
+
+Given /^the stack supports ipv6$/ do
+  unless ipv6_supported?
+    pending "Test skipped: stack does not support ipv6"
+  end
+end

data/features/step_definitions/line_endings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def line_ending_type(s)
   if s =~ /\r\n/
     :windows

data/features/step_definitions/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class FileList
 
   def initialize(lines)

data/features/step_definitions/login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 def logged_in?
   step "the client lists the directory"
   @error.nil?

data/features/step_definitions/mkdir.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client makes directory "(.*?)"$/ do |path|
   capture_error do
     step %Q(the client successfully makes directory "#{path}")

data/features/step_definitions/mode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully sets mode "(.*?)"$/ do |mode|
   client.raw 'MODE', mode
 end

data/features/step_definitions/mtime.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 When /^the client successfully gets mtime of "(.*?)"$/ \

data/features/step_definitions/noop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the( \w+)? client successfully does nothing( with a parameter)?$/ do
 |client_name, with_param|
   if with_param

data/features/step_definitions/options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully sets option "(.*?)"$/ do |option|
   client.set_option option
 end

data/features/step_definitions/passive.rb

@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
 Given /^the client is in (passive|active) mode$/ do |mode|
   client.passive = mode == 'passive'
 end
+
+Then(/^the server advertises passive IP (\S+)$/) do |ip|
+  quads = @reply.scan(/\d+/)[1..4].join(".")
+  expect(quads).to eq ip
+end

data/features/step_definitions/pending.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Given /^PENDING/ do
   pending
 end

data/features/step_definitions/port.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client sends PORT "(.*?)"$/ do |param|
   capture_error do
     client.raw 'PORT', param

data/features/step_definitions/put.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully puts (text|binary) "(.*?)"$/ do
 |mode, local_path|
   client.put mode, local_path

data/features/step_definitions/quit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully quits$/ do
   client.quit
 end

data/features/step_definitions/rename.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client renames "(.*?)" to "(.*?)"$/ do
 |from_path, to_path|
   capture_error do

data/features/step_definitions/rmdir.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client removes directory "(.*?)"$/ do |path|
   capture_error do
     step %Q(the client successfully removes directory "#{path}")

data/features/step_definitions/server_files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 Given /^the server has directory "(.*?)"$/ do |remote_path|

data/features/step_definitions/server_title.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then /^the server returns its title$/ do
   step 'the server returns its name'
   step 'the server returns its version'

data/features/step_definitions/size.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully gets size of (text|binary) "(.*?)"$/ \
 do |mode, remote_path|
   @size = client.get_size mode, remote_path

data/features/step_definitions/status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully requests status$/ do
   @response = client.status
 end

data/features/step_definitions/success_replies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Then /^the server returns a "(.*?)" reply$/ do |reply|
   expect(@reply).to eq reply + "\n"
 end

data/features/step_definitions/system.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
+
 When /^the client successfully queries system ID$/ do
   @reply = client.system
+  # Prior to ruby-2.3.0, the #system call returned a string ending in
+  # a new-line.
+  @reply += "\n" unless @reply =~ /\n$/
 end
 
 Then /^the server returns a system ID reply$/ do

data/features/step_definitions/timing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Before do
   @start_time = Time.now
 end

data/features/step_definitions/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 When /^the client successfully sets type "(.*?)"$/ do |type|
   client.raw 'TYPE', type
 end

data/features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path('../../lib', File.dirname(__FILE__))
 
 require 'ftpd'

data/features/support/example_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'forwardable'
 require File.expand_path('test_server_files',
@@ -50,7 +52,7 @@ class ExampleServer
   private
 
   def read_output
-    output = ''
+    output = ''.dup
     loop do
       line = @io.gets
       break if line.nil?

data/features/support/test_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'double_bag_ftps'
 require 'net/ftp'
 
@@ -20,10 +22,11 @@ class TestClient
 
   def close
     return unless @ftp
-    @ftp.close
+    ftp.close
+    @ftp = nil
   end
 
-  def_delegators :@ftp,
+  def_delegators :ftp,
   :chdir,
   :connect,
   :delete,
@@ -54,33 +57,33 @@ class TestClient
     socket.connect(out_addr)
     decorate_socket socket
     @ftp = make_ftp
-    @ftp.set_socket(socket)
+    ftp.set_socket(socket)
   end
 
   def raw(*command)
-    @ftp.sendcmd command.compact.join(' ')
+    ftp.sendcmd command.compact.join(' ')
   end
 
   def get(mode, remote_path)
     method = "get#{mode}file"
-    @ftp.send method, remote_path, local_path(remote_path)
+    ftp.send method, remote_path, local_path(remote_path)
   end
 
   def put(mode, remote_path)
     method = "put#{mode}file"
-    @ftp.send method, local_path(remote_path), remote_path
+    ftp.send method, local_path(remote_path), remote_path
   end
 
   def get_size(mode, remote_path)
     raise unless ['binary', 'text'].include?(mode)
-    @ftp.binary = mode == 'binary'
+    ftp.binary = mode == 'binary'
     override_with_binary do
-      @ftp.size(remote_path)
+      ftp.size(remote_path)
     end
   end
 
   def get_mtime(remote_path)
-    @ftp.mtime(remote_path)
+    ftp.mtime(remote_path)
   end
 
   def add_file(path)
@@ -100,34 +103,34 @@ class TestClient
   end
 
   def xpwd
-    response = @ftp.sendcmd('XPWD')
+    response = ftp.sendcmd('XPWD')
     response[/"(.+)"/, 1]
   end
 
   def store_unique(local_path, remote_path)
     command = ['STOU', remote_path].compact.join(' ')
     File.open(temp_path(local_path), 'rb') do |file|
-      @ftp.storbinary command, file, Net::FTP::DEFAULT_BLOCKSIZE
+      ftp.storbinary command, file, Net::FTP::DEFAULT_BLOCKSIZE
     end
   end
 
   def append_binary(local_path, remote_path)
     command = ['APPE', remote_path].compact.join(' ')
     File.open(temp_path(local_path), 'rb') do |file|
-      @ftp.storbinary command, file, Net::FTP::DEFAULT_BLOCKSIZE
+      ftp.storbinary command, file, Net::FTP::DEFAULT_BLOCKSIZE
     end
   end
 
   def append_text(local_path, remote_path)
     command = ['APPE', remote_path].compact.join(' ')
     File.open(temp_path(local_path), 'rb') do |file|
-      @ftp.storlines command, file
+      ftp.storlines command, file
     end
   end
 
   def connected?
     begin
-      @ftp.noop
+      ftp.noop
       true
     rescue Net::FTPTempError => e
       !!e.to_s =~ /^421/
@@ -137,13 +140,18 @@ class TestClient
   end
 
   def set_option(option)
-    @ftp.sendcmd "OPTS #{option}"
+    ftp.sendcmd "OPTS #{option}"
   end
 
   private
-
+  
   RAW_METHOD_REGEX = /^send_(.*)$/
 
+  def ftp
+    raise "Not started" unless @ftp
+    @ftp
+  end
+
   def local_path(remote_path)
     temp_path(File.basename(remote_path))
   end
@@ -207,12 +215,12 @@ class TestClient
   end
 
   def override_with_binary
-    orig = @ftp.override_with_binary
+    orig = ftp.override_with_binary
     begin
-      @ftp.override_with_binary = true
+      ftp.override_with_binary = true
       yield
     ensure
-      @ftp.override_with_binary = orig
+      ftp.override_with_binary = orig
     end
   end
 

data/features/support/test_file_templates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestFileTemplates
 
   def [](filename)

data/features/support/test_server.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'forwardable'
 require 'stringio'
@@ -209,24 +211,22 @@ class TestServer
     @temp_dir = Ftpd::TempDir.make
     @log_device = StringIO.new
     @driver = TestServerDriver.new(@temp_dir)
-    @server = Ftpd::FtpServer.new(@driver)
-    @server.certfile_path = insecure_certfile_path
     @templates = TestFileTemplates.new
-    self.tls = :off
   end
 
-  def_delegator :@server, :'allow_low_data_ports='
-  def_delegator :@server, :'auth_level'
-  def_delegator :@server, :'auth_level='
-  def_delegator :@server, :'failed_login_delay='
-  def_delegator :@server, :'interface='
-  def_delegator :@server, :'max_connections='
-  def_delegator :@server, :'max_connections_per_ip='
-  def_delegator :@server, :'max_failed_logins='
-  def_delegator :@server, :'server_name'
-  def_delegator :@server, :'server_name='
-  def_delegator :@server, :'session_timeout='
-  def_delegator :@server, :'tls='
+  def_delegator :server, :'allow_low_data_ports='
+  def_delegator :server, :'auth_level'
+  def_delegator :server, :'auth_level='
+  def_delegator :server, :'failed_login_delay='
+  def_delegator :server, :'interface='
+  def_delegator :server, :'max_connections='
+  def_delegator :server, :'max_connections_per_ip='
+  def_delegator :server, :'max_failed_logins='
+  def_delegator :server, :'nat_ip='
+  def_delegator :server, :'server_name'
+  def_delegator :server, :'server_name='
+  def_delegator :server, :'session_timeout='
+  def_delegator :server, :'tls='
 
   def_delegator :@driver, :'append='
   def_delegator :@driver, :'delete='
@@ -242,16 +242,16 @@ class TestServer
   end
 
   def start
-    @server.log = make_log
-    @server.start
+    server.log = make_log
+    server.start
   end
 
   def stop
-    @server.stop
+    server.stop
   end
 
   def host
-    @server.interface
+    server.interface
   end
 
   def user
@@ -267,7 +267,7 @@ class TestServer
   end
 
   def port
-    @server.bound_port
+    server.bound_port
   end
 
   def template(path)
@@ -276,6 +276,17 @@ class TestServer
 
   private
 
+  def server
+    @server ||= make_server
+  end
+
+  def make_server
+    s = Ftpd::FtpServer.new(@driver)
+    s.certfile_path = insecure_certfile_path
+    s.tls = :off
+    s
+  end
+
   def temp_dir
     @temp_dir
   end