emptyd 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88a76bcac44fc89b74e875ff71ec9e0c16e9d660
-  data.tar.gz: 0a0c9f81585dbae1d9c211550a14d2529e042b43
+  metadata.gz: 267809f0db88a7bef5c0513fbea5773dff218021
+  data.tar.gz: b4a6ab60c689d4b518b8bd581caf76ed53c446bf
 SHA512:
-  metadata.gz: adb847d23de4ad6b62e91770465c8fefb31cd705f5275383399bd5468b4fbb057e8d823f8f4b78fbf711856c67bcaf95fac567c698a8372e32bd23bfa4b6a0a0
-  data.tar.gz: 9d15e28c62dbe9c10980cf118e44c284e2142bc414fc6c273305e4124bd0cc0b106d05a2962e44907caad54cd23d1bc4b9086449f96996740e97cbff5745a8f7
+  metadata.gz: 73e97ab10082578c057241cd43d82f0e16dccdf7d5391af096b08ee3f69329a4bd76953347cca89ba17be070b7395823620f1b7e44f6c2f45ef44952c6fee1df
+  data.tar.gz: a4e40672b2fdcbd65f96b2a7ffa96008ee8d8f7ad36017469798ffc1acec4eff1c2d5093a033ba5d86035a4a4ecbe9cd9a054d7f9d43bdbc58f14e2082e14503

data/bin/emptyd

@@ -11,6 +11,24 @@ require "emptyd"
 require 'evma_httpserver'
 require 'getoptlong'
 
+# Monkey patch for evma_httpserver 0.2.1
+class EventMachine::HttpResponse
+  def fixup_headers
+    if @content
+      @headers["Content-length"] = @content.bytesize
+    elsif @chunks
+      @headers["Transfer-encoding"] = "chunked"
+      # Might be nice to ENSURE there is no content-length header,
+      # but how to detect all the possible permutations of upper/lower case?
+    elsif @multiparts
+      @multipart_boundary = self.class.concoct_multipart_boundary
+      @headers["Content-type"] = "multipart/x-mixed-replace; boundary=\"#{@multipart_boundary}\""
+    else
+      @headers["Content-length"] = 0
+    end
+  end
+end
+
 class MyHttpServer < EM::Connection
   include EM::HttpServer
 
@@ -100,7 +118,8 @@ end
 
 CONFIG = {
   :server => "::1",
-  :server_port => 53353
+  :server_port => 53353,
+  :log_level => "error"
 }
 
 %w{.emptyd.conf .empty.conf}.map{|name| File.expand_path("~/#{name}")}.each do |name|
@@ -123,6 +142,7 @@ opts = GetoptLong.new(
 )
 
 logger = Logger.new(STDOUT)
+logger.level = Logger.const_get(CONFIG[:log_level].upcase.to_sym)
 options = { :logger => logger }
 options[:cookie] = CONFIG[:cookie]
 options[:port] = CONFIG[:server_port]

data/lib/emptyd.rb

@@ -12,7 +12,7 @@ module Emptyd
   class Connection
     attr_reader :key, :updated_at, :failed_at, :error
     EXPIRE_INTERVAL = 600 # 10min
-    MAX_CONNECTIONS = 100
+    MAX_CONNECTIONS = 500
     HAPPY_RATIO = 0.5
     @@connections = {}
     @@count = {}
@@ -91,7 +91,7 @@ module Emptyd
           else
             @@count[self.key] = self
             @logger.debug "Created new conn: #{key}, quota = #{@@count.size}"
-            options = { :user_known_hosts_file => [] }
+            options = { :user_known_hosts_file => [], :number_of_password_prompts => 0 }
             options[:password] = $PASSWORD if $PASSWORD
             options[:forward_agent] = true if $FORWARD_AGENT
             EM::Ssh.start(@ip, @user, options) do |conn|
@@ -142,22 +142,30 @@ module Emptyd
         end
       end
 
-      resolver = proc do
-        query = @@dns.submit_A @host
-        query.callback do |result|
-          @ip = result.sample
+      if @host =~ /^[0-9a-f:.]+$/i
+        p @host
+        resolver = proc do
+          @ip = @host
           starter[]
         end
-        query.errback do |err|
-          if err == :dns_error_nodata
-            query = @@dns.submit_AAAA @host
-            query.callback do |result|
-              @ip = result.sample
-              starter[]
+      else
+        resolver = proc do
+          query = @@dns.submit_AAAA @host
+          query.callback do |result|
+            @ip = result.sample
+            starter[]
+          end
+          query.errback do |err|
+            if err == :dns_error_nodata
+              query = @@dns.submit_A @host
+              query.callback do |result|
+                @ip = result.sample
+                starter[]
+              end
+              query.errback { |err| resfail[err] }
+            else
+              resfail[err]
             end
-            query.errback { |err| resfail[err] }
-          else
-            resfail[err]
           end
         end
       end
@@ -169,7 +177,7 @@ module Emptyd
       @@count.delete self.key
       had_valid_conn = !!@conn
       @conn = nil
-      STDERR.puts "Connection to #{@key} is broken: #{err}"
+      @logger.warn "Connection to #{@key} is broken: #{err}"
       @error = err
       @failed_at = Time.now
       @connecting = false
@@ -242,13 +250,13 @@ module Emptyd
         if session.interactive?
           ch.request_pty do |ch, success|
             ch.exec cmd do |ch, success|
-              STDERR.puts "exec failed: #{cmd}" unless success
+              @logger.warn "exec failed: #{cmd}" unless success
               setup[ch]
             end
           end
         else
           ch.exec cmd do |ch, success|
-            STDERR.puts "exec failed: #{cmd}" unless success
+            @logger.warn "exec failed: #{cmd}" unless success
             setup[ch]
           end
         end

data/lib/emptyd/version.rb

@@ -1,3 +1,3 @@
 module Emptyd
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emptyd
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - kmeaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler