ftpd 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9bcb389f4310725957120c7378e1e712be899e8
-  data.tar.gz: b2a3129843509281c5afd4ec4ea8b0b63950712f
+  metadata.gz: 9c3fc097615e27f601d22ca3e2eafae1799e7ec6
+  data.tar.gz: 7a0f7056bcc776576466baf64e7c957e0b751cdf
 SHA512:
-  metadata.gz: 7233f6037507f45aac486daa99157ff6b1938690dcfd2c550db43673327d02aa815c688f8dde278607db862f1b7cb87ee0a46d8c3b32321ef082fa58df993bb4
-  data.tar.gz: 1ba557fc756eabf319fb7350c2d84939949b6e2612b707b03f2710c5d138a1b830767cf46595fdca63d78be7f62311152dc6e5cf1c926bf882a535810e46f34e
+  metadata.gz: 34bf396a9a6fa14971f9a63e6c29238f5b56dcfd40cbcb4cd1832025871186e7ecfc67ade325163039b998a24543b5a2ad5774538292ea787df5c3193de31332
+  data.tar.gz: d8530f13d4da99b95836d5109aff4564c45ab0232af9447bd36b28d6d72af5bda4aa601e029440ac5a895593453b3f2d3a32f3391fd5b84a49b81cbe34fa3073

data/Changelog.md

@@ -2,7 +2,12 @@ This is the change log for the main branch of ftpd, which supports
 Ruby 1.9 and greater.  For ruby 1.8.7, please use the latest version
 before 0.8.0.
 
-### 2.0.4 2016-07-17
+### 2.0.5 2017-07-23
+
+* Fix DOS caused by fast socket disconnects (thanks iblue)
+* Tests pass in Ruby 2.4
+
+### 2.0.4 2017-07-17
 
 * Fix gem description
 

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    ftpd (2.0.3)
+    ftpd (2.0.4)
       memoizer (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    builder (3.2.2)
+    builder (3.2.3)
     cucumber (2.4.0)
       builder (>= 2.1.2)
       cucumber-core (~> 1.5.0)
@@ -19,31 +19,31 @@ GEM
     cucumber-core (1.5.0)
       gherkin (~> 4.0)
     cucumber-wire (0.0.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     double-bag-ftps (0.1.4)
-    gherkin (4.0.0)
+    gherkin (4.1.3)
     memoizer (1.0.3)
     multi_json (1.12.1)
     multi_test (0.1.2)
     rake (11.3.0)
-    redcarpet (3.3.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    redcarpet (3.4.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
+      rspec-support (~> 3.6.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.4.1)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    timecop (0.8.1)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    timecop (0.9.1)
     yard (0.8.7.6)
 
 PLATFORMS

data/README.md

@@ -259,11 +259,18 @@ The tests pass with these Rubies:
 * ruby-1.9.3
 * ruby-2.0
 * ruby-2.1
+* ruby-2.2
+* ruby-2.3
+* ruby-2.4 (but see below)
 
 For Ruby 1.8, use an ftpd version before 0.8.  In your Gemfile:
 
     gem 'ftpd', '<0.8'
 
+This gem runs fine in Ruby 2.4, but the tests that use TLS are skipped
+in Ruby 2.4.  That is because the double_bag_ftps gem that the tests
+use for TLS does not work in Ruby 2.4.
+
 ## OS compatability
 
 ## *nix

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/examples/example.rb

@@ -33,7 +33,9 @@ module Example
       @tls = :explicit
       @port = 0
       @auth_level = 'password'
-      @user = ENV['LOGNAME']
+      # When running on travisci, the LOGNAME environment variable is
+      # not set, but we require it to be set.
+      @user = ENV['LOGNAME'] || "test"
       @password = ''
       @account = ''
       @session_timeout = default_session_timeout

data/ftpd.gemspec

@@ -92,7 +92,7 @@ Gem::Specification.new do |s|
   s.summary = "Pure Ruby FTP server library"
   s.add_runtime_dependency("memoizer", "~> 1.0")
   s.add_development_dependency("cucumber", "~> 2.0")
-  s.add_development_dependency("double-bag-ftps", ">= 0.1.4", "~> 0.1")
+  s.add_development_dependency("double-bag-ftps", "~> 0.1", ">= 0.1.4")
   s.add_development_dependency("rake", "~> 11.1")
   s.add_development_dependency("redcarpet", "~> 3.1")
   s.add_development_dependency("rspec", "~> 3.1")

data/lib/ftpd/connection_tracker.rb

@@ -54,6 +54,7 @@ module Ftpd
         @connections[ip] += 1
         @socket_ips[socket.object_id] = ip
       end
+    rescue Errno::ENOTCONN
     end
 
     # Stop tracking a connection
@@ -61,6 +62,7 @@ module Ftpd
     def stop_track(socket)
       @mutex.synchronize do
         ip = @socket_ips.delete(socket.object_id)
+        break unless ip
         if (@connections[ip] -= 1) == 0
           @connections.delete(ip)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ftpd
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Wayne Conrad
@@ -42,22 +42,22 @@ dependencies:
   name: double-bag-ftps
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.4
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Pure Ruby FTP server library