envoy-proxy 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3731648e8dc81bda63ae75d5bd2d7f8bb25d6ba9
-  data.tar.gz: 30cf973ba9dc29e8d155b97c0f71a0c2f324b2d4
+  metadata.gz: 7c5709f40d5ee7755b306039b9878a39741b7639
+  data.tar.gz: 391a91d1eeaf9dbb01f08582e4d3438619df8bf9
 SHA512:
-  metadata.gz: 219e1ab7b2e51d31baacc8b3bbad3f036bf7091cde633c67a67dc18f68abfa4209fef66a6eceb725ed0a65308067d57df06a0322c8148e3e0fe5d61f7ac43090
-  data.tar.gz: 4444bfa29c6e3a56e238c49cd7a377e7d34b25c8e3f9f3b2bd0728e1c6dec0c5e15e6808ddaa282029f7a55b59f7b6be8f65210f84b55f596234a242f99c2a12
+  metadata.gz: 0f8450d98c55022734694f34fba10255893931c890c3a0159a93a6a92f4ad49e5bc1a3d159e22b2cd8e645ac246938e80d1bdd9575f59a939bb69796fc0725ba
+  data.tar.gz: c726cf5ede32c1931d8b9df400d23fa1f5cde03986a51d5bafe827d39cd96b7e37de90ca963360d32a904d20ef4c6022cadca66395cf2e3c62fcfd2a397156ba

data/README.md

@@ -6,7 +6,7 @@ A clone of proxylocal. Both client and server are included.
 
 ## The client
 
-    envoyc [--host HOST] [--tls] [--server SERVER] [[ADDRESS:]PORT] 
+    envoyc [--key KEY] [--host HOST] [--tls] [--server SERVER] [[ADDRESS:]PORT] 
 
 Makes the HTTP* service running at ADDRESS:PORT available via a proxylocal
 service running on SERVER. The default server is p45.eu, and the default address
@@ -16,6 +16,9 @@ By default, the service will be available on a randomly generated domain name.
 e.g. 4iur.p45.eu. To specify the first component of the name, use the HOST
 argument.
 
+You can connect multiple clients to the same host name. To help prevent abuse,
+each client must present the KEY.
+
 ## The server
 
     envoys [--listen [HOST:]PORT] ZONE 

data/lib/envoy/client/channel.rb

@@ -32,4 +32,3 @@ module Envoy
     
   end
 end
-

data/lib/envoy/client/command.rb

@@ -20,6 +20,9 @@ OptionParser.new do |op|
     options[:hosts] ||= []
     options[:hosts] << v
   end
+  op.on "-k", "--key KEY" do |v|
+    options[:key] = v
+  end
   op.on "-t", "--[no-]tls", "Encrypt communications with the envoy server" do |v|
     options[:tls] = v
   end

data/lib/envoy/client/trunk.rb

@@ -48,11 +48,14 @@ module Envoy
       end
       
       def receive_halt
+        @halting = true
         EventMachine.stop_event_loop
       end
       
       def unbind
-        if r = @options[:reconnect]
+        if @halting
+          STDERR.puts "Server shut us down."
+        elsif !@halting && r = @options[:reconnect]
           STDERR.write "Lost connection. Retrying... #{r[0]}\r"
           EM.add_timer 0.5 do
             @options[:reconnect] = r.rotate
@@ -64,16 +67,14 @@ module Envoy
           else
             STDERR.puts "Couldn't connect. Abandoning ship."
           end
-          receive_halt
+          EventMachine.stop_event_loop
         end
       end
       
       def ssl_handshake_completed
         options[:did_connect] = true
         options[:reconnect] = %w"- \\ | /" if options[:hosts]
-        o = options.dup
-        o.delete(:local_host)
-        send_object :options, o
+       send_object :options, options
       end
       
       def post_init

data/lib/envoy/server/trunk.rb

@@ -33,25 +33,41 @@ module Envoy
         channels[id].web.send_data data
       end
       
+      def key
+        @options[:key]
+      end
+      
+      def halt
+        send_object :halt
+        close_connection(true)
+      end
+      
       def receive_options options
         @options = options
         hosts = @options[:hosts] || []
-        hosts.delete_if do |label|
+        hosts.any? do |label|
           if label == "s"
-            send_object :message, "`s' is a reserved label"
+            send_object :message, "#{label}: label is reserved"
             true
           elsif label =~ /\./
-            send_object :message, "labels may not contain dots"
+            send_object :message, "#{label}: labels may not contain dots"
             true
+          elsif other_trunk = Trunk.trunks[label][0]
+            unless other_trunk.key == key
+              send_object :message, "#{label}: label in use, and you don't have the key"
+              true
+            end
           end
-        end
+        end && halt
         hosts << SecureRandom.random_number(36 ** 4).to_s(36) if hosts.empty?
-        m = ["Local server on port #{options[:local_port]} is now publicly available via:"]
+        m = ["#{options[:local_host]}:#{options[:local_port]} now available at:"]
         @hosts = hosts.each do |host|
           Trunk.trunks[host] << self
           m << "http://#{host}.#{$zone}/"
         end
-        send_object :message, m.join("\n")
+        @options[:key] ||= SecureRandom.hex(8)
+        send_object :message, m.join(" ")
+        send_object :message, "Your key is #{@options[:key]}"
       end
       
       def unbind

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nathan Baum