falcon 0.39.2 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f616fdd459f200e56043b17ca65c7ca089755c36b7f61804329690dd50e97f
-  data.tar.gz: c32174f12294a5b8d955eb380d7ec4a9dc158728f9ab68f5fff002ddf7494086
+  metadata.gz: 9ea41a48b0da7b6ba65df7bd8f3c63c06a8deb498119079f8ca03367bc78cfa5
+  data.tar.gz: 79e5693fc78e56b829d88b6addffe4d255fa09629cf201356192eb70563e1036
 SHA512:
-  metadata.gz: 4d836b07e2b53f7dd2c7f907c84ecbf8b9854cd16520d32248bfdcf8edc7db3d59c284b52b6044f43b46a92d9308096663b71cd3b86a18c63980aff49b3aadd0
-  data.tar.gz: ad997d393ade337767b0a107e70da56bfd11276e061cb66413d50992bbdb39830758487cc8d0853bd598554f9df0e93bad9e5bbc58be0215ddfc2927c03ec45a
+  metadata.gz: d97ae8f6aebe79fa10c410ca4ba038a731b6ace354b2bcc2bd8ec0d5a958fefed7c89d5bd47141fbb0e2f8fbbac869476e6bc1c552a8034ddc9b5835e9278d4c
+  data.tar.gz: '080b0ac4a57575b3177024248fa538d7019f3812eed267a3fd5ca9b7de7cc9388759d55c51a6b0de6b2aa71788b69f2bbc08e08488415f3cfc7e54d3707f8a14'

data/lib/falcon/adapters/output.rb

@@ -35,19 +35,37 @@ module Falcon
 			# @parameter status [Integer] The response status.
 			# @parameter headers [Protocol::HTTP::Headers] The response headers.
 			# @parameter body [Object] The `rack` response body.
-			def self.wrap(status, headers, body)
+			def self.wrap(status, headers, body, request = nil)
 				# In no circumstance do we want this header propagating out:
 				if length = headers.delete(CONTENT_LENGTH)
 					# We don't really trust the user to provide the right length to the transport.
 					length = Integer(length)
 				end
 				
+				# If we have an Async::HTTP body, we return it directly:
 				if body.is_a?(::Protocol::HTTP::Body::Readable)
+					# warn "Returning #{body.class} as body is falcon-specific and may be removed in the future!"
 					return body
-				elsif status == 200 and body.respond_to?(:to_path)
-					# Don't mangle partial responsese (206)
-					return ::Protocol::HTTP::Body::File.open(body.to_path)
-				elsif body.is_a?(Array)
+				end
+				
+				# Otherwise, we have a more typical response body:
+				if status == 200 and body.respond_to?(:to_path)
+					begin
+						# Don't mangle partial responses (206)
+						return ::Protocol::HTTP::Body::File.open(body.to_path).tap do
+							body.close if body.respond_to?(:close) # Close the original body.
+						end
+					rescue Errno::ENOENT
+						# If the file is not available, ignore.
+					end
+				end
+				
+				# If we have a streaming body, we hijack the connection:
+				unless body.respond_to?(:each)
+					return Async::HTTP::Body::Hijack.new(body, request&.body)
+				end
+				
+				if body.is_a?(Array)
 					length ||= body.sum(&:bytesize)
 					return self.new(body, length)
 				else
@@ -78,7 +96,7 @@ module Falcon
 			
 			# Whether the body can be read immediately.
 			def ready?
-				true
+				body.is_a?(Array) or body.respond_to?(:to_ary)
 			end
 			
 			# Close the response body.

data/lib/falcon/adapters/response.rb

@@ -81,7 +81,7 @@ module Falcon
 						Console.logger.warn("Ignoring protocol-level headers: #{ignored.inspect}")
 					end
 					
-					body = Output.wrap(status, headers, body)
+					body = Output.wrap(status, headers, body, request)
 				end
 				
 				if request&.head?

data/lib/falcon/environments/tls.rb

@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../extensions/openssl'
 require_relative '../controller/proxy'
 require_relative '../tls'
 
@@ -46,7 +45,7 @@ environment(:tls) do
 	# The list of certificates loaded from that path.
 	# @attribute [Array(OpenSSL::X509::Certificate)]
 	ssl_certificates do
-		OpenSSL::X509.load_certificates(ssl_certificate_path)
+		OpenSSL::X509::Certificate.load_file(ssl_certificate_path)
 	end
 	
 	# The main certificate.

data/lib/falcon/services.rb

@@ -87,9 +87,9 @@ module Falcon
 				
 				begin
 					service.stop
-				rescue
+				rescue => error
 					failed = true
-					Console.logger.error(self, $!)
+					Console.logger.error(self, error)
 				end
 			end
 			

data/lib/falcon/tls.rb

