fake_ftp 0.0.2 → 0.0.3

data/README.markdown

@@ -15,8 +15,6 @@ How
 FakeFtp is a simple FTP server that fakes out enough of the protocol to get us by, allowing us to test that files get to
 their intended destination rather than testing how our code does so.
 
-Note: Only passive FTP is currently implemented
-
 Usage
 -----
 
@@ -43,7 +41,7 @@ Usage
 TODO
 ----
 
-* Active file upload
+* files should track if uploaded via active or passive
 
 References
 ----------

data/lib/fake_ftp/server.rb

@@ -5,6 +5,7 @@ module FakeFtp
   class Server
 
     attr_accessor :port, :passive_port
+    attr_reader :mode
 
     CMDS = %w[acct cwd cdup pass pasv port pwd quit stor type user]
     LNBK = "\r\n"
@@ -17,6 +18,7 @@ module FakeFtp
       @connection = nil
       @options = options
       @files = []
+      @mode = :active
     end
 
     def files
@@ -24,7 +26,7 @@ module FakeFtp
     end
 
     def file(name)
-      @files.detect { |file| file.name == name}
+      @files.detect { |file| file.name == name }
     end
 
     def start
@@ -100,6 +102,7 @@ module FakeFtp
 
     def _pasv(*args)
       if passive_port
+        @mode = :passive
         p1 = (passive_port / 256).to_i
         p2 = passive_port % 256
         "227 Entering Passive Mode (127,0,0,1,#{p1},#{p2})"
@@ -109,16 +112,15 @@ module FakeFtp
     end
 
     def _port(remote)
-      # remote = remote.split(',')
-      # remote_port = remote[4].to_i * 256 + remote[5].to_i
-      # unless @data_connection.nil?
-      #   @data_connection.close
-      #   @data_connection = nil
-      # end
-      # puts remote_port
-      # @data_connection = ::TCPSocket.open('127.0.0.1', remote_port)
-      # '200 Okay'
-      '500 Not implemented yet'
+      remote = remote.first.split(',')
+      remote_port = remote[4].to_i * 256 + remote[5].to_i
+      unless @active_connection.nil?
+        @active_connection.close
+        @active_connection = nil
+      end
+      @mode = :active
+      @active_connection = ::TCPSocket.open('127.0.0.1', remote_port)
+      '200 Okay'
     end
 
     def _pwd(*args)
@@ -132,15 +134,22 @@ module FakeFtp
     end
 
     def _stor(filename)
-      respond_with('125 Do it!')
+      if @mode == :passive
+        respond_with('125 Do it!')
+        data_client = @data_server.accept
+      else
+        respond_with('425 Ain\'t no data port!') && return if @active_connection.nil?
+        respond_with('125 Do it!')
 
-      data_client = @data_server.accept
-      data = data_client.recv(1024)
+        data_client = @active_connection
+      end
 
+      data = data_client.recv(1024)
       file = FakeFtp::File.new(::File.basename(filename.to_s), data.length)
       @files << file
 
       data_client.close
+      @active_connection = nil
       '226 Did it!'
     end
 

data/lib/fake_ftp/version.rb

@@ -1,3 +1,3 @@
 module FakeFtp
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/models/fake_ftp/server_spec.rb

@@ -33,6 +33,11 @@ describe FakeFtp::Server do
       server.is_running?.should be_false
     end
 
+    it "should default :mode to :active" do
+      server = FakeFtp::Server.new(21212, 21213)
+      server.mode.should == :active
+    end
+
     it "should start and stop passive port" do
       server = FakeFtp::Server.new(21212, 21213)
       server.is_running?(21213).should be_false
@@ -128,10 +133,12 @@ describe FakeFtp::Server do
         end
 
         it "accepts PASV" do
+          @server.mode.should == :active
           @client = TCPSocket.open('127.0.0.1', 21212)
           @client.gets
           @client.puts "PASV"
           @client.gets.should == "227 Entering Passive Mode (127,0,0,1,82,221)\r\n"
+          @server.mode.should == :passive
         end
 
         it "responds with correct PASV port" do
@@ -153,31 +160,46 @@ describe FakeFtp::Server do
           @client.puts "PASV"
           @client.gets.should == "502 Aww hell no, use Active\r\n"
         end
+      end
 
-        it "does not accept PORT (yet)" do
-          ## TODO this test can go away once the following pending test succeeds
+      context 'active' do
+        before :each do
           @client = TCPSocket.open('127.0.0.1', 21212)
           @client.gets
+
+          @data_server = ::TCPServer.new('127.0.0.1', 21216)
+          @data_connection = Thread.new do
+            @server_client = @data_server.accept
+            @server_client.should_not be_nil
+          end
+        end
+
+        after :each do
+          @data_server.close
+          @data_server = nil
+          @data_connection = nil
+          @client.close
+        end
+
+        it "accepts PORT and connects to port" do
           @client.puts "PORT 127,0,0,1,82,224"
-          @client.gets.should == "500 Not implemented yet\r\n"
-        end
-
-        xit "accepts PORT and connects to port" do
-          # @testing = true
-          # @data_server = ::TCPServer.new('127.0.0.1', 21216)
-          # @data_connection = Thread.new do
-          #   while @testing
-          #     @server_client = @data_connection.accept
-          #     @server_connection = Thread.new(@server_client) do |socket|
-          #       @connected = true
-          #     end
-          #   end
-          # end
-          # @client.gets
-          # @client.puts "PORT 127,0,0,1,82,224"
-          # @client.gets.should == "200 Okay\r\n"
-          # @connected.should be_true
-          # @testing = false
+          @client.gets.should == "200 Okay\r\n"
+
+          @data_connection.join
+        end
+
+        it "should switch to :active on port command" do
+          @server.mode.should == :active
+          @client.puts 'PASV'
+          @client.gets
+          @server.mode.should == :passive
+
+          @client.puts "PORT 127,0,0,1,82,224"
+          @client.gets.should == "200 Okay\r\n"
+
+          @data_connection.join
+
+          @server.mode.should == :active
         end
       end
 
@@ -273,15 +295,58 @@ describe FakeFtp::Server do
           @client.gets.should == "504 We don't allow those\r\n"
         end
 
-        it "accepts STOR with filename" do
-          @client.puts "STOR some_file"
-          @client.gets.should == "125 Do it!\r\n"
-          @data_client = TCPSocket.open('127.0.0.1', 21213)
-          @data_client.puts "1234567890"
-          @data_client.close
-          @client.gets.should == "226 Did it!\r\n"
-          @server.files.should include('some_file')
-          @server.file('some_file').bytes.should == 10
+        context 'passive' do
+          before :each do
+            @client.puts 'PASV'
+            @client.gets.should == "227 Entering Passive Mode (127,0,0,1,82,221)\r\n"
+          end
+
+          it "accepts STOR with filename" do
+            @client.puts "STOR some_file"
+            @client.gets.should == "125 Do it!\r\n"
+            @data_client = TCPSocket.open('127.0.0.1', 21213)
+            @data_client.puts "1234567890"
+            @data_client.close
+            @client.gets.should == "226 Did it!\r\n"
+            @server.files.should include('some_file')
+            @server.file('some_file').bytes.should == 10
+          end
+        end
+
+        context 'active' do
+          before :each do
+            @data_server = ::TCPServer.new('127.0.0.1', 21216)
+            @data_connection = Thread.new do
+              @server_client = @data_server.accept
+            end
+          end
+
+          after :each do
+            @data_server.close
+            @data_connection = nil
+            @data_server = nil
+          end
+
+          it "sends error message if no PORT received" do
+            @client.puts "STOR some_file"
+            @client.gets.should == "425 Ain't no data port!\r\n"
+          end
+
+          it "accepts STOR with filename" do
+            @client.puts "PORT 127,0,0,1,82,224"
+            @client.gets.should == "200 Okay\r\n"
+
+            @client.puts "STOR some_other_file"
+            @client.gets.should == "125 Do it!\r\n"
+
+            @data_connection.join
+            @server_client.puts "12345"
+            @server_client.close
+
+            @client.gets.should == "226 Did it!\r\n"
+            @server.files.should include('some_other_file')
+            @server.file('some_other_file').bytes.should == 5
+          end
         end
       end
     end
@@ -290,28 +355,29 @@ describe FakeFtp::Server do
       before :each do
         @ftp = Net::FTP.new
       end
+
+      after :each do
+        @ftp.close
+      end
+
       it 'should accept ftp connections' do
         proc { @ftp.connect('127.0.0.1', 21212) }.should_not raise_error
-        proc { @ftp.close }.should_not raise_error
       end
 
       it "should allow anonymous authentication" do
         @ftp.connect('127.0.0.1', 21212)
         proc { @ftp.login }.should_not raise_error
-        @ftp.close
       end
 
       it "should allow named authentication" do
         @ftp.connect('127.0.0.1', 21212)
         proc { @ftp.login('someone', 'password') }.should_not raise_error
-        @ftp.close
       end
 
       it "should allow client to quit" do
         @ftp.connect('127.0.0.1', 21212)
         proc { @ftp.login('someone', 'password') }.should_not raise_error
         proc { @ftp.quit }.should_not raise_error
-        @ftp.close
       end
 
       it "should put files using PASV" do
@@ -325,6 +391,17 @@ describe FakeFtp::Server do
         @server.file('text_file.txt').bytes.should == 20
       end
 
+      it "should put files using active" do
+        File.stat(@text_filename).size.should == 20
+
+        @ftp.connect('127.0.0.1', 21212)
+        @ftp.passive = false
+        proc { @ftp.put(@text_filename) }.should_not raise_error
+
+        @server.files.should include('text_file.txt')
+        @server.file('text_file.txt').bytes.should == 20
+      end
+
       xit "should disconnect clients on close" do
         # TODO: when this succeeds, we can care less about manually closing clients
         #       otherwise we get a CLOSE_WAIT process hanging around that blocks our port

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fake_ftp
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Colin Shield
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-05 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency