mongrel2 0.43.2 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f7852405a9d60c17ae16546869be99a7e042457
-  data.tar.gz: 709c3eb15aeeca3cb090b2d75bb9f18510adbe58
+  metadata.gz: 26139efa603e33508d75a1ce39b158d5c3c9718a
+  data.tar.gz: e4cd15d5ff533a8139f6c3b0601c6a9ec7ae1b7a
 SHA512:
-  metadata.gz: d44d49fabcaa5dc7e967758f10db8934fe73c8c184356a94222ccfa524d26570e254427c7caf8dbe5c8188a287ba8cedda0c75c71d0eab246d3be8430a21c09e
-  data.tar.gz: 37f057770da4532f7fa95cef17cc26d7a853f31b0ee94e7b7df5175320b74d07674443a4f666b0a7a817d24ebe9eddb41ebbae11aaeb610b76d88c7d5e835fdf
+  metadata.gz: a036ca5e4bac09a1a03d1c4c75b8451c543c081384a8407f3c27ae8acd00dc477909edb7d03470ada71613c92961f944be442ab4bcbd0a02a5144c026ef4364d
+  data.tar.gz: 1ce62fe189f10d61946a01e7d9857da78359668bc943ace456b46ca3a55b183084b403c9629d3b1cf326245cd79d6aaf21f167a4a819e47f9085aa965bac3af7

data/ChangeLog

@@ -1,8 +1,58 @@
+2016-01-20  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/mongrel2/handler.rb, lib/mongrel2/request.rb, spec/helpers.rb,
+	spec/mongrel2/config/dsl_spec.rb, spec/mongrel2/handler_spec.rb:
+	Ensure that Mongrel2 spool files are removed after the lifetime of a
+	request.
+	[250431675079] [github/master, tip]
+
+2015-12-30  Mahlon E. Smith  <mahlon@martini.nu>
+
+	* lib/mongrel2/constants.rb:
+	Add the newly proposed code specific to legal obstacles /
+	censorship.
+
+	https://datatracker.ietf.org/doc/draft-ietf-httpbis-legally-
+	restricted-status/?include_text=1
+	[65558310228d]
+
 2015-10-01  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.43.2 for changeset ebb8ae0b71ff
+	[fb7a9cf2c2ea]
+
+	* .hgsigs:
+	Added signature for changeset 17359ad421b0
+	[ebb8ae0b71ff] [v0.43.2]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bumped the patch version, as 0.43.1 somehow got released without a
+	tag.
+	[17359ad421b0]
+
+	* .hgtags:
+	Added tag v0.43.1 for changeset 8c5c225990c0
+	[083b75a08bf5]
+
+	* .hgsigs:
+	Added signature for changeset f8a9e5cc138d
+	[8c5c225990c0] [v0.43.1]
+
+	* History.rdoc:
+	Update history.
+	[f8a9e5cc138d]
+
+	* lib/mongrel2/connection.rb:
+	Strip some debug logging.
+
+	They were throwing encoding errors under the latest Ruby 2.2, and
+	they weren't really serving a purpose any longer anyway.
+	[33a9fd04279f]
+
 	* .gems:
 	Update gemset to latest versions
-	[23b8eb49ae8f] [tip]
+	[23b8eb49ae8f]
 
 2015-03-25  Michael Granger  <ged@FaerieMUD.org>
 
@@ -12,7 +62,7 @@
 
 	* History.rdoc, lib/mongrel2.rb:
 	Bump the patch version, update history.
-	[d86faeea99f6] [github/master]
+	[d86faeea99f6]
 
 	* lib/mongrel2/constants.rb:
 	Remove some duplicated constant

data/History.rdoc

@@ -1,3 +1,16 @@
+== v0.44.0 [2016-01-20] Mahlon E. Smith <mahlon@martini.nu>
+
+Enhancements:
+
+- Ensure that Mongrel2 spool files are removed after the lifetime of a
+  request.
+- Add the newly proposed code specific to legal obstacles /
+  censorship.
+
+https://datatracker.ietf.org/doc/draft-ietf-httpbis-legally-
+restricted-status/?include_text=1
+
+
 == v0.43.2 [2015-03-25] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/lib/mongrel2/constants.rb

@@ -81,6 +81,7 @@ module Mongrel2::Constants
 		RECONDITION_REQUIRED          = 428
 		TOO_MANY_REQUESTS             = 429
 		REQUEST_HEADERS_TOO_LARGE     = 431
+		UNAVAILABLE_DUE_TO_LEGALITIES = 451
 
 		SERVER_ERROR                  = 500
 		NOT_IMPLEMENTED               = 501
@@ -143,6 +144,7 @@ module Mongrel2::Constants
 		    428 => "Precondition Required",
 		    429 => "Too Many Requests",
 		    431 => "Request Headers too Large",
+		    451 => "Unavailable For Legal Reasons",
 		    500 => "Internal Server Error",
 		    501 => "Method Not Implemented",
 		    502 => "Bad Gateway",

data/lib/mongrel2/handler.rb

