cloudbridge 0.9.1 → 0.9.2

data/bin/cloud_generate_key

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+if (!ARGV[0] || !ARGV[1])
+	puts("Usage: #{$0} secret_key hostname.com")
+	exit
+end
+
+require 'cloudbridge'
+puts CloudBridge.generate_key(ARGV[0], ARGV[1])

data/bin/cloud_mongrel_rails

@@ -1,5 +1,35 @@
 #!/usr/bin/env ruby
 require 'cloud_mongrel'
 
+if ENV['CLOUD_HOSTS']
+	cloud_hosts = ENV['CLOUD_HOSTS'].split(',') 
+else
+	cloud_hosts = []
+end	
+if ENV['CLOUD_KEYS']
+	cloud_keys = ENV['CLOUD_KEYS'].split(',')
+else
+	cloud_keys = []
+end
+
+# Look for our added arguments (-H and -K)
+remove = []
+ARGV.each_with_index {|arg, idx|
+	case arg
+	when '-H'
+		cloud_hosts.push(ARGV[idx+1])
+		remove.push(idx)
+		remove.push(idx + 1)
+	when '-K'
+		cloud_keys.push(ARGV[idx+1])
+		remove.push(idx)
+		remove.push(idx +1)
+	end
+}
+remove.reverse_each {|idx| ARGV.delete_at(idx) }
+
+ENV['CLOUD_HOSTS'] = (cloud_hosts.length() > 0 && cloud_hosts.join(',')) || nil
+ENV['CLOUD_KEYS'] = (cloud_keys.length() > 0 && cloud_keys.join(',')) || nil
+
 # just load the native mongrel version and let it do its thing with our overloaded mongrel class.
 load 'mongrel_rails'

data/lib/cloud_mongrel.rb

@@ -18,19 +18,27 @@ module Mongrel
 	class HttpServer
 		alias_method(:native_initialize, :initialize)
 		
-		# Modified to take a hash or array of hosts to listen on as the last argument.
+		# Modified to take 2 arguments at the end which are a list of hosts to listen for and a list of host-keys
+		# to send to the server to authenticate authority over those domains.
 		def initialize(*args)
-			# If the last arg is a hash or array, take it off and use it for initializing the cloudserver.
-			if (args.last.kind_of?(Hash) || args.last.kind_of?(Array))
-				listen_hosts = args.pop
+			# If the last two args are an array, take them off and use it for initializing the cloudserver.
+			listen_host_keys = args.last.kind_of?(Array) &&	args.pop
+			listen_hosts = args.last.kind_of?(Array) && args.pop
+			
+			if (!listen_hosts && listen_host_keys) # if we got only one array argument at the end, make it the hosts not the keys.
+				listen_hosts, listen_host_keys = listen_host_keys, listen_hosts
 			end
+			# last but not least, get them from the environment or provide sensible defaults.
+			listen_hosts ||= (ENV['CLOUD_HOSTS'] && ENV['CLOUD_HOSTS'].split(',')) || ["*"]
+			listen_keys ||= (ENV['CLOUD_KEYS'] && ENV['CLOUD_KEYS'].split(',')) || []
+				
 			host, port = args[0], args[1]
 			args[0], args[1] = '0.0.0.0', 0 # make mongrel listen on a random port, we're going to close it after.
 			native_initialize(*args)
 			@host = host
 			@port = port
 			@socket.close
-			@socket = CloudServer.new(@host, @port)
+			@socket = CloudBridge::Server.new(@host, @port, listen_hosts, listen_keys)
 		end
 	end
 end

data/lib/cloudbridge.rb

@@ -0,0 +1,11 @@
+require 'sha1'
+
+# CloudBridge Server Implementation
+module CloudBridge
+	# Generate a server key for a cloudbridge instance based on the secret key and hostname specified.
+	# The key grants you access to serving the host in hostname and all subdomains.
+	def self.generate_key(secret_key, hostname, timestamp = Time.now())
+		timestamp = timestamp.to_i
+		SHA1.hexdigest("#{secret_key}:#{timestamp}:#{hostname}") + ":#{timestamp}:#{hostname}"
+	end
+end

data/lib/cloudserver.rb

@@ -1,71 +1,84 @@
 require 'socket'
+require 'cloudbridge'
 
-# This class emulates the behaviour of TCPServer, but 'listens' on a cloudbridge
-# server rather than a local interface. Otherwise attempts to have an identical
-# interface to TCPServer. At least as far as mongrel uses it.
-class CloudServer
-	def initialize(cloud_host, cloud_port, listen_hosts = ['*'])
-		@cloud_host = cloud_host
-		@cloud_port = cloud_port
-		@listen_hosts = {}
-		listen_hosts.each {|host, key|
-			@listen_hosts[host] = key
-		}
-		@sockopts = []
-	end
+module CloudBridge
+	# This class emulates the behaviour of TCPServer, but 'listens' on a cloudbridge
+	# server rather than a local interface. Otherwise attempts to have an identical
+	# interface to TCPServer. At least as far as mongrel uses it.
+	class Server
 	
