Changeset 1211 for bin/sshjour

Timestamp:

10/14/09 20:55:42 (5 months ago)

Author:

vasi

Message:

Timeout when read hangs

Files:

• bin/sshjour (modified) (2 diffs)

bin/sshjour

@@ -1 +1 @@
 #!/usr/bin/ruby
+
 host, port, alternative, altport = ARGV
 host = host + '.local'
 
-key = IO.popen("ssh-keyscan #{host} 2>/dev/null") { |f| f.read }
 found, fport = alternative, altport
-if $?.success?
-        known = IO.readlines(ENV['HOME'] + '/.ssh/known_hosts')
-        found, fport = host, port if known.include?(key)
+
+# Scan for a local host
+IO.popen('-') do |pipe|
+        if pipe # parent
+                fork { sleep 1; Process.kill 'ALRM', pipe.pid rescue nil } # timeout
+                key = pipe.read
+                
+                Process.wait(pipe.pid)
+                if $?.success?
+                        known = IO.readlines(ENV['HOME'] + '/.ssh/known_hosts')
+                        found, fport = host, port if known.include?(key)
+                end
+        else
+                $stderr.close
+                exec 'ssh-keyscan', host
+        end
 end
 
@@ -15 +28 @@
 end
 
+#puts found
 exec('nc', found, fport || '22')