envoy-proxy 0.0.12 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 281c4bfc469bce4dd3f577cd04e8c788b0803646
-  data.tar.gz: 5ea2ace10ed0341ecc6292756a5f9665f0fb23a1
+  metadata.gz: 1b54921a713d37da78b7a2bbd63448f7ebc8be2c
+  data.tar.gz: 29a76e5a111c75216a3e7bc246e6bae29ea397f6
 SHA512:
-  metadata.gz: c4b51e8065e16f039d2ebb72915ab1bd15ffa603c318240441985d509ce813ddb351477f9cc022e0611430cdb645347fafe1359cbeffaf995320cf233df943ad
-  data.tar.gz: 665991472fe262ead0cfb1080ea062966960ac54f34e260f300ff93b4d07764d2e9a7de889e859fdad0bd67db6049bbe5d2ce1c8a6f0b8dc07310a05ac9948fd
+  metadata.gz: e1adb7a4b761b994c7d2dda63f29ca00cc7b29bbe11dcc847e78cb51a6cdb2a774b21b93d0bcd8eddf2b32be4c3ca643466fa1d94632f68940a574160dcc40e0
+  data.tar.gz: dc5d9a2b267f8355529ccedef95566522a3596adebfebf3805dd8d37c3d1ae265e0182981e11343f574bfb306474fa0f5a6bdeddfb9bc8998da6c5f154ea6682

data/README.md

@@ -6,7 +6,7 @@ A clone of proxylocal. Both client and server are included.
 
 ## The client
 
-    envoyc [--key KEY] [--host HOST] [--tls] [--server SERVER] [[ADDRESS:]PORT] 
+    envoy [--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
@@ -21,9 +21,11 @@ each client must present the KEY.
 
 ## The server
 
-    envoys [--listen [HOST:]PORT] ZONE 
+    envoyd [--key KEY] [--listen [HOST:]PORT] ZONE 
 
 Starts a proxylocal-compatible server. Listens for HTTP requests on the
 specified host and port, which default to 0.0.0.0 and 8080.
 
+If KEY is specified, clients _must_ specify that key.
+
 The ZONE specifies the domain name suffix.

data/lib/envoy/server/command.rb

@@ -3,6 +3,7 @@ require 'envoy/server/web'
 require 'optparse'
 
 listen = ["0.0.0.0", "8080"]
+key = nil
 
 OptionParser.new do |op|
   op.banner = "Usage: #{$0} [options] ZONE"
@@ -10,6 +11,9 @@ OptionParser.new do |op|
     port, host = v.split(":").reverse
     listen = [host || "0.0.0", port]
   end
+  op.on "-k", "--key KEY", "Require authentication using KEY" do |v|
+    key = v
+  end
   op.on "--version" do
     puts Envoy::VERSION
     exit
@@ -22,7 +26,7 @@ $zone = ARGV[0].gsub(/^\.+/, '')
 
 unless EM.reactor_running?
   EM.run do
-    EM.start_server "0.0.0.0", 8282, Envoy::Server::Trunk
+    EM.start_server "0.0.0.0", 8282, Envoy::Server::Trunk, key
     EM.start_server *listen, Envoy::Server::Web
   end
 end

data/lib/envoy/server/trunk.rb

@@ -5,6 +5,11 @@ module Envoy
     module Trunk
       include Protocol
       
+      def initialize key
+        super
+        @key = key
+      end
+      
       def self.trunks
         @trunks ||= Hash.new{|h,k|h[k] = []}
       end
@@ -39,13 +44,18 @@ module Envoy
         @options[:key]
       end
       
-      def halt
+      def halt message = nil
+        send_object :message, message if message
         send_object :halt
         close_connection(true)
       end
       
       def receive_options options
         @options = options
+        if @key and @key != @options[:key]
+          halt "Key is invalid"
+          return
+        end
         hosts = @options[:hosts] || []
         hosts.any? do |label|
           if label == "s"
@@ -67,9 +77,11 @@ module Envoy
           Trunk.trunks[host] << self
           m << "http://#{host}.#{$zone}/"
         end
-        @options[:key] ||= SecureRandom.hex(8)
         send_object :message, m.join(" ")
-        send_object :message, "Your key is #{@options[:key]}"
+        unless @options[:key]
+          @options[:key] ||= SecureRandom.hex(8)
+          send_object :message, "Your key is #{@options[:key]}"
+        end 
       end
       
       def unbind

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.0.12'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.14
 platform: ruby
 authors:
 - Nathan Baum
@@ -70,8 +70,8 @@ description:
 email:
 - n@p12a.org.uk
 executables:
-- envoyc
-- envoys
+- envoy
+- envoyd
 extensions: []
 extra_rdoc_files: []
 files:
@@ -80,8 +80,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/envoyc
-- bin/envoys
+- bin/envoy
+- bin/envoyd
 - envoy-proxy.gemspec
 - lib/envoy/client/channel.rb
 - lib/envoy/client/command.rb