ftpd 0.2.0 → 0.2.1

data/features/ftp_server/command_errors.feature

@@ -22,12 +22,8 @@ Feature: Command Errors
       | ACCT    |
       | APPE    |
       | HELP    |
-      | MKD     |
       | REIN    |
       | REST    |
-      | RMD     |
-      | RNFR    |
-      | RNTO    |
       | SITE    |
       | SMNT    |
       | STAT    |

data/features/ftp_server/delete.feature

@@ -32,7 +32,7 @@ Feature: Delete
     When the client deletes with no path
     Then the server returns a path required error
 
-  Scenario: No such file
+  Scenario: not found
     Given a successful login
     When the client deletes "foo"
     Then the server returns a not found error

data/features/ftp_server/directory_navigation.feature

@@ -7,24 +7,36 @@ Feature: Change Directory
   Background:
     Given the test server is started
 
-  Scenario: Change to subdirectory
+  Scenario: Down to subdir
     Given a successful login
     And the server has file "subdir/bar"
     When the client successfully cd's to "subdir"
     Then the current directory should be "/subdir"
 
-  Scenario: Change to parent from subdir
+  Scenario: Up from subdir
     Given a successful login
     And the server has file "subdir/bar"
     And the client successfully cd's to "subdir"
-    When the client successfully cd's up
+    When the client successfully cd's to ".."
     Then the current directory should be "/"
 
-  Scenario: Change to parent from root
+  Scenario: Up from root
     Given a successful login
-    When the client successfully cd's up
+    When the client successfully cd's to ".."
     Then the current directory should be "/"
 
+  Scenario: XPWD
+    Given a successful login
+    And the server has directory "subdir"
+    When the client successfully cd's to "subdir"
+    Then the XPWD directory should be "/subdir"
+
+  Scenario: XCWD
+    Given a successful login
+    And the server has directory "subdir"
+    When the client successfully sends "XCWD subdir"
+    Then the current directory should be "/subdir"
+
   Scenario: Change to file
     Given a successful login
     And the server has file "baz"
@@ -34,7 +46,7 @@ Feature: Change Directory
   Scenario: No such directory
     Given a successful login
     When the client cd's to "subdir"
-    Then the server returns a no such file error
+    Then the server returns a not found error
 
   Scenario: Access denied
     Given a successful login

data/features/ftp_server/get.feature

@@ -55,7 +55,7 @@ Feature: Get
   Scenario: Missing file
     Given a successful login
     When the client gets text "foo"
-    Then the server returns a no such file error
+    Then the server returns a not found error
 
   Scenario: Not logged in
     Given a successful connection

data/features/ftp_server/get_tls.feature

@@ -5,13 +5,13 @@ Feature: Get TLS
   So that I have it on my computer
 
   Background:
-    Given the test server is started with TLS
+    Given the test server is started with explicit TLS
 
   Scenario: TLS
     pending "TLS not supported in active mode (see README)"
 
   Scenario: TLS, Passive
-    Given a successful login with TLS
+    Given a successful login with explicit TLS
     And the server has file "ascii_unix"
     And the client is in passive mode
     When the client successfully gets text "ascii_unix"

data/features/ftp_server/implicit_tls.feature

@@ -0,0 +1,18 @@
+Feature: Put TLS
+
+  As a server
+  I want to use implicit TLS
+  Because I must serve out-of-date clients
+
+  Background:
+    Given the test server is started with implicit TLS
+
+  Scenario: Get
+    pending "TLS not supported in active mode (see README)"
+
+  Scenario: Get (passive)
+    Given a successful login with implicit TLS
+    And the client has file "ascii_unix"
+    And the client is in passive mode
+    When the client successfully puts text "ascii_unix"
+    Then the remote file "ascii_unix" should match the local file

data/features/ftp_server/list_tls.feature

@@ -5,13 +5,13 @@ Feature: List TLS
   So that I can see what file to transfer
 
   Background:
-    Given the test server is started with TLS
+    Given the test server is started with explicit TLS
 
   Scenario: TLS
     pending "TLS not supported in active mode (see README)"
 
   Scenario: TLS, Passive
-    Given a successful login with TLS
+    Given a successful login with explicit TLS
     And the server has file "foo"
     And the server has file "bar"
     And the client is in passive mode

data/features/ftp_server/mkdir.feature

