falcon 0.14.1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb22e9e65dae2598de9366fd050ce711c1c506186e4de000ece3ac391ba9291
-  data.tar.gz: df1e5a1a889fb7867c088212f2849bc7639e7d63189745fac275fa45d3aa7d9a
+  metadata.gz: f847d041f11cc2854a3e2fd3e7d7568c0113b6530df89460599df8fb204204cf
+  data.tar.gz: a348fd0255c62fe12df681649bb4b9055f23f705c068115af7a8039075f4fae7
 SHA512:
-  metadata.gz: b2433bbc082ac1cb8a354f8ae73f34b35d6ac7e39976b58d320c690dc97793e5f72f647b1cadaafe1eac6a0be12136a6777bf4ba2c9cebd5d845279078cfc541
-  data.tar.gz: aaa936fdfa1e22b1ba9c1dc98c4edd4d77fb74a8135b62d9e3cfedbc7d11141f7681a56a1956992e2465f9c9790f7fac159e6d65ae8ea918b5fb197442c5b49e
+  metadata.gz: 335772ebca6b5e93a7c9de54c614e9a61522547ac06fba52d3014457644b9d74f7bc2530da6414f4a15e39b3da48289e36109d9776ecee4ce2d1cdfc0df55677
+  data.tar.gz: 1b696f587b0f3e9ba85be31bc740e81f377968d7bf9b183347629402ba0742e5c81a39dd524d55dcd7e4024bc7e65393fdfbf634978adb2272a77ffbcfed8ec3

data/lib/falcon/hosts.rb

@@ -27,6 +27,8 @@ module Falcon
 			@endpoint = nil
 			@ssl_certificate = nil
 			@ssl_key = nil
+			
+			@ssl_context = nil
 		end
 		
 		attr_accessor :app
@@ -35,6 +37,15 @@ module Falcon
 		
 		attr_accessor :ssl_certificate
 		attr_accessor :ssl_key
+		attr_accessor :ssl_context
+		
+		def freeze
+			return if frozen?
+			
+			ssl_context
+			
+			super
+		end
 		
 		def ssl_certificate_path= path
 			@ssl_certificate = OpenSSL::X509::Certificate.new(File.read(path))
@@ -45,13 +56,15 @@ module Falcon
 		end
 		
 		def ssl_context
-			if @ssl_key
-				OpenSSL::SSL::SSLContext.new.tap do |context|
-					context.cert = @ssl_certificate
-					context.key = @ssl_key
-					
-					context.set_params
-				end
+			@ssl_context ||= OpenSSL::SSL::SSLContext.new(:TLSv1).tap do |context|
+				context.cert = @ssl_certificate
+				context.key = @ssl_key
+				
+				context.session_id_context = "falcon"
+				
+				context.set_params
+				
+				context.freeze
 			end
 		end
 		
@@ -81,21 +94,25 @@ module Falcon
 		
 		def endpoint
 			@server_endpoint ||= Async::HTTP::URLEndpoint.parse(
-				'https://0.0.0.0',
+				'https://[::]',
 				ssl_context: self.ssl_context,
 				reuse_address: true
 			)
 		end
 		
 		def ssl_context
-			@server_context ||= OpenSSL::SSL::SSLContext.new.tap do |context|
+			@server_context ||= OpenSSL::SSL::SSLContext.new(:TLSv1).tap do |context|
 				context.servername_cb = Proc.new do |socket, hostname|
 					self.host_context(socket, hostname)
 				end
 				
+				context.session_id_context = "falcon"
+				
 				context.alpn_protocols = DEFAULT_ALPN_PROTOCOLS
 				
 				context.set_params
+				
+				context.freeze
 			end
 		end
 		

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.14.1"
+	VERSION = "0.14.2"
 end

data/server.rb

@@ -8,23 +8,24 @@ require 'async/container/controller'
 require 'async/container/forked'
 
 require 'async/clock'
+require 'ruby-prof'
 
 Async.logger.level = Logger::INFO
 
 hosts = Falcon::Hosts.new
 
-hosts.add('map.local') do |host|
+hosts.add('mc.oriontransfer.co.nz') do |host|
 	host.endpoint = Async::HTTP::URLEndpoint.parse('http://hana.local:8123')
 	
