falcon 0.48.0 → 0.48.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dbc89627471c80f82f8888e8cce7ab9cf3dd01621ee6f92a7b6904b33c275a
-  data.tar.gz: 848e0f96f5b247866d02bc9ae0fdfc1a0f2bb4a70a5dd853927e991e635950e9
+  metadata.gz: 4305e4b3c191643bd6ee8dfc2f02e8f5c30b0fb7c60bb61bee5675c983e3e98b
+  data.tar.gz: 7c8c86e7557bbff0d29ca83af877b36a12e0db86c2a2bf5e01cd2df88b35ad82
 SHA512:
-  metadata.gz: f454b3f224174fde4901cb85ce7cfb12b447dbcf025788d3a769cab12ce1c0d0095164f668621d604a0e295648c2a18008a995133e635205c4d2aee32cf566c6
-  data.tar.gz: 633db8f65e238d35a48541ba43c3490a5c398d09883f2fb6ac41f50c316549fe49426f1870f612634d39b3766709303890ad76d9e1bbbe8863d8d85d34fcfd1f
+  metadata.gz: c6de22e4f8048e1632e8c37eab7727623c62f4a47838fee3da284bd0bb2c050e51019943b109805ccc9e23cada977449dc2fcb04a6bf6d1c18c354366bc204fc
+  data.tar.gz: 1a6f70ac00514ee5a6a110ec2013dc494077f84d5fa257cbdab11394301c4f857ca49bb4236051d4d3090360fab18809b2b2e6fde9b8a9cbc1d78efd01e0fb87

data/lib/falcon/middleware/proxy.rb

@@ -150,7 +150,20 @@ module Falcon
 			
 			Traces::Provider(self) do
 				def call(request)
-					Traces.trace('falcon.middleware.proxy.call', attributes: {authority: request.authority}) do
+					attributes = {
+						authority: request.authority,
+					}
+					
+					if host = lookup(request)
+						attributes[:endpoint] = host.endpoint.inspect
+						
+						if client = @clients[host.endpoint]
+							attributes[:client] = client.as_json
+							attributes[:pool] = client.pool.as_json
+						end
+					end
+					
+					Traces.trace('falcon.middleware.proxy.call', attributes: attributes) do
 						super
 					end
 				end

data/lib/falcon/service/virtual.rb

@@ -14,17 +14,28 @@ module Falcon
 		class Virtual < Async::Service::Generic
 			# Drop privileges according to the user and group of the specified path.
 			# @parameter path [String] The path to the application directory.
+			# @returns [Hash] The environment to use for the spawned process.
 			def assume_privileges(path)
+				# Process.exec / Process.spawn don't replace the environment but instead update it, so we need to clear out any existing BUNDLE_ variables using `nil` values, which will cause them to be removed from the child environment:
+				env = ENV.to_h do |key, value|
+					if key.start_with?('BUNDLE_')
+						[key, nil]
+					else
+						[key, value]
+					end
+				end
+				
+				env['PWD'] = File.dirname(path)
+				
 				stat = File.stat(path)
 				
 				Process::GID.change_privilege(stat.gid)
 				Process::UID.change_privilege(stat.uid)
 				
 				home = Etc.getpwuid(stat.uid).dir
+				env['HOME'] = home
 				
-				return {
-					'HOME' => home,
-				}
+				return env
 			end
 			
 			# Spawn an application instance from the specified path.
@@ -35,9 +46,7 @@ module Falcon
 				container.spawn(name: "Falcon Application", restart: true, key: path) do |instance|
 					env = assume_privileges(path)
 					
-					instance.exec(env,
-						"bundle", "exec", "--keep-file-descriptors",
-						path, ready: false, **options)
+					instance.exec(env, "bundle", "exec", path, ready: false, **options)
 				end
 			end
 			

data/lib/falcon/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2017-2024, by Samuel Williams.
 
 module Falcon
-	VERSION = "0.48.0"
+	VERSION = "0.48.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.48.0
+  version: 0.48.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -59,7 +59,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async