ftpd 0.8.0 → 0.9.0

data/lib/ftpd/tls_server.rb

@@ -47,7 +47,8 @@ module Ftpd
     def accept
       socket = @server_socket.accept
       if tls_enabled?
-        add_tls_methods_to_socket(socket)
+        add_missing_methods_to_socket socket
+        add_tls_methods_to_socket socket
       end
       socket
     end
@@ -66,18 +67,35 @@ module Ftpd
     end
     memoize :ssl_context
 
+    # Add to the TLS socket some methods that regular socket has, but TLS socket is missing
+
+    def add_missing_methods_to_socket(socket)
+
+      def socket.local_address
+        @io.local_address
+      end
+
+    end
+
+    # Add to the TLS sockets some methods of our own invention that
+    # make life a little easier.
+
     def add_tls_methods_to_socket(socket)
       context = @ssl_context
       class << socket
+
         def ssl_context
           context
         end
+
         def encrypted?
           !!cipher
         end
+
         def encrypt
           accept
         end
+
       end
     end
 

data/spec/list_path_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+module Ftpd
+  describe ListPath do
+
+    include ListPath
+
+    it 'should replace a missing path with "."' do
+      expect(list_path(nil)).to eq('.')
+    end
+
+    it 'should replace a switch with nothing' do
+      expect(list_path('-a')).to eq('')
+    end
+
+    it 'should preserve a filename with a dash in it' do
+      expect(list_path('foo-bar')).to eq('foo-bar')
+    end
+
+  end
+end

data/spec/protocols_spec.rb

@@ -0,0 +1,139 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+module Ftpd
+  describe Protocols do
+
+    # A fake server that returns a connected server-side socket.
+
+    class TestServer
+
+      # The socket upon which the server is listening
+
+      attr_reader :listening_socket
+
+      # Returns the connected server-side socket
+
+      attr_reader :connected_socket
+
+      # @param bind_address [String] The address to which to bind the
+      #   server socket.
+      # @param connect_address [String] The address to which the
+      #   client socket should connect.
+
+      def initialize(bind_address, connect_address)
+        queue = Queue.new
+        @listening_socket = TCPServer.new(bind_address, 0)
+        port = @listening_socket.addr[1]
+        Thread.new do
+          queue.enq @listening_socket.accept
+        end
+        client_socket = TCPSocket.new(connect_address, port)
+        @connected_socket = queue.deq
+      end
+
+    end
+
+    context 'IPV4 server' do
+
+      let(:bind_address) {'127.0.0.1'}
+      let(:connect_address) {'127.0.0.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_true
+      end
+
+      it 'should not support IPV6' do
+        expect(protocols.supports_protocol?(Protocols::IPV6)).to be_false
+      end
+
+      it 'should list the supported protocols' do
+        expect(protocols.protocol_codes).to eq [
+          Protocols::IPV4,
+        ]
+      end
+
+    end
+
+    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)}
+
+      it 'should not support IPV4' do
+        expect(protocols.supports_protocol?(Protocols::IPV4)).to be_false
+      end
+
+      it 'should support IPV6' do
+        expect(protocols.supports_protocol?(Protocols::IPV6)).to be_true
+      end
+
+      it 'should list the supported protocols' do
+        expect(protocols.protocol_codes).to eq [
+          Protocols::IPV6,
+        ]
+      end
+
+    end
+
+    context 'wildcard server, IPV4 connection' do
+
+      let(:bind_address) {'::'}
+      let(:connect_address) {'127.0.0.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_true
+      end
+
+      it 'should support IPV6' do
+        expect(protocols.supports_protocol?(Protocols::IPV6)).to be_true
+      end
+
+      it 'should list the supported protocols' do
+        expect(protocols.protocol_codes).to eq [
+          Protocols::IPV4,
+          Protocols::IPV6,
+        ]
+      end
+
+    end
+
+    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)}
+
+      it 'should support IPV4' do
+        expect(protocols.supports_protocol?(Protocols::IPV4)).to be_true
+      end
+
+      it 'should support IPV6' do
+        expect(protocols.supports_protocol?(Protocols::IPV6)).to be_true
+      end
+
+      it 'should list the supported protocols' do
+        expect(protocols.protocol_codes).to eq [
+          Protocols::IPV4,
+          Protocols::IPV6,
+        ]
+      end
+
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ end
 
 require 'ftpd'
 require 'stringio'
+require 'thread'
 require 'timecop'
 require 'tmpdir'
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 0.8.0
-  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Wayne Conrad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memoizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,129 +27,113 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: double-bag-ftps
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ftpd is a pure Ruby FTP server library.  It supports implicit and explicit
@@ -177,6 +158,7 @@ files:
 - doc/references.md
 - doc/rfc-compliance.md
 - examples/example.rb
+- examples/example_spec.rb
 - examples/hello_world.rb
 - features/example/eplf.feature
 - features/example/example.feature
@@ -192,9 +174,12 @@ files:
 - features/ftp_server/delete.feature
 - features/ftp_server/directory_navigation.feature
 - features/ftp_server/disconnect_after_failed_logins.feature
+- features/ftp_server/eprt.feature
+- features/ftp_server/epsv.feature
 - features/ftp_server/features.feature
 - features/ftp_server/file_structure.feature
 - features/ftp_server/get.feature
+- features/ftp_server/get_ipv6.feature
 - features/ftp_server/get_tls.feature
 - features/ftp_server/help.feature
 - features/ftp_server/implicit_tls.feature
@@ -212,6 +197,7 @@ files:
 - features/ftp_server/name_list_tls.feature
 - features/ftp_server/noop.feature
 - features/ftp_server/options.feature
+- features/ftp_server/pasv.feature
 - features/ftp_server/port.feature
 - features/ftp_server/put.feature
 - features/ftp_server/put_tls.feature
@@ -292,7 +278,9 @@ files:
 - lib/ftpd/insecure_certificate.rb
 - lib/ftpd/list_format/eplf.rb
 - lib/ftpd/list_format/ls.rb
+- lib/ftpd/list_path.rb
 - lib/ftpd/null_logger.rb
+- lib/ftpd/protocols.rb
 - lib/ftpd/read_only_disk_file_system.rb
 - lib/ftpd/server.rb
 - lib/ftpd/session.rb
@@ -315,36 +303,34 @@ files:
 - spec/file_system_error_translator_spec.rb
 - spec/list_format/eplf_spec.rb
 - spec/list_format/ls_spec.rb
+- spec/list_path_spec.rb
 - spec/null_logger_spec.rb
+- spec/protocols_spec.rb
 - spec/spec_helper.rb
 - spec/telnet_spec.rb
 - spec/translate_exceptions_spec.rb
 homepage: http://github.com/wconrad/ftpd
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 351587119
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pure Ruby FTP server library
 test_files: []