ftpd 0.5.0 → 0.6.0

data/features/step_definitions/error_replies.rb

@@ -13,6 +13,14 @@ Then /^the server returns a "(.*?)" error$/ do |error_message|
   (@error || '').should include error_message
 end
 
+Then /^the server returns a too many connections error$/ do
+  step 'the server returns a "421 Too many connections" error'
+end
+
+Then /^the server returns a server unavailable error$/ do
+  step 'the server returns a "421 server unavailable" error'
+end
+
 Then /^the server returns a not a directory error$/ do
   step 'the server returns a "550 Not a directory" error'
 end
@@ -41,6 +49,10 @@ Then /^the server returns a syntax error$/ do
   step 'the server returns a "501 Syntax error" error'
 end
 
+Then /^the server returns a bad option error$/ do
+  step 'the server returns a "501 Unsupported option" error'
+end
+
 Then /^the server returns a mode not implemented error$/ do
   step 'the server returns a "504 Mode not implemented" error'
 end

data/features/step_definitions/features.rb

@@ -0,0 +1,21 @@
+When /^the client successfully requests features$/ do
+  @feature_reply = client.raw "FEAT"
+end
+
+def feature_regexp(feature)
+  /^ #{feature}$/
+end
+
+Then /^the response should include feature "(.*?)"$/ do |feature|
+  @feature_reply.should =~ feature_regexp(feature)
+end
+
+Then /^the response should not include feature "(.*?)"$/ do |feature|
+  @feature_reply.should_not =~ feature_regexp(feature)
+end
+
+Then /^the response should( not)? include TLS features$/ do |neg|
+  step %Q'the response should#{neg} include feature "AUTH TLS"'
+  step %Q'the response should#{neg} include feature "PBSZ"'
+  step %Q'the response should#{neg} include feature "PROT"'
+end

data/features/step_definitions/file_structure.rb

@@ -1,6 +1,6 @@
 When /^the client successfully sets file structure "(.*?)"$/ do
 |file_structure|
-  @client.raw 'STRU', file_structure
+  client.raw 'STRU', file_structure
 end
 
 When /^the client sets file structure "(.*?)"$/ do |file_structure|
@@ -11,6 +11,6 @@ end
 
 When /^the client sets file structure with no parameter$/ do
   capture_error do
-    @client.raw 'STRU'
+    client.raw 'STRU'
   end
 end

data/features/step_definitions/generic_send.rb

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

data/features/step_definitions/get.rb

@@ -1,6 +1,6 @@
 When /^the client successfully gets (text|binary) "(.*?)"$/ \
 do |mode, remote_path|
-  @client.get mode, remote_path
+  client.get mode, remote_path
 end
 
 When /^the client gets (\S+) "(.*?)"$/ do |mode, path|
@@ -11,6 +11,6 @@ end
 
 When /^the client gets with no path$/ do
   capture_error do
-    @client.raw 'RETR'
+    client.raw 'RETR'
   end
 end

data/features/step_definitions/help.rb

@@ -1,6 +1,6 @@
 When /^the client successfully asks for help(?: for "(.*?)")?$/ do
 |command|
-  @help_reply = @client.help(command)
+  @help_reply = client.help(command)
 end
 
 Then /^the server should return a list of commands$/ do

data/features/step_definitions/invalid_commands.rb

@@ -1,11 +1,11 @@
 When /^the client sends an empty command$/ do
   capture_error do
-    @client.raw ''
+    client.raw ''
   end
 end
 
 When /^the client sends a non-word command$/ do
   capture_error do
-    @client.raw '*'
+    client.raw '*'
   end
 end

data/features/step_definitions/list.rb

@@ -31,7 +31,7 @@ class FileList
 end
 
 When /^the client successfully lists the directory(?: "(.*?)")?$/ do |directory|
-  @list = FileList.new(@client.ls(*[directory].compact))
+  @list = FileList.new(client.ls(*[directory].compact))
 end
 
 When /^the client lists the directory( "(?:.*?)")?$/ do |directory|
@@ -42,7 +42,7 @@ end
 
 When /^the client successfully name-lists the directory(?: "(.*?)")?$/ do
 |directory|
-  @list = FileList.new(@client.nlst(*[directory].compact))
+  @list = FileList.new(client.nlst(*[directory].compact))
 end
 
 When /^the client name-lists the directory( "(?:.*?)")?$/ do |directory|

data/features/step_definitions/login.rb

@@ -42,7 +42,7 @@ When /^the(?: (\w+))? client logs in(?: with bad (\w+))?$/ do
       @server.account
     end,
   ][0..server.auth_level]
-  login(tokens, client_name)
+  @error = login(tokens, client_name)
 end
 
 Then /^the client should( not)? be logged in$/ do |neg|
@@ -61,7 +61,7 @@ When /^the client sends a password( with no parameter)?$/ do |no_param|
            else
              [server.password]
            end
-    @client.raw 'PASS', *args
+    client.raw 'PASS', *args
   end
 end
 
@@ -72,7 +72,7 @@ When /^the client sends a user( with no parameter)?$/ do |no_param|
            else
              [server.user]
            end
-    @client.raw 'USER', *args
+    client.raw 'USER', *args
   end
 end
 

data/features/step_definitions/mkdir.rb

@@ -5,5 +5,5 @@ When /^the client makes directory "(.*?)"$/ do |path|
 end
 
 When /^the client successfully makes directory "(.*?)"$/ do |path|
-  mkdir_response = @client.mkdir path
+  mkdir_response = client.mkdir path
 end

data/features/step_definitions/mode.rb

@@ -1,5 +1,5 @@
 When /^the client successfully sets mode "(.*?)"$/ do |mode|
-  @client.raw 'MODE', mode
+  client.raw 'MODE', mode
 end
 
 When /^the client sets mode "(.*?)"$/ do |mode|
@@ -10,6 +10,6 @@ end
 
 When /^the client sets mode with no parameter$/ do
   capture_error do
-    @client.raw 'MODE'
+    client.raw 'MODE'
   end
 end

data/features/step_definitions/options.rb

@@ -0,0 +1,9 @@
+When /^the client successfully sets option "(.*?)"$/ do |option|
+  client.set_option option
+end
+
+When /^the client sets option "(.*?)"$/ do |option|
+  capture_error do
+    step %q'the client successfully sets option "#{option}"'
+  end
+end

data/features/step_definitions/passive.rb

@@ -1,3 +1,3 @@
 Given /^the client is in (passive|active) mode$/ do |mode|
-  @client.passive = mode == 'passive'
+  client.passive = mode == 'passive'
 end

data/features/step_definitions/port.rb

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

data/features/step_definitions/put.rb

@@ -1,6 +1,6 @@
 When /^the client successfully puts (text|binary) "(.*?)"$/ do
 |mode, local_path|
-  @client.put mode, local_path
+  client.put mode, local_path
 end
 
 When /^the client puts (\S+) "(.*?)"$/ do |mode, path|
@@ -11,13 +11,13 @@ end
 
 When /^the client puts with no path$/ do
   capture_error do
-    @client.raw 'STOR'
+    client.raw 'STOR'
   end
 end
 
 When /^the client successfully stores unique "(.*?)"(?: to "(.*?)")?$/ do
 |local_path, remote_path|
-  @client.store_unique local_path, remote_path
+  client.store_unique local_path, remote_path
 end
 
 When /^the client stores unique "(.*?)"( to ".*?")?$/ do

data/features/step_definitions/quit.rb

@@ -1,5 +1,5 @@
 When /^the client successfully quits$/ do
-  @client.quit
+  client.quit
 end
 
 When /^the client quits$/ do
@@ -10,6 +10,6 @@ end
 
 When /^the client quits with a parameter$/ do
   capture_error do
-    @client.raw 'QUIT', 'foo'
+    client.raw 'QUIT', 'foo'
   end
 end

data/features/step_definitions/rename.rb

@@ -7,5 +7,5 @@ end
 
 When /^the client successfully renames "(.*?)" to "(.*?)"$/ do
 |from_path, to_path|
-  @client.rename(from_path, to_path)
+  client.rename(from_path, to_path)
 end

data/features/step_definitions/rmdir.rb

@@ -5,5 +5,5 @@ When /^the client removes directory "(.*?)"$/ do |path|
 end
 
 When /^the client successfully removes directory "(.*?)"$/ do |path|
-  mkdir_response = @client.rmdir path
+  mkdir_response = client.rmdir path
 end

data/features/step_definitions/server_title.rb

@@ -0,0 +1,12 @@
+Then /^the server returns its title$/ do
+  step 'the server returns its name'
+  step 'the server returns its version'
+end
+
+Then /^the server returns its name$/ do
+  @response.should include @server.server_name
+end
+
+Then /^the server returns its version$/ do
+  @response.should =~ /\b\d+\.\d+\.\d+\b/
+end

data/features/step_definitions/status.rb

@@ -1,5 +1,5 @@
 When /^the client successfully requests status$/ do
-  @status = @client.status
+  @response = client.status
 end
 
 When /^the client requests status$/ do
@@ -7,11 +7,3 @@ When /^the client requests status$/ do
     step 'the client successfully requests status'
   end
 end
-
-Then /^the server returns its name$/ do
-  @status.should include @server.server_name
-end
-
-Then /^the server returns its version$/ do
-  @status.should =~ /\b\d+\.\d+\.\d+\b/
-end

data/features/step_definitions/system.rb