@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'extensions/openssl'
-
 module Falcon
 	module TLS
 		# The list of supported ciphers.

data/lib/falcon/version.rb

@@ -21,5 +21,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.39.2"
+	VERSION = "0.41.0"
 end

data/lib/rack/handler/falcon.rb

@@ -4,16 +4,16 @@ require 'rack/handler'
 
 require_relative '../../falcon'
 
-require 'async/reactor'
+require 'kernel/sync'
 require 'async/io/host_endpoint'
+require 'async/io/notification'
 
 module Rack
 	module Handler
 		# The falcon adaptor for the `rackup` executable.
-		module Falcon
+		class Falcon
 			# The default scheme.
 			SCHEME = "http"
-			NAME = :falcon
 			
 			# Generate an endpoint for the given `rackup` options.
 			# @returns [Async::IO::Endpoint]
@@ -27,20 +27,55 @@ module Rack
 			# Run the specified app using the given options:
 			# @parameter app [Object] The rack middleware.
 			def self.run(app, **options)
-				endpoint = endpoint_for(**options)
-				
 				app = ::Falcon::Adapters::Rack.new(app)
 				app = ::Falcon::Adapters::Rewindable.new(app)
-				
-				server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
-				yield server if block_given?
-				
-				Async::Reactor.run do
-					server.run
+						
+				Sync do |task|
+					endpoint = endpoint_for(**options)
+					server = ::Falcon::Server.new(app, endpoint, protocol: Async::HTTP::Protocol::HTTP1, scheme: SCHEME)
+
+					server_task = task.async do
+						server.run.each(&:wait)
+					end
+
+					wrapper = self.new(server, task)
+					
+					yield wrapper if block_given?
+
+					server_task.wait
+				ensure
+					server_task.stop
+					wrapper.close
+				end
+			end
+
+			def initialize(server, task)
+				@server = server
+				@task = task
+
+				@notification = Async::IO::Notification.new
+
+				@waiter = @task.async(transient: true) do
+					@notification.wait
+
+					@task&.stop
+					@task = nil
 				end
 			end
+
+			def stop
+				@notification&.signal
+			end
+
+			def close
+				@notification&.close
+				@notification = nil
+
+				@waiter&.stop
+				@waiter = nil
+			end
 		end
-		
-		register Falcon::NAME, Falcon
+
+		register :falcon, Falcon
 	end
 end

metadata

@@ -1,14 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.39.2
+  version: 0.41.0
 platform: ruby
 authors:
 - Samuel Williams
+- Janko Marohnić
+- dependabot[bot]
+- Bryan Powell
+- Sho Ito
+- claudiu
+- takkanm
+- tamkylet
+- Colby Swandale
+- Daniel Evans
+- Kent Gruber
+- Michael Adams
+- Mikel Kew
+- Olle Jonsson
+- Sh Lin
+- Tad Thorley
+- Tasos Latsas
+- deepj
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
+  -----END CERTIFICATE-----
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.57.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.56.0
+        version: 0.57.0
 - !ruby/object:Gem::Dependency
   name: async-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +168,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: openssl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: process-metrics
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +258,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.19.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: bake
   requirement: !ruby/object:Gem::Requirement
@@ -289,7 +349,6 @@ files:
 - lib/falcon/environments/self_signed_tls.rb
 - lib/falcon/environments/supervisor.rb
 - lib/falcon/environments/tls.rb
-- lib/falcon/extensions/openssl.rb
 - lib/falcon/middleware/proxy.rb
 - lib/falcon/middleware/redirect.rb
 - lib/falcon/middleware/verbose.rb
@@ -322,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.

metadata.gz.sig

@@ -0,0 +1,2 @@
+��]���.���5��w�٤����_��v����)	�����y��Ĺm,�
+��9$8�InSnv:�>���Uҟkx�:4�pVaJ89���E�bKt�����o!�m���ƛ�>;p�dKM~`���v\>=���;�$u�B�:��^	��m|-.9+M�`��G����"#ͻa:W�F ��s�m� ��m���a4��[��;�;����&$O�ٺ48��<tR4ȑ�wfn]�����-|F�T���W���C+	t���2�N~��G�	{gW�c-A�L%Uט����.h�z����s{��w��z�W��������Hn'����B���YЉ��MM���[4>Q4��3���&G?��E�H���	ç�t􃥩(�

data/lib/falcon/extensions/openssl.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'openssl/x509'
-
-module OpenSSL::X509
-	CERTIFICATE_PATTERN = /-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m
-	
-	# An extension to load an array of certificates from a file at the given path.
-	def self.load_certificates(path)
-		File.read(path).scan(CERTIFICATE_PATTERN).collect do |text|
-			Certificate.new(text)
-		end
-	end
-end