falcon 0.34.5 → 0.35.0

data/lib/falcon/configuration.rb

@@ -82,7 +82,7 @@ module Falcon
 				features.each do |feature|
 					next if @loaded.include?(feature)
 					
-					relative_path = File.join(__dir__, "configurations", "#{feature}.rb")
+					relative_path = File.join(__dir__, "configuration", "#{feature}.rb")
 					
 					self.instance_eval(File.read(relative_path), relative_path)
 					

data/lib/falcon/{configurations/host.rb → configuration/application.rb}

@@ -21,24 +21,26 @@
 require_relative '../proxy_endpoint'
 require_relative '../server'
 
-add(:host) do
+require_relative '../service/application'
+
+add(:application) do
 	middleware do
 		::Protocol::HTTP::Middleware::HelloWorld
 	end
 	
-	ipc_path {::File.expand_path("server.ipc", root)}
-	protocol {Async::HTTP::Protocol::HTTP2}
 	scheme 'https'
+	protocol {Async::HTTP::Protocol::HTTP2}
+	ipc_path {::File.expand_path("application.ipc", root)}
 	
-	endpoint {::Falcon::ProxyEndpoint.unix(ipc_path, protocol: protocol, scheme: scheme, authority: authority)}
-	
-	bound_endpoint do
-		Async::Reactor.run do
-			Async::IO::SharedEndpoint.bound(endpoint)
-		end.wait
+	endpoint do
+		::Falcon::ProxyEndpoint.unix(ipc_path,
+			protocol: protocol,
+			scheme: scheme,
+			authority: authority
+		)
 	end
 	
-	server do
-		::Falcon::Server.new(middleware, bound_endpoint, protocol, scheme)
+	service do
+		::Falcon::Service::Application
 	end
 end

data/lib/falcon/{configurations → configuration}/proxy.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-load(:host)
+load(:application)
 
-add(:proxy, :host) do
+add(:proxy, :application) do
 	endpoint {::Async::HTTP::Endpoint.parse(url)}
 end

data/lib/falcon/{configurations → configuration}/rack.rb

@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-load :host
+load :application
 
-add(:rack, :host) do
+add(:rack, :application) do
 	config_path {::File.expand_path("config.ru", root)}
 	
 	middleware do

data/lib/falcon/{configurations → configuration}/supervisor.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../supervisor'
+require_relative '../service/supervisor'
 
 add(:supervisor) do
 	start true
@@ -30,6 +30,6 @@ add(:supervisor) do
 	endpoint {Async::IO::Endpoint.unix(ipc_path)}
 	
 	service do
-		::Falcon::Supervisor.new(endpoint)
+		::Falcon::Service::Supervisor
 	end
 end

data/lib/falcon/controller/host.rb

@@ -0,0 +1,58 @@
+# Copyright, 2019, 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_relative '../services'
+
+require 'async/container/controller'
+
+module Falcon
+	module Controller
+		class Host < Async::Container::Controller
+			def initialize(command, **options)
+				@command = command
+				
+				@configuration = command.configuration
+				@services = Services.new(@configuration)
+				
+				super(**options)
+			end
+			
+			def create_container
+				@command.container_class.new
+			end
+			
+			def start
+				@services.start
+				
+				super
+			end
+			
+			def setup(container)
+				@services.setup(container)
+			end
+			
+			def stop(*)
+				@services.stop
+				
+				super
+			end
+		end
+	end
+end

data/lib/falcon/controller/proxy.rb

@@ -0,0 +1,102 @@
+# 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 'async/container/controller'
+
+require_relative 'serve'
+require_relative '../middleware/proxy'
+
+module Falcon
+	module Controller
+		class Proxy < Serve
+			SERVER_CIPHERS = "EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5".freeze
+			DEFAULT_SESSION_ID = "falcon"
+			
+			def initialize(command, session_id: DEFAULT_SESSION_ID, **options)
+				super(command, **options)
+				
+				@session_id = session_id
+				@hosts = {}
+			end
+			
+			def load_app
+				return Middleware::Proxy.new(Middleware::BadRequest, @hosts)
+			end
+			
+			def name
+				"Falcon Proxy Server"
+			end
+			
+			def host_context(socket, hostname)
+				if host = @hosts[hostname]
+					Async.logger.debug(self) {"Resolving #{hostname} -> #{host}"}
+					
+					socket.hostname = hostname
+					
+					return host.ssl_context
+				else
+					Async.logger.warn(self) {"Unable to resolve #{hostname}!"}
+					
+					return nil
+				end
+			end
+			
+			def ssl_context
+				@server_context ||= OpenSSL::SSL::SSLContext.new.tap do |context|
+					context.servername_cb = Proc.new do |socket, hostname|
+						self.host_context(socket, hostname)
+					end
+					
+					context.session_id_context = @session_id
+					
+					context.set_params(
+						ciphers: SERVER_CIPHERS,
+						verify_mode: OpenSSL::SSL::VERIFY_NONE,
+					)
+					
+					context.setup
+				end
+			end
+			
+			def endpoint
+				@command.endpoint.with(
+					ssl_context: self.ssl_context,
+					reuse_address: true,
+				)
+			end
+			
+			def start
+				configuration = @command.configuration
+				
+				services = Services.new(configuration)
+				
+				@hosts = {}
+				
+				services.each do |service|
+					if service.is_a?(Service::Application)
+						@hosts[service.authority] = service
+					end
+				end
+				
+				super
+			end
+		end
+	end
+end

data/lib/falcon/{service.rb → controller/redirect.rb}

@@ -18,35 +18,48 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/io/endpoint'
-
-require_relative 'proxy'
-require_relative 'redirection'
-
-require 'async/container'
 require 'async/container/controller'
-require 'async/http/endpoint'
+
+require_relative 'serve'
+require_relative '../middleware/redirect'
 
 module Falcon
-	class Service
-		def initialize(environment)
-			@environment = environment
-			@evaluator = @environment.evaluator
-		end
-		
-		def name
-			@evaluator.name
-		end
-		
-		def run(container)
-			container.run(name: self.name, count: 1, restart: true) do |task, instance|
-				Async.logger.info(self) {"Starting #{self.name}..."}
+	module Controller
+		class Redirect < Serve
+			def initialize(command, **options)
+				super(command, **options)
 				
-				if service = @evaluator.service
-					service.run
-				else
-					Async.logger.error(self) {"Could not determine how to start service: #{@environment.inspect}"}
+				@hosts = {}
+			end
+			
+			def load_app
+				return Middleware::Redirect.new(Middleware::NotFound, @hosts, @command.redirect_endpoint)
+			end
+			
+			def name
+				"Falcon Redirect Server"
+			end
+			
+			def endpoint
+				@command.endpoint.with(
+					reuse_address: true,
+				)
+			end
+			
+			def start
+				configuration = @command.configuration
+				
+				services = Services.new(configuration)
+				
+				@hosts = {}
+				
+				services.each do |service|
+					if service.is_a?(Service::Application)
+						@hosts[service.authority] = service
+					end
 				end
+				
+				super
 			end
 		end
 	end

data/lib/falcon/controller/serve.rb

@@ -0,0 +1,112 @@
+# Copyright, 2019, 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_relative '../server'
+
+require 'async/container/controller'
+require 'async/io/trap'
+
+require 'async/io/shared_endpoint'
+
+module Falcon
+	module Controller
+		class Serve < Async::Container::Controller
+			def initialize(command, **options)
+				@command = command
+				
+				@endpoint = nil
+				@bound_endpoint = nil
+				@debug_trap = Async::IO::Trap.new(:USR1)
+				
+				super(**options)
+			end
+			
+			def create_container
+				@command.container_class.new
+			end
+			
+			def endpoint
+				@command.endpoint
+			end
+			
+			def load_app
+				@command.load_app
+			end
+			
+			def start
+				@endpoint ||= self.endpoint
+				
+				@bound_endpoint = Async::Reactor.run do
+					Async::IO::SharedEndpoint.bound(@endpoint)
+				end.wait
+				
+				@debug_trap.ignore!
+				
+				super
+			end
+			
+			def name
+				"Falcon Server"
+			end
+			
+			def setup(container)
+				app, _ = self.load_app
+				
+				if GC.respond_to?(:compact)
+					GC.compact
+				end
+				
+				container.run(name: self.name, restart: true, **@command.container_options) do |instance|
+					Async do |task|
+						task.async do
+							if @debug_trap.install!
+								Async.logger.info(instance) do
+									"- Per-process status: kill -USR1 #{Process.pid}"
+								end
+							end
+							
+							@debug_trap.trap do
+								Async.logger.info(self) do |buffer|
+									task.reactor.print_hierarchy(buffer)
+								end
+							end
+						end
+						
+						server = Falcon::Server.new(app, @bound_endpoint, @endpoint.protocol, @endpoint.scheme)
+						
+						server.run
+						
+						instance.ready!
+						
+						task.children.each(&:wait)
+					end
+				end
+			end
+			
+			def stop(*)
+				@bound_endpoint&.close
+				
+				@debug_trap.default!
+				
+				super
+			end
+		end
+	end
+end

data/lib/falcon/controller/virtual.rb

@@ -0,0 +1,89 @@
+# 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 'async/container/controller'
+
+module Falcon
+	module Controller
+		class Virtual < Async::Container::Controller
+			def initialize(command, **options)
+				@command = command
+				
+				super(**options)
+				
+				trap(SIGHUP, &self.method(:reload))
+			end
+			
+			def assume_privileges(path)
+				stat = File.stat(path)
+				
+				Process::GID.change_privilege(stat.gid)
+				Process::UID.change_privilege(stat.uid)
+				
+				home = Etc.getpwuid(stat.uid).dir
+				
+				return {
+					'HOME' => home,
+				}
+			end
+			
+			def spawn(path, container, **options)
+				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)
+				end
+			end
+			
+			def falcon_path
+				File.expand_path("../../../bin/falcon", __dir__)
+			end
+			
+			def setup(container)
+				if proxy = container[:proxy]
+					proxy.kill(:HUP)
+				end
+				
+				if redirect = container[:redirect]
+					redirect.kill(:HUP)
+				end
+				
+				container.reload do
+					@command.resolved_paths do |path|
+						path = File.expand_path(path)
+						root = File.dirname(path)
+						
+						spawn(path, container, chdir: root)
+					end
+					
+					container.spawn(name: "Falcon Redirector", restart: true, key: :redirect) do |instance|
+						instance.exec(falcon_path, "redirect", "--bind", @command.bind_insecure, "--redirect", @command.bind_secure, *@command.paths, ready: false)
+					end
+					
+					container.spawn(name: "Falcon Proxy", restart: true, key: :proxy) do |instance|
+						instance.exec(falcon_path, "proxy", "--bind", @command.bind_secure, *@command.paths, ready: false)
+					end
+				end
+			end
+		end
+	end
+end