@@ -0,0 +1,70 @@
+Feature: Make directory
+
+  As a client
+  I want to create a directory
+  So that I can categorize my uploads
+
+  Background:
+    Given the test server is started
+
+  Scenario: Make directory
+    Given a successful login
+    When the client successfully makes directory "foo"
+    Then the server has directory "foo"
+
+  Scenario: Directory of a directory
+    Given a successful login
+    And the server has directory "foo"
+    When the client successfully makes directory "foo/bar"
+    Then the server has directory "foo/bar"
+
+  Scenario: After cwd
+    Given a successful login
+    And the server has directory "foo"
+    And the client successfully cd's to "foo"
+    When the client successfully makes directory "bar"
+    Then the server has directory "foo/bar"
+
+  Scenario: XMKD
+    Given a successful login
+    When the client successfully sends "XMKD foo"
+    Then the server has directory "foo"
+
+  Scenario: Missing directory
+    Given a successful login
+    When the client makes directory "foo/bar"
+    Then the server returns a not found error
+
+  Scenario: Not logged in
+    Given a successful connection
+    When the client makes directory "foo"
+    Then the server returns a not logged in error
+
+  Scenario: Already exists
+    Given a successful login
+    And the server has directory "foo"
+    When the client makes directory "foo"
+    Then the server returns an already exists error
+
+  Scenario: Directory of a file
+    Given a successful login
+    And the server has file "foo"
+    When the client makes directory "foo/bar"
+    Then the server returns a not a directory error
+
+  Scenario: Mkdir not enabled
+    Given the test server is started without mkdir
+    And a successful login
+    When the client makes directory "foo"
+    Then the server returns an unimplemented command error
+
+  Scenario: Missing path
+    Given a successful login
+    When the client sends "MKD"
+    Then the server returns a syntax error
+
+  Scenario: Access denied
+    Given a successful login
+    When the client makes directory "forbidden"
+    Then the server returns an access denied error
+

data/features/ftp_server/name_list_tls.feature

@@ -6,13 +6,13 @@ Feature: Name List TLS
   And nobody else can
 
   Background:
-    Given the test server is started with TLS
+    Given the test server is started with explicit TLS
 
   Scenario: TLS
     pending "TLS not supported in active mode (see README)"
 
   Scenario: TLS, Passive
-    Given a successful login with TLS
+    Given a successful login with explicit TLS
     And the server has file "foo"
     And the server has file "bar"
     And the client is in passive mode

data/features/ftp_server/put.feature

@@ -53,7 +53,7 @@ Feature: Put
     Given a successful login
     And the client has file "bar"
     When the client puts text "foo/bar"
-    Then the server returns a no such file error
+    Then the server returns a not found error
 
   Scenario: Not logged in
     Given a successful connection

data/features/ftp_server/put_tls.feature

@@ -5,13 +5,13 @@ Feature: Put TLS
   So that someone else can have it
 
   Background:
-    Given the test server is started with TLS
+    Given the test server is started with explicit TLS
 
   Scenario: TLS
     pending "TLS not supported in active mode (see README)"
 
   Scenario: TLS, Passive
-    Given a successful login with TLS
+    Given a successful login with explicit TLS
     And the client has file "ascii_unix"
     And the client is in passive mode
     When the client successfully puts text "ascii_unix"

data/features/ftp_server/rename.feature

@@ -0,0 +1,90 @@
+Feature: Rename
+
+  As a client
+  I want to rename a file
+  To correct an improper name
+
+  Background:
+    Given the test server is started
+
+  Scenario: Rename
+    Given a successful login
+    And the server has file "foo"
+    When the client successfully renames "foo" to "bar"
+    Then the server should not have file "foo"
+    And the server should have file "bar"
+
+  Scenario: Move
+    Given a successful login
+    And the server has file "foo/bar"
+    And the server has directory "baz"
+    When the client successfully renames "foo/bar" to "baz/qux"
+    Then the server should not have file "foo/bar"
+    And the server should have file "baz/qux"
+
+  Scenario: Non-root working directory
+    Given a successful login
+    And the server has file "foo/bar"
+    And the client successfully cd's to "foo"
+    When the client successfully renames "bar" to "baz"
+    Then the server should not have file "foo/bar"
+    Then the server should have file "foo/baz"
+
+  Scenario: Access denied (source)
+    Given a successful login
+    When the client renames "forbidden" to "foo"
+    Then the server returns an access denied error
+
+  Scenario: Access denied (destination)
+    Given a successful login
+    And the server has file "foo"
+    When the client renames "foo" to "forbidden"
+    Then the server returns an access denied error
+
+  Scenario: Source missing
+    Given a successful login
+    When the client renames "foo" to "bar"
+    Then the server returns a not found error
+
+  Scenario: Destination exists
+    Given a successful login
+    And the server has file "foo"
+    And the server has file "bar"
+    When the client renames "foo" to "bar"
+    Then the server returns an already exists error
+
+  Scenario: Not logged in (RNFR)
+    Given a successful connection
+    When the client sends "RNFR foo"
+    Then the server returns a not logged in error
+
+  Scenario: Not logged in (RNTO)
+    Given a successful connection
+    When the client sends "RNTO foo"
+    # Although the RNTO command checks for logged in, sequence error
+    # gets triggered first.
+    Then the server returns a bad sequence error
+
+  Scenario: Missing path (RNFR)
+    Given a successful login
+    When the client sends "RNFR"
+    Then the server returns a syntax error
+
+  Scenario: Missing path (RNTO)
+    Given a successful login
+    And the server has file "foo"
+    And the client successfully sends "RNFR foo"
+    When the client sends "RNTO"
+    Then the server returns a syntax error
+
+  Scenario: Rename not enabled
+    Given the test server is started without rename
+    And a successful login
+    And the server has file "foo"
+    When the client renames "foo" to "bar"
+    Then the server returns an unimplemented command error
+
+  Scenario: RNTO without RNFR
+    Given a successful login
+    When the client sends "RNTO bar"
+    Then the server returns a bad sequence error

data/features/ftp_server/rmdir.feature

@@ -0,0 +1,71 @@
+Feature: Remove directory
+
+  As a client
+  I want to remove a directory
+  To reduce clutter
+
+  Background:
+    Given the test server is started
+
+  Scenario: Make directory
+    Given a successful login
+    And the server has directory "foo"
+    When the client successfully removes directory "foo"
+    Then the server should not have directory "foo"
+
+  Scenario: Directory of a directory
+    Given a successful login
+    And the server has directory "foo/bar"
+    When the client successfully removes directory "foo/bar"
+    Then the server should not have directory "foo/bar"
+    And the server has directory "foo"
+
+  Scenario: After cwd
+    Given a successful login
+    And the server has directory "foo/bar"
+    And the client successfully cd's to "foo"
+    When the client successfully removes directory "bar"
+    Then the server should not have directory "foo/bar"
+
+  Scenario: XRMD
+    Given a successful login
+    And the server has directory "foo"
+    When the client successfully sends "XRMD foo"
+    Then the server should not have directory "foo"
+
+  Scenario: Missing directory
+    Given a successful login
+    When the client removes directory "foo/bar"
+    Then the server returns a not found error
+
+  Scenario: Not logged in
+    Given a successful connection
+    When the client removes directory "foo"
+    Then the server returns a not logged in error
+
+  Scenario: Does not exist
+    Given a successful login
+    When the client removes directory "foo"
+    Then the server returns a not found error
+
+  Scenario: Remove a file
+    Given a successful login
+    And the server has file "foo"
+    When the client removes directory "foo"
+    Then the server returns a not a directory error
+
+  Scenario: Rmdir not enabled
+    Given the test server is started without rmdir
+    And a successful login
+    When the client removes directory "foo"
+    Then the server returns an unimplemented command error
+
+  Scenario: Missing path
+    Given a successful login
+    When the client sends "RMD"
+    Then the server returns a syntax error
+
+  Scenario: Access denied
+    Given a successful login
+    When the client removes directory "forbidden"
+    Then the server returns an access denied error

data/features/ftp_server/step_definitions/debug.rb

@@ -1,8 +1,8 @@
 Then /^the server should have written( no)? debug output$/ do |neg|
-  matcher = if neg
-              be_false
-            else
-              be_true
-            end
-  @server.wrote_debug_output?.should matcher
+  method = if neg
+             :should
+           else
+             :should_not
+           end
+  @server.debug_output.send(method) == ''
 end

data/features/ftp_server/step_definitions/test_server.rb

@@ -3,9 +3,10 @@ Given /^the test server is started$/ do
   @server.start
 end
 
-Given /^the test server is started with TLS$/ do
+Given /^the test server is started with(?: (\w+) TLS)?$/ do |mode|
+  mode ||= 'explicit'
   @server = TestServer.new
-  @server.tls = :explicit
+  @server.tls = mode.to_sym
   @server.start
 end
 

data/features/step_definitions/connect.rb

@@ -1,9 +1,10 @@
 require 'double_bag_ftps'
 require 'net/ftp'
 
-When /^the( \w+)? client connects( with TLS)?$/ do
-|client_name, with_tls|
-  client = TestClient.new(:tls => with_tls)
+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)
   set_client client_name, client
 end