@@ -256,6 +256,15 @@ class Mongrel2::Handler
 			self.log.info( res.inspect )
 			@conn.reply( res ) unless @conn.closed?
 		end
+	ensure
+		# Remove any temporarily spooled Mongrel2 files.
+		begin
+			if req && req.body && req.body.respond_to?( :path ) && req.body.path
+				File.unlink( req.body.path )
+			end
+		rescue Errno::ENOENT => err
+			self.log.debug "File already cleaned up: %s (%s)" % [ req.body.path, err.message ]
+		end
 	end
 
 

data/lib/mongrel2/request.rb

@@ -201,7 +201,7 @@ class Mongrel2::Request
 			self.log.error "uploaded body %s not found: tried relative to cwd and server chroot (%s)" %
 				[ relpath, chrooted ]
 			raise Mongrel2::UploadError,
-				"couldn't find the path to uploaded body."
+				"couldn't find the path to uploaded body %p." % [ chrooted.to_s ]
 		end
 	end
 

data/lib/mongrel2.rb

@@ -25,10 +25,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.43.2'
+	VERSION = '0.44.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 17359ad421b0 $
+	REVISION = %q$Revision: 796ca99139a6 $
 
 
 	require 'mongrel2/constants'

data/spec/helpers.rb

@@ -30,6 +30,7 @@ require 'sequel/model'
 ### RSpec helper functions that are used to test Mongrel2 itself.
 module Mongrel2::SpecHelpers
 	include Mongrel2::TestConstants
+	include Mongrel2::Config::DSL
 
 	###############
 	module_function
@@ -45,6 +46,12 @@ module Mongrel2::SpecHelpers
 	def setup_config_db
 		Mongrel2::Config.db ||= Mongrel2::Config.in_memory_db
 		Mongrel2::Config.init_database
+		clean_config_db()
+	end
+
+
+	### Wipe out any existing db data.
+	def clean_config_db
 		Mongrel2::Config.db.tables.collect {|t| Mongrel2::Config.db[t] }.each( &:truncate )
 	end
 
@@ -62,8 +69,24 @@ module Mongrel2::SpecHelpers
 	end
 
 
+	### Provide a default mongrel2 configuration.
+	###
+	def setup_mongrel2_config
+		server 'test-server' do
+			chroot Dir.tmpdir
+			port 8080
+			default_host 'test-host'
+
+			host 'test-host' do
+				route '/handler', handler( TEST_RECV_SPEC, 'test-handler' )
+			end
+		end
+	end
+
+
 	### Make a raw Mongrel2 request from the specified +opts+ and return it as a String.
 	def make_request( opts={} )
+		setup_mongrel2_config()
 		opts = TEST_REQUEST_OPTS.merge( opts )
 		headers = normalize_headers( opts )
 

data/spec/mongrel2/config/dsl_spec.rb

@@ -21,11 +21,7 @@ describe Mongrel2::Config::DSL do
 	end
 
 	before( :each ) do
-		Mongrel2::Config::Server.truncate
-		Mongrel2::Config::Host.truncate
-		Mongrel2::Config::Route.truncate
-		Mongrel2::Config::Filter.truncate
-		Mongrel2::Config::XRequest.truncate
+		clean_config_db()
 	end
 
 	after( :all ) do

data/spec/mongrel2/handler_spec.rb

@@ -77,6 +77,11 @@ describe Mongrel2::Handler do
 			Mongrel2::Config::Handler.create( @handler_config )
 		end
 
+		after( :each ) do
+			clean_config_db
+		end
+
+
 		it "can look up connection information given an application ID" do
 			expect(
 				Mongrel2::Handler.connection_info_for(TEST_UUID)
@@ -121,7 +126,7 @@ describe Mongrel2::Handler do
 			Mongrel2::Config::Handler.dataset.truncate
 			expect {
 				Mongrel2::Handler.connection_info_for( TEST_UUID )
-			}.to raise_error()
+			}.to raise_error( ArgumentError )
 		end
 
 	end
@@ -300,5 +305,18 @@ describe Mongrel2::Handler do
 		expect( res.conn ).to_not equal( original_conn )
 	end
 
+	it "cleans any mongrel2 request spool files after sending a response" do
+		spoolfile = Pathname.new( Dir.tmpdir + '/mongrel2.uskd8l1' )
+		spoolfile.write( "Hi!" )
+
+		req = make_request( 'METHOD' => 'POST', :headers => {
+			'x-mongrel2-upload-start' => spoolfile.basename,
+			'x-mongrel2-upload-done'  => spoolfile.basename
+		})
+		expect( @request_sock ).to receive( :recv ).and_return( req )
+
+		res = OneShotHandler.new( TEST_UUID, TEST_SEND_SPEC, TEST_RECV_SPEC ).run
+		expect( spoolfile ).to_not exist
+	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.43.2
+  version: 0.44.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
   xn3DzOkDE6NYbk8gC9rTsA==
   -----END CERTIFICATE-----
-date: 2015-10-02 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -410,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby-Mongrel2 is a complete Ruby connector for Mongrel2[http://mongrel2.org/]