-	def setsockopt(*args)
-		@sockopts.push(args)
-	end
+		def initialize(cloud_host, cloud_port, listen_hosts = ['*'], listen_keys = [])
+			@cloud_host = cloud_host
+			@cloud_port = cloud_port
+			@listen_hosts = listen_hosts
+			@listen_keys = listen_keys
+			@sockopts = []
+		end
 	
-	def accept()
-		# Connect to the cloudbridge and let it know we're available for a connection.
-		# This is all entirely syncronous.
-		begin
-			socket = TCPSocket.new(@cloud_host, @cloud_port)
-			@sockopts.each {|opt| socket.setsockopt(*opt) }
-		rescue Errno::ECONNREFUSED
-			sleep(0.5)
-			retry
+		def setsockopt(*args)
+			@sockopts.push(args)
 		end
-		socket.write("BRIDGE / HTTP/1.1\r\n")
-		@listen_hosts.each {|host, key|
-			socket.write("Host: #{host}" + (key ? " #{key}" : "") + "\r\n")			
-		}
-		socket.write("\r\n")
-		code = nil
-		name = nil
-		while (line = socket.gets())
-			line = line.strip
-			if (line == "")
-				case code.to_i
-				when 100 # 100 Continue, just a ping. Ignore.
-					code = name = nil
-					next
-				when 101 # 101 Upgrade, successfuly got a connection.
-					socket.write("HTTP/1.1 100 Continue\r\n\r\n") # let the server know we're still here.
-					return socket
-				when 504 # 504 Gateway Timeout, just retry.
-					socket.close()
-					return accept()
-				else
-					raise "HTTP BRIDGE error #{code}: #{name} waiting for connection."
-				end
+	
+		def accept()
+			# Connect to the cloudbridge and let it know we're available for a connection.
+			# This is all entirely syncronous.
+			begin
+				socket = TCPSocket.new(@cloud_host, @cloud_port)
+				@sockopts.each {|opt| socket.setsockopt(*opt) }
+			rescue Errno::ECONNREFUSED
+				sleep(0.5)
+				retry
 			end
+			socket.write("BRIDGE / HTTP/1.1\r\n")
+			@listen_hosts.each {|host|
+				socket.write("Host: #{host}\r\n")
+			}
+			@listen_keys.each {|key|
+				socket.write("Host-Key: #{key}\r\n")
+			}
+			socket.write("\r\n")
+			code = nil
+			name = nil
+			headers = []
+			while (line = socket.gets())
+				line = line.strip
+				if (line == "")
+					case code.to_i
+					when 100 # 100 Continue, just a ping. Ignore.
+						code = name = nil
+						headers = []
+						next
+					when 101 # 101 Upgrade, successfuly got a connection.
+						socket.write("HTTP/1.1 100 Continue\r\n\r\n") # let the server know we're still here.
+						return socket
+					when 504 # 504 Gateway Timeout, just retry.
+						socket.close()
+						return accept()
+					else
+						raise "HTTP BRIDGE error #{code}: #{name} waiting for connection."
+					end
+				end
 			
-			if (!code && !name)
-				if (match = line.match(%r{^HTTP/1\.[01] ([0-9]{3,3}) (.*)$}))
-					code = match[1]
-					name = match[2]
-					next
+				if (!code && !name) # This is the initial response line
+					if (match = line.match(%r{^HTTP/1\.[01] ([0-9]{3,3}) (.*)$}))
+						code = match[1]
+						name = match[2]
+						next
+					else
+						raise "Parse error in BRIDGE request reply."
+					end
 				else
-					raise "Parse error in BRIDGE request reply."
+					if (match = line.match(%r{^(.+?):\s+(.+)$}))
+						headers.push({match[1] => match[2]})
+					else
+						raise "Parse error in BRIDGE request reply's headers."
+					end
 				end
 			end
 		end
-	end
 	
-	def close()
-		# doesn't need to do anything. Yet.
+		def close()
+			# doesn't need to do anything. Yet.
+		end
 	end
 end

data/test/test_cloudserver.rb

@@ -2,7 +2,7 @@ $: << "../lib"
 
 require "cloudserver"
 
-server = CloudServer.new(ARGV[0], "5432")
+server = CloudBridge::Server.new(ARGV[0], "5432")
 threads = []
 ARGV[1].to_i.times {|threadid|
 	threads.push Thread.new {

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification 
 name: cloudbridge
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Graham Batty
-- Kirk Haines (Swiftiply base) (?)
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -18,12 +17,14 @@ description: CloudBridge is a self-healing minimal-configuration bridge between
 email: graham@rubyoncloud.com
 executables: 
 - cloud_mongrel_rails
+- cloud_generate_key
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - bin/cloud_mongrel_rails
+- lib/cloudbridge.rb
 - lib/cloud_mongrel.rb
 - lib/cloudserver.rb
 - test/test_cloud_mongrel.rb
@@ -50,7 +51,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: cloudbridge
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2