-	# host.ssl_certificate_path = '/etc/letsencrypt/live/mc.oriontransfer.co.nz/fullchain.pem'
-	# host.ssl_key_path = '/etc/letsencrypt/live/mc.oriontransfer.co.nz/privkey.pem'
+	host.ssl_certificate_path = '/etc/letsencrypt/live/mc.oriontransfer.co.nz/fullchain.pem'
+	host.ssl_key_path = '/etc/letsencrypt/live/mc.oriontransfer.co.nz/privkey.pem'
 end
 
-hosts.add('chick.local') do |host|
+hosts.add('chick.nz') do |host|
 	host.endpoint = Async::HTTP::URLEndpoint.parse('http://hana.local:8765')
 	
-	# host.ssl_certificate_path = '/etc/letsencrypt/live/chick.nz/fullchain.pem'
-	# host.ssl_key_path = '/etc/letsencrypt/live/chick.nz/privkey.pem'
+	host.ssl_certificate_path = '/etc/letsencrypt/live/chick.nz/fullchain.pem'
+	host.ssl_key_path = '/etc/letsencrypt/live/chick.nz/privkey.pem'
 end
 
 controller = Async::Container::Controller.new
@@ -35,59 +36,60 @@ hosts.each do |name, host|
 	end
 end
 
-#proxy = Falcon::Verbose.new(
-	proxy = Falcon::Proxy.new(Falcon::BadRequest, hosts.client_endpoints)
-#)
-
+proxy = Falcon::Proxy.new(Falcon::BadRequest, hosts.client_endpoints)
 debug_trap = Async::IO::Trap.new(:USR1)
 
-require 'ruby-prof'
+profile = RubyProf::Profile.new(merge_fibers: true)
 
-#controller << Async::Container::Forked.new do
+#controller << Async::Container::Forked.new do |task|
 	Process.setproctitle("Falcon Proxy")
 	
-	server = Falcon::Server.new(proxy, Async::HTTP::URLEndpoint.parse(
-		'http://0.0.0.0:4433',
-		reuse_address: true
-	))
-	
-	# profile the code
-	profile = RubyProf::Profile.new(merge_fibers: true)
+	server = Falcon::Server.new(
+		proxy,
+		Async::HTTP::URLEndpoint.parse(
+			'https://0.0.0.0',
+			reuse_address: true,
+			ssl_context: hosts.ssl_context
+		)
+	)
+
+begin
+	#profile.start
 	
-	# begin
-	# 	profile.start
-		
-		Async::Reactor.run do |task|
-			task.async do
-				debug_trap.install!
-				$stderr.puts "Send `kill -USR1 #{Process.pid}` for detailed status :)"
-				
-				debug_trap.trap do
-					task.reactor.print_hierarchy($stderr)
-					# Async.logger.level = Logger::DEBUG
-				end
-			end
+	Async::Reactor.run do |task|
+		task.async do
+			debug_trap.install!
+			$stderr.puts "Send `kill -USR1 #{Process.pid}` for detailed status :)"
 			
-			task.async do |task|
-				start_time = Async::Clock.now
-				
-				while true
-					task.sleep(600)
-					duration = Async::Clock.now - start_time
-					puts "Handled #{proxy.count} requests; #{(proxy.count.to_f / duration.to_f).round(1)} requests per second."
-				end
+			debug_trap.trap do
+				task.reactor.print_hierarchy($stderr)
+				# Async.logger.level = Logger::DEBUG
 			end
+		end
+		
+		task.async do |task|
+			start_time = Async::Clock.now
 			
-			server.run
+			while true
+				task.sleep(600)
+				duration = Async::Clock.now - start_time
+				puts "Handled #{proxy.count} requests; #{(proxy.count.to_f / duration.to_f).round(1)} requests per second."
+			end
 		end
-	# ensure
-	# 	profile.stop
-	# 
-	# 	# print a flat profile to text
-	# 	printer = RubyProf::FlatPrinter.new(profile)
-	# 	printer.print($stdout)
-	# end
-#end
+		
+		$stderr.puts "Starting server"
+		server.run
+	end
+ensure
+	if profile.running?
+		profile.stop
+		
+		# print a flat profile to text
+		printer = RubyProf::FlatPrinter.new(profile)
+		printer.print($stdout)
+	end
+end
 
 #Process.setproctitle("Falcon Controller")
 #controller.wait
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2
 platform: ruby
 authors:
 - Samuel Williams