ftpd 0.3.2 → 0.4.0

data/features/ftp_server/type.feature

@@ -7,10 +7,18 @@ Feature: Representation Type
   Background:
     Given the test server is started
 
-  Scenario: Type ASCII
+  Scenario: ASCII/default
     Given a successful login
     Then the client successfully sets type "A"
 
+  Scenario: ASCII/Non-print
+    Given a successful login
+    Then the client successfully sets type "A N"
+
+  Scenario: ASCII/Telnet
+    Given a successful login
+    When the client successfully sets type "A T"
+
   Scenario: Type IMAGE
     Given a successful login
     Then the client successfully sets type "I"
@@ -30,20 +38,15 @@ Feature: Representation Type
     When the client sets type "*"
     Then the server returns an invalid type error
 
-  Scenario: Format Telnet
-    Given a successful login
-    When the client sets type "A T"
-    Then the server returns a format not implemented error
-
   Scenario: Format Carriage Control
     Given a successful login
     When the client sets type "A C"
-    Then the server returns a format not implemented error
+    Then the server returns a type not implemented error
 
   Scenario: Invalid Format
     Given a successful login
     When the client sets type "A *"
-    Then the server returns an invalid format error
+    Then the server returns an invalid type error
 
   Scenario: Not logged in
     Given a successful connection

data/features/step_definitions/append.rb

@@ -0,0 +1,15 @@
+When /^the client appends (.*)$/ do |args|
+  capture_error do
+    step "the client successfully appends #{args}"
+  end
+end
+
+When /^the client successfully appends text "(.*?)" onto "(.*?)"$/ do
+|local_path, remote_path|
+  @client.append_text local_path, remote_path
+end
+
+When /^the client successfully appends binary "(.*?)" onto "(.*?)"$/ do
+|local_path, remote_path|
+  @client.append_binary local_path, remote_path
+end

data/features/step_definitions/client_and_server_files.rb

@@ -6,7 +6,7 @@ end
 Then /^the remote file "(.*?)" should( exactly)? match the local file$/ do
 |remote_path, exactly|
   local_path = File.basename(remote_path)
-  remote_contents = @server.file_contents(remote_path)
+  remote_contents = server.file_contents(remote_path)
   local_contents = @client.file_contents(local_path)
   remote_contents = unix_line_endings(exactly, remote_contents)
   local_contents = unix_line_endings(exactly, local_contents)
@@ -16,7 +16,7 @@ end
 Then /^the local file "(.*?)" should( exactly)? match the remote file$/ do
 |local_path, exactly|
   remote_path = local_path
-  remote_contents = @server.file_contents(remote_path)
+  remote_contents = server.file_contents(remote_path)
   local_contents = @client.file_contents(local_path)
   remote_contents = unix_line_endings(exactly, remote_contents)
   local_contents = unix_line_endings(exactly, local_contents)

data/features/step_definitions/client_files.rb

@@ -7,3 +7,8 @@ Then /^the local file "(.*?)" should have (unix|windows) line endings$/ do
   line_ending_type(@client.file_contents(local_path)).should ==
     line_ending_type.to_sym
 end
+
+Then /^the local file "(.*?)" should match its template$/ do |local_path|
+  @client.template(local_path).should ==
+    @client.file_contents(local_path)
+end

data/features/step_definitions/connect.rb

@@ -5,7 +5,7 @@ When /^the( \w+)? client connects(?: with (\w+) TLS)?$/ do
 |client_name, tls_mode|
   tls_mode ||= :off
   client = TestClient.new(:tls => tls_mode.to_sym)
-  client.connect(@server.host, @server.port)
+  client.connect(server.host, server.port)
   set_client client_name, client
 end
 

data/features/step_definitions/error_replies.rb

@@ -73,10 +73,6 @@ Then /^the server returns a format not implemented error$/ do
   step 'the server returns a "504 Format not implemented" error'
 end
 
-Then /^the server returns an invalid format error$/ do
-  step 'the server returns a "504 Invalid format code" error'
-end
-
 Then /^the server returns a command unrecognized error$/ do
   step 'the server returns a "500 Syntax error, command unrecognized" error'
 end

data/features/step_definitions/login.rb

@@ -3,9 +3,9 @@ def logged_in?
   @error.nil?
 end
 
-def login(user, password, client_name = nil)
+def login(tokens, client_name = nil)
   capture_error do
-    client.login user, password
+    client(client_name).login *tokens
   end
 end
 
@@ -18,26 +18,31 @@ Given /^a successful login( with \w+ TLS)?$/ do |with_tls|
   step 'the client logs in'
 end
 
-Given /^the( \w+)? client connects and logs in$/ do |client_name|
-  step "the#{client_name} client connects"
-  step "the#{client_name} client logs in"
-end
-
 Given /^a failed login$/ do
   step 'the client connects'
