emptyd 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c1986a43737d5677bd3be8f54c70297d115ba5
-  data.tar.gz: 703dc34c62c07005a9e3e4d8e491b0d1e1d2d8a1
+  metadata.gz: 3a6c2238de6a8ddfad2f05d18c568fc1d333c458
+  data.tar.gz: 521686c0e7a3c8242870ec331d86eab857bcb62d
 SHA512:
-  metadata.gz: 157e1c2f2674399157fa02ab38fdc6d584df852241b85b0b024636345bd5301275d4f8ab61bc07acaf24294a7cdccff205841fa6fc69454be2e1eb193c73d33d
-  data.tar.gz: c89ef07273792b1b5594501f0d29032dbbf100c19e092c2ce5d5c1b0584226b2049e17edad5223271760dbd2cb0f187d88cc4f41343311aa91c6282e0e355ee8
+  metadata.gz: 966fdfbe3f9ed0e4e6a3b2628d15c2ef7c6556620f9fa66bebf5d686d3e25b12a30d41f63e5601d4da916473b6ab87980e46edb68094941800fe80d83b9f4fcf
+  data.tar.gz: eb6db97c46fdcce7be4b09ebda7fdfa03fd05d26a979391382213c2fb975bf836f053e02b9bbce2d7adf97e539d73aec0038e165753cf9a8853a2f9670a3356b

data/README.md

@@ -1,20 +1,17 @@
 # Emptyd
 
-TODO: Write a gem description
+Server counterpart of [emptyc](https://github.com/kmeaw/emptyc), which
+keeps track of SSH connections, pushes I/O over the wire, providing
+an HTTP-interface for emptyc.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+    $ sudo gem install emptyd
 
-    gem 'emptyd'
+For Mac OS X Mavericks users: if you have problems compiling native
+extensions for eventmachine-le, try setting up ARCHFLAGS:
 
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install emptyd
+    $ sudo env ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future gem install emptyd
 
 ## Usage
 

data/bin/emptyd

@@ -9,12 +9,14 @@ end
 
 require "emptyd"
 require 'evma_httpserver'
+require 'getoptlong'
 
 class MyHttpServer < EM::Connection
   include EM::HttpServer
 
-  def initialize(logger)
-    @logger = logger
+  def initialize(options)
+    @logger = options[:logger]
+    @cookie = options[:cookie]
   end
 
   def post_init
@@ -27,11 +29,21 @@ class MyHttpServer < EM::Connection
     port, ip = Socket.unpack_sockaddr_in(get_peername)
     @logger.info "#{ip}:#{port} #{@http_request_method} #{@http_path_info} #{@http_post_content.inspect}"
 
+    headers = Hash[@http_headers.split("\x00").map{|x| x.split(":",2)}.map{|x,y| [x.strip.downcase,y.lstrip]}]
+
     response = EM::DelegatedHttpResponse.new(self)
     response.status = 200
     response.content_type 'application/json'
     response.content = JSON.dump({ :okay => true })
 
+    if @cookie and headers['authorization'] != "Cookie: #{@cookie}"
+      @logger.warn "Bad cookie: #{headers['authorization']}"
+      response.status = 403
+      response.content = JSON.dump({ :cookie => :bad })
+      response.send_response
+      return
+    end
+
     begin
       case @http_path_info
       when %r{/ping}
@@ -102,10 +114,44 @@ end
 # XXX: We need a shared environment for Session and Connection
 $PASSWORD = CONFIG[:password]
 
+opts = GetoptLong.new(
+  [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+  [ '--cookie', '-C', GetoptLong::REQUIRED_ARGUMENT ],
+)
+
+logger = Logger.new(STDOUT)
+options = { :logger => logger }
+options[:cookie] = CONFIG[:cookie]
+options[:port] = CONFIG[:port]
+
+opts.each do |opt, arg|
+  case opt
+  when '--help'
+    print <<-EOF
+#{$0} [OPTION]
+
+-h, --help:
+  show help
+
+-C x, --cookie x:
+  protect server with a cookie value
+
+-p x, --port x:
+  set port number
+
+    EOF
+    exit
+  when '--cookie'
+    options[:cookie] = arg
+  when '--port'
+    options[:port] = arg.to_i
+  end
+end
+
 EM.run do
   $0 = "emptyd"
-  logger = Logger.new(STDOUT)
-  EM.start_server CONFIG[:server], CONFIG[:server_port], MyHttpServer, logger
-  logger.info "Server started on #{CONFIG[:server]}, port #{CONFIG[:server_port]}."
+
+  EM.start_server CONFIG[:server], options[:port], MyHttpServer, options
+  logger.info "Server started on #{CONFIG[:server]}, port #{options[:port]}."
 end
 

data/lib/emptyd/version.rb

@@ -1,3 +1,3 @@
 module Emptyd
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/emptyd.rb

@@ -371,15 +371,14 @@ module Emptyd
     end
 
     def terminate key
-      chan = @running[key]
-      conn = @connections[key]
+      return if @terminated[key]
+      chan = @running.delete key
+      conn = @connections.delete key
       chan.close if chan.respond_to? :close
       if conn
         callback conn, :close, "user"
         conn.unbind self 
       end
-      @running.delete key
-      @connections.delete key
       @terminated[key] = true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emptyd
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - kmeaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler