ftpd 1.1.1 → 2.0.0

data/spec/connection_throttle_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/connection_tracker_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/data_server_factory_spec.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+module Ftpd
+  describe DataServerFactory do
+
+    it "creates a socket bound to 127.0.0.1" do
+      factory = DataServerFactory.make("127.0.0.1", nil)
+      tcp_server = factory.make_tcp_server
+      expect(tcp_server.addr[3]).to eq "127.0.0.1"
+    end
+
+    it "creates a socket bound to 127.0.0.2" do
+      factory = DataServerFactory.make("127.0.0.2", nil)
+      tcp_server = factory.make_tcp_server
+      expect(tcp_server.addr[3]).to eq "127.0.0.2"
+    end
+
+    context "with no port range" do
+
+      it "creates a socket bound to an ephemeral port" do
+        interface = "0.0.0.0"
+        factory = DataServerFactory.make(interface, nil)
+        ports = (1..10).map do
+          tcp_server = factory.make_tcp_server
+          begin
+            tcp_server.addr[1]
+          ensure
+            tcp_server.close
+          end
+        end
+        expect(ports.uniq.size).to be > 1
+        ports.each do |port|
+          expect(port).to be_between(1024, 65535)
+        end
+      end
+
+    end
+
+    context "with a port range" do
+
+      let(:interface) { "127.0.0.1" }
+      
+      def get_unused_port
+        server = TCPServer.new(interface, 0)
+        port = server.addr[1]
+        server.close
+        port
+      end
+
+      def use_port(port)
+        server = TCPServer.new(interface, port)
+        begin
+          yield
+        ensure
+          server.close
+        end
+      end
+
+      it "creates a socket bound to an ephemeral port" do
+        ports = (1..10).map { get_unused_port }
+        factory = DataServerFactory.make(interface, ports)
+        10.times do
+          tcp_server = factory.make_tcp_server
+          begin
+            port = tcp_server.addr[1]
+            expect(ports).to include(port)
+          ensure
+            tcp_server.close
+          end
+        end
+      end
+
+      it "skips a port that is already in use" do
+        ports = (1..2).map { get_unused_port }
+        use_port(ports[0]) do
+          factory = DataServerFactory.make(interface, ports)
+          10.times do
+            tcp_server = factory.make_tcp_server
+            begin
+              port = tcp_server.addr[1]
+              expect(port).to eq ports[1]
+            ensure
+              tcp_server.close
+            end
+          end
+        end
+      end
+
+      it "uses a random ephemeral port when all configured ports are in use" do
+        ports = [ get_unused_port ]
+        use_port(ports[0]) do
+          factory = DataServerFactory.make(interface, ports)
+          tcp_server = factory.make_tcp_server
+          port = tcp_server.addr[1]
+          expect(port).to_not eq ports[0]
+        end
+      end
+
+    end
+
+  end
+end

data/spec/disk_file_system_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/exception_translator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/file_info_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/ftp_server_error_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/list_format/eplf_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/list_format/ls_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/list_path_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/null_logger_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/protocols_spec.rb

@@ -1,10 +1,26 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
+require_relative "../testlib/network"
+
 module Ftpd
   describe Protocols do
 
-    # A fake server that returns a connected server-side socket.
+    extend TestLib::Network
+
+    def self.if_stack_supports_ipv6
+      if ipv6_supported?
+        return yield
+      else
+        if !@ipv6_warning_issued
+          warn "Stack does not support IPV6; skipping some tests"
+          @ipv6_warning_issued = true
+        end
+      end
+    end
 
+    # A fake server that returns a connected server-side socket.
     class TestServer
 
       # The socket upon which the server is listening
@@ -58,29 +74,31 @@ module Ftpd
 
     end
 
-    context 'IPV6 server, IPV6 connection' do
+    if_stack_supports_ipv6 do
+      context 'IPV6 server, IPV6 connection' do
 
-      let(:bind_address) {'::1'}
-      let(:connect_address) {'::1'}
-      let(:connected_socket) do
-        TestServer.new(bind_address, connect_address).connected_socket
-      end
-      subject(:protocols) {Protocols.new(connected_socket)}
+        let(:bind_address) {'::1'}
+        let(:connect_address) {'::1'}
+        let(:connected_socket) do
+          TestServer.new(bind_address, connect_address).connected_socket
+        end
+        subject(:protocols) {Protocols.new(connected_socket)}
 
-      it 'should not support IPV4' do
-        expect(protocols.supports_protocol?(Protocols::IPV4)).to be_falsey
-      end
+        it 'should not support IPV4' do
+          expect(protocols.supports_protocol?(Protocols::IPV4)).to be_falsey
+        end
 
-      it 'should support IPV6' do
-        expect(protocols.supports_protocol?(Protocols::IPV6)).to be_truthy
-      end
+        it 'should support IPV6' do
+          expect(protocols.supports_protocol?(Protocols::IPV6)).to be_truthy
+        end
 
-      it 'should list the supported protocols' do
-        expect(protocols.protocol_codes).to eq [
-          Protocols::IPV6,
-        ]
-      end
+        it 'should list the supported protocols' do
+          expect(protocols.protocol_codes).to eq [
+                                                Protocols::IPV6,
+                                              ]
+        end
 
+      end
     end
 
     context 'wildcard server, IPV4 connection' do
@@ -109,30 +127,32 @@ module Ftpd
 
     end
 
-    context 'wildcard server, IPV6 connection' do
+    if_stack_supports_ipv6 do
+      context 'wildcard server, IPV6 connection' do
 
-      let(:bind_address) {'::'}
-      let(:connect_address) {'::1'}
-      let(:connected_socket) do
-        TestServer.new(bind_address, connect_address).connected_socket
-      end
-      subject(:protocols) {Protocols.new(connected_socket)}
+        let(:bind_address) {'::'}
+        let(:connect_address) {'::1'}
+        let(:connected_socket) do
+          TestServer.new(bind_address, connect_address).connected_socket
+        end
+        subject(:protocols) {Protocols.new(connected_socket)}
 
-      it 'should support IPV4' do
-        expect(protocols.supports_protocol?(Protocols::IPV4)).to be_truthy
-      end
+        it 'should support IPV4' do
+          expect(protocols.supports_protocol?(Protocols::IPV4)).to be_truthy
+        end
 
-      it 'should support IPV6' do
-        expect(protocols.supports_protocol?(Protocols::IPV6)).to be_truthy
-      end
+        it 'should support IPV6' do
+          expect(protocols.supports_protocol?(Protocols::IPV6)).to be_truthy
+        end
 
-      it 'should list the supported protocols' do
-        expect(protocols.protocol_codes).to eq [
-          Protocols::IPV4,
-          Protocols::IPV6,
-        ]
-      end
+        it 'should list the supported protocols' do
+          expect(protocols.protocol_codes).to eq [
+                                                Protocols::IPV4,
+                                                Protocols::IPV6,
+                                              ]
+        end
 
+      end
     end
 
   end

data/spec/server_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 unless $:.include?(File.dirname(__FILE__) + '/../lib')
   $:.unshift(File.dirname(__FILE__) + '/../lib')
 end

data/spec/telnet_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby encoding: us-ascii -*-
 
 require File.expand_path('spec_helper', File.dirname(__FILE__))

data/spec/translate_exceptions_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 module Ftpd

data/testlib/network.rb

@@ -0,0 +1,17 @@
+module TestLib
+  module Network
+
+    extend self
+
+    def ipv6_supported?
+      begin
+        server = TCPServer.new("::1", 0)
+        server.close
+        true
+      rescue Errno::EADDRNOTAVAIL
+        false
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2016-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: double-bag-ftps
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,7 @@ files:
 - features/step_definitions/get.rb
 - features/step_definitions/help.rb
 - features/step_definitions/invalid_commands.rb
+- features/step_definitions/ipv6.rb
 - features/step_definitions/line_endings.rb
 - features/step_definitions/list.rb
 - features/step_definitions/login.rb
@@ -331,6 +332,9 @@ files:
 - lib/ftpd/connection_throttle.rb
 - lib/ftpd/connection_tracker.rb
 - lib/ftpd/data_connection_helper.rb
+- lib/ftpd/data_server_factory.rb
+- lib/ftpd/data_server_factory/random_ephemeral_port.rb
+- lib/ftpd/data_server_factory/specific_port_range.rb
 - lib/ftpd/disk_file_system.rb
 - lib/ftpd/error.rb
 - lib/ftpd/exception_translator.rb
@@ -363,6 +367,7 @@ files:
 - spec/command_sequence_checker_spec.rb
 - spec/connection_throttle_spec.rb
 - spec/connection_tracker_spec.rb
+- spec/data_server_factory_spec.rb
 - spec/disk_file_system_spec.rb
 - spec/exception_translator_spec.rb
 - spec/file_info_spec.rb
@@ -376,6 +381,7 @@ files:
 - spec/spec_helper.rb
 - spec/telnet_spec.rb
 - spec/translate_exceptions_spec.rb
+- testlib/network.rb
 homepage: http://github.com/wconrad/ftpd
 licenses:
 - MIT
@@ -396,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library