-  step 'the client logs in with a bad password'
-end
-
-When /^the( \w+)? client logs in$/ do |client_name|
-  login @server.user, @server.password, client_name
+  step 'the client logs in with bad user'
 end
 
-When /^the client logs in with a bad password$/ do
-  login @server.user, 'the-wrong-password'
-end
-
-When /^the client logs in with a bad user$/ do
-  login 'the-wrong-user', @server.password
+When /^the(?: (\w+))? client logs in(?: with bad (\w+))?$/ do
+|client_name, bad|
+  tokens = [
+    if bad == 'user'
+      'bad_user'
+    else
+      @server.user
+    end,
+    if bad == 'password'
+      'bad_password'
+    else
+      @server.password
+    end,
+    if bad == 'account'
+      'bad_account'
+    else
+      @server.account
+    end,
+  ][0..server.auth_level]
+  login(tokens, client_name)
 end
 
 Then /^the client should( not)? be logged in$/ do |neg|
@@ -54,7 +59,7 @@ When /^the client sends a password( with no parameter)?$/ do |no_param|
     args = if no_param
              []
            else
-             [@server.password]
+             [server.password]
            end
     @client.raw 'PASS', *args
   end
@@ -65,8 +70,13 @@ When /^the client sends a user( with no parameter)?$/ do |no_param|
     args = if no_param
              []
            else
-             [@server.user]
+             [server.user]
            end
     @client.raw 'USER', *args
   end
 end
+
+Given /^the (\w+) client connects and logs in$/ do |client_name|
+  step "the #{client_name} client connects"
+  step "the #{client_name} client logs in"
+end

data/features/step_definitions/server_files.rb

@@ -1,9 +1,9 @@
 Given /^the server has directory "(.*?)"$/ do |remote_path|
-  @server.add_directory remote_path
+  server.add_directory remote_path
 end
 
 Given /^the server has file "(.*?)"$/ do |remote_path|
-  @server.add_file remote_path
+  server.add_file remote_path
 end
 
 Then /^the server should( not)? have file "(.*?)"$/ do |neg, path|
@@ -12,7 +12,7 @@ Then /^the server should( not)? have file "(.*?)"$/ do |neg, path|
             else
               :be_true
             end
-  @server.has_file?(path).should send(matcher)
+  server.has_file?(path).should send(matcher)
 end
 
 Then /^the server should( not)? have directory "(.*?)"$/ do |neg, path|
@@ -21,21 +21,34 @@ Then /^the server should( not)? have directory "(.*?)"$/ do |neg, path|
             else
               :be_true
             end
-  @server.has_directory?(path).should send(matcher)
+  server.has_directory?(path).should send(matcher)
 end
 
 Then /^the remote file "(.*?)" should have (unix|windows) line endings$/ do
 |remote_path, line_ending_type|
-  line_ending_type(@server.file_contents(remote_path)).should ==
+  line_ending_type(server.file_contents(remote_path)).should ==
     line_ending_type.to_sym
 end
 
 Then /^the server should have a file with the contents of "(.*?)"$/ do
 |path|
-  @server.has_file_with_contents_of?(path).should be_true
+  server.has_file_with_contents_of?(path).should be_true
 end
 
 Then /^the server should have (\d+) files? with "(.*?)" in the name$/ do
 |count, name|
-  @server.files_named_like(name).size.should == count.to_i
+  server.files_named_like(name).size.should == count.to_i
+end
+
+Then /^the remote file "(.*?)" should match "(\w+)" \+ "(\w+)"$/ do
+|remote_path, template1, template2|
+  expected = @server.template(template1) + @server.template(template2)
+  actual = @server.file_contents(remote_path)
+  actual.should == expected
+end
+
+Then /^the remote file "(.*?)" should match "(\w+)"$/ do |remote_path, template|
+  expected = @server.template(template)
+  actual = @server.file_contents(remote_path)
+  actual.should == expected
 end

data/features/support/example_server.rb

@@ -32,11 +32,19 @@ class ExampleServer
   end
 
   def user
-    @output[/User: (.*)$/, 1]
+    @output[/User: "(.*)"$/, 1]
   end
 
   def password
-    @output[/Pass: (.*)$/, 1]
+    @output[/Pass: "(.*)"$/, 1]
+  end
+
+  def account
+    @output[/Account: "(.*)"$/, 1]
+  end
+
+  def auth_level
+    Ftpd::AUTH_PASSWORD
   end
 
   private

data/features/support/test_client.rb

@@ -57,6 +57,10 @@ class TestClient
     end
   end
 
+  def template(path)
+    @templates[File.basename(path)]
+  end
+
   def file_contents(path)
     File.open(temp_path(path), 'rb', &:read)
   end
@@ -73,6 +77,20 @@ class TestClient
     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