@@ -1,5 +1,5 @@
 When /^the client successfully queries system ID$/ do
-  @reply = @client.system
+  @reply = client.system
 end
 
 Then /^the server returns a system ID reply$/ do

data/features/step_definitions/timing.rb

@@ -0,0 +1,19 @@
+Before do
+  @start_time = Time.now
+end
+
+When /^the client is idle for (\S+) seconds$/ do |seconds|
+  sleep seconds.to_f
+end
+
+Then /^it should take at least (\S+) seconds$/ do |s|
+  min_elapsed_time = s.to_f
+  elapsed_time = Time.now - @start_time
+  elapsed_time.should >= min_elapsed_time
+end
+
+Then /^it should take less than (\S+) seconds$/ do |s|
+  max_elapsed_time = s.to_f
+  elapsed_time = Time.now - @start_time
+  elapsed_time.should < max_elapsed_time
+end

data/features/step_definitions/type.rb

@@ -1,5 +1,5 @@
 When /^the client successfully sets type "(.*?)"$/ do |type|
-  @client.raw 'TYPE', type
+  client.raw 'TYPE', type
 end
 
 When /^the client sets type "(.*?)"$/ do |type|
@@ -10,6 +10,6 @@ end
 
 When /^the client sets type with no parameter$/ do
   capture_error do
-    @client.raw 'TYPE'
+    client.raw 'TYPE'
   end
 end

data/features/support/test_client.rb

@@ -6,13 +6,20 @@ class TestClient
   extend Forwardable
   include FileUtils
 
-  def initialize(opts = {})
+  attr_accessor :tls_mode
+
+  def initialize
+    @tls_mode = :off
     @temp_dir = Ftpd::TempDir.make
-    @ftp = make_ftp(opts)
     @templates = TestFileTemplates.new
   end
 
+  def start
+    @ftp = make_ftp
+  end
+
   def close
+    return unless @ftp
     @ftp.close
   end
 
@@ -36,6 +43,20 @@ class TestClient
   :status,
   :system
 
+  # Make a connection from a specific IP.  Net::FTP doesn't have a way
+  # to force the local IP, so fake it here.
+
+  def connect_from(source_ip, host, port)
+    in_addr = Socket.pack_sockaddr_in(0, source_ip)
+    out_addr = Socket.pack_sockaddr_in(port, host)
+    socket = Socket.open(Socket::AF_INET, Socket::SOCK_STREAM, 0)
+    socket.bind(in_addr)
+    socket.connect(out_addr)
+    decorate_socket socket
+    @ftp = make_ftp
+    @ftp.set_socket(socket)
+  end
+
   def raw(*command)
     @ftp.sendcmd command.compact.join(' ')
   end
@@ -67,7 +88,7 @@ class TestClient
   end
 
   def xpwd
-    response = raw('XPWD')
+    response = @ftp.sendcmd('XPWD')
     response[/"(.+)"/, 1]
   end
 
@@ -103,6 +124,10 @@ class TestClient
     end
   end
 
+  def set_option(option)
+    @ftp.sendcmd "OPTS #{option}"
+  end
+
   private
 
   RAW_METHOD_REGEX = /^send_(.*)$/
@@ -115,9 +140,8 @@ class TestClient
     File.expand_path(path, @temp_dir)
   end
 
-  def make_ftp(opts)
-    tls_mode = opts[:tls] || :off
-    case tls_mode
+  def make_ftp
+    case @tls_mode
     when :off
       make_non_tls_ftp
     when :implicit
@@ -125,7 +149,7 @@ class TestClient
     when :explicit
       make_tls_ftp(:explicit)
     else
-      raise "Unknown TLS mode: #{tls_mode}"
+      raise "Unknown TLS mode: #{@tls_mode}"
     end
   end
 
@@ -143,4 +167,35 @@ class TestClient
     Net::FTP.new
   end
 
+  # Ruby 2.0's Ftp class is expecting a TCPSocket, not a Socket.  The
+  # trouble comes with Ftp#close, which closes sockets by first doing
+  # a shutdown, setting the read timeout, and doing a read.  Plain
+  # Socket doesn't have those methods, so fake it.
+  #
+  # Plain socket _does_ have #close, but we short-circuit it, too,
+  # because it takes a few seconds.  We're in a hurry when running
+  # tests, and can afford to be a little sloppy when cleaning up.
+
+  def decorate_socket(sock)
+
+    def sock.shutdown(how)
+      @shutdown = true
+    end
+
+    def sock.read_timeout=(seconds)
+    end
+
+    # Skip read after shutdown.  Prevents 2.0 from hanging in
+    # Ftp#close
+
+    def sock.read(*args)
+      return if @shutdown
+      super(*args)
+    end
+
+    def close
+    end
+
+  end
+
 end