+    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
+    end
+  end
+
   private
 
   RAW_METHOD_REGEX = /^send_(.*)$/

data/features/support/test_file_templates.rb

@@ -15,7 +15,7 @@ class TestFileTemplates
   end
 
   def read_template(filename)
-    File.open(template_path(filename), 'r', &:read)
+    File.open(template_path(filename), 'rb', &:read)
   end
 
   def template_path(filename)

data/features/support/test_server.rb

@@ -12,7 +12,9 @@ class TestServer
 
     USER = 'user'
     PASSWORD = 'password'
+    ACCOUNT = 'account'
 
+    attr_accessor :append
     attr_accessor :delete
     attr_accessor :list
     attr_accessor :mkdir
@@ -23,6 +25,7 @@ class TestServer
 
     def initialize(temp_dir)
       @temp_dir = temp_dir
+      @append = true
       @delete = true
       @list = true
       @mkdir = true
@@ -32,12 +35,15 @@ class TestServer
       @write = true
     end
 
-    def authenticate(user, password)
-      user == USER && password == PASSWORD
+    def authenticate(user, password, account)
+      user == USER &&
+        (password.nil? || password == PASSWORD) &&
+        (account.nil? || account == ACCOUNT)
     end
 
     def file_system(user)
       TestServerFileSystem.new(@temp_dir,
+                               :append => @append,
                                :delete => @delete,
                                :list => @list,
                                :mkdir => @mkdir,
@@ -135,6 +141,11 @@ class TestServer
 
         include Ftpd::DiskFileSystem::Base
 
+        if opts[:append]
+          include Ftpd::DiskFileSystem::Append
+          raise_on_file_system_error :append
+        end
+
         if opts[:delete]
           include Ftpd::DiskFileSystem::Delete
           raise_on_file_system_error :delete
@@ -191,8 +202,7 @@ class TestServer
   include Ftpd::InsecureCertificate
   include TestServerFiles
 
-  def initialize(opts = {})
-    tls = opts[:tls] || :off
+  def initialize
     @temp_dir = Ftpd::TempDir.make
     @debug_file = Tempfile.new('ftp-server-debug-output')
     @debug_file.close
@@ -205,9 +215,12 @@ class TestServer
     self.tls = :off
   end
 
+  def_delegator :@server, :'auth_level'
+  def_delegator :@server, :'auth_level='
   def_delegator :@server, :'debug='
   def_delegator :@server, :'tls='
 
+  def_delegator :@driver, :'append='
   def_delegator :@driver, :'delete='
   def_delegator :@driver, :'list='
   def_delegator :@driver, :'mkdir='
@@ -240,10 +253,18 @@ class TestServer
     TestServerDriver::PASSWORD
   end
 
+  def account
+    TestServerDriver::ACCOUNT
+  end
+
   def port
     @server.bound_port
   end
 
+  def template(path)
+    @templates[File.basename(path)]
+  end
+
   private
 
   def temp_dir

data/ftpd.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ftpd"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne Conrad"]
-  s.date = "2013-03-05"
+  s.date = "2013-03-06"
   s.description = "ftpd is a pure Ruby FTP server library.  It supports implicit and explicit TLS, passive and active mode, and most of the commands specified in RFC 969.  It an be used as part of a test fixture or embedded in a program."
   s.email = "wconrad@yagni.com"
   s.extra_rdoc_files = [
@@ -31,8 +31,10 @@ Gem::Specification.new do |s|
     "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/allo.feature",
+    "features/ftp_server/append.feature",
     "features/ftp_server/cdup.feature",
     "features/ftp_server/command_errors.feature",
     "features/ftp_server/concurrent_sessions.feature",
@@ -44,9 +46,12 @@ Gem::Specification.new do |s|
     "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/login.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/mkdir.feature",
     "features/ftp_server/mode.feature",
     "features/ftp_server/name_list.feature",
@@ -64,6 +69,7 @@ Gem::Specification.new do |s|
     "features/ftp_server/syntax_errors.feature",
     "features/ftp_server/syst.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",
@@ -107,6 +113,7 @@ Gem::Specification.new do |s|
     "ftpd.gemspec",
     "insecure-test-cert.pem",
     "lib/ftpd.rb",
+    "lib/ftpd/auth_levels.rb",
     "lib/ftpd/command_sequence_checker.rb",
     "lib/ftpd/disk_file_system.rb",
     "lib/ftpd/error.rb",
@@ -118,6 +125,7 @@ Gem::Specification.new do |s|
     "lib/ftpd/insecure_certificate.rb",
     "lib/ftpd/list_format/eplf.rb",
     "lib/ftpd/list_format/ls.rb",
+    "lib/ftpd/read_only_disk_file_system.rb",
     "lib/ftpd/server.rb",
     "lib/ftpd/session.rb",
     "lib/ftpd/temp_dir.rb",