Use 'localhost' exclusively for local port forwarding.

This should fix bug 907742. The behavior change is large enough, however, that existing documents should be revised.
openshift · Feb 7, 2013 · 5beaa18 · 5beaa18
1 parent ba60a4b
commit 5beaa18
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 28 deletions.
diff --git a/lib/rhc/commands/port_forward.rb b/lib/rhc/commands/port_forward.rb
@@ -14,21 +14,19 @@ def initialize(service, remote_host, port_to, port_from = nil)
       @service     = service
       @remote_host = remote_host
       @port_to     = port_to
-      @host_from   = mac? ? "localhost" : remote_host # forward locally on a Mac
+      @host_from   = 'localhost'
       @port_from   = port_from || port_to # match ports if possible
       @bound       = false
     end
 
     def to_cmd_arg
       # string to be used in a direct SSH command
-      mac? ? "-L #{port_from}:#{remote_host}:#{port_to}" : "-L #{remote_host}:#{port_from}:#{remote_host}:#{port_to}"
+      "-L #{port_from}:#{remote_host}:#{port_to}"
     end
 
     def to_fwd_args
       # array of arguments to be passed to Net::SSH::Service::Forward#local
-      args = [port_from.to_i, remote_host, port_to.to_i]
-      args.unshift(remote_host) unless mac?
-      args
+      [port_from.to_i, remote_host, port_to.to_i]
     end
 
     def bound?

diff --git a/spec/rhc/commands/port_forward_spec.rb b/spec/rhc/commands/port_forward_spec.rb
@@ -65,11 +65,7 @@
         @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'mysql -> 127.0.0.1:3306')
         forward = mock(Net::SSH::Service::Forward)
         @ssh.should_receive(:forward).and_return(forward)
-        if mac?
-          forward.should_receive(:local).with(3306, '127.0.0.1', 3306)
-        else
-          forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
-        end
+        forward.should_receive(:local).with(3306, '127.0.0.1', 3306)
         @ssh.should_receive(:loop)
       end
       it "should run successfully" do
@@ -108,11 +104,7 @@
         @ssh.should_receive(:exec!).with("rhc-list-ports").and_yield(nil, :stderr, 'mysql -> 127.0.0.1:3306')
         forward = mock(Net::SSH::Service::Forward)
         @ssh.should_receive(:forward).and_return(forward)
-        if mac?
-          forward.should_receive(:local).with(3306, '127.0.0.1', 3306)
-        else
-          forward.should_receive(:local).with('127.0.0.1', 3306, '127.0.0.1', 3306)
-        end
+        forward.should_receive(:local).with(3306, '127.0.0.1', 3306)
         @ssh.should_receive(:loop).and_raise(Interrupt.new)
       end
       it "should exit when user interrupts" do
@@ -149,19 +141,11 @@
           and_yield(nil, :stderr, "httpd -> #{haproxy_host_1}:8080\nhttpd -> #{haproxy_host_2}:8080\nmongodb -> #{mongo_host}:35541\nmysqld -> #{ipv6_host}:3306")
         forward = mock(Net::SSH::Service::Forward)
         @ssh.should_receive(:forward).at_least(3).times.and_return(forward)
-        if mac?
-          forward.should_receive(:local).with(8080, haproxy_host_1, 8080)
-          forward.should_receive(:local).with(8080, haproxy_host_2, 8080).and_raise(Errno::EADDRINUSE)
-          forward.should_receive(:local).with(8081, haproxy_host_2, 8080)
-          forward.should_receive(:local).with(35541, mongo_host, 35541)
-          forward.should_receive(:local).with(3306, ipv6_host, 3306)
-        else
-          forward.should_receive(:local).with(haproxy_host_1, 8080, haproxy_host_1, 8080)
-          forward.should_receive(:local).with(haproxy_host_2, 8080, haproxy_host_2, 8080).and_raise(Errno::EADDRINUSE)
-          forward.should_receive(:local).with(haproxy_host_2, 8081, haproxy_host_2, 8080)
-          forward.should_receive(:local).with(mongo_host, 35541, mongo_host, 35541)
-          forward.should_receive(:local).with(ipv6_host, 3306, ipv6_host, 3306)
-        end
+        forward.should_receive(:local).with(8080, haproxy_host_1, 8080)
+        forward.should_receive(:local).with(8080, haproxy_host_2, 8080).and_raise(Errno::EADDRINUSE)
+        forward.should_receive(:local).with(8081, haproxy_host_2, 8080)
+        forward.should_receive(:local).with(35541, mongo_host, 35541)
+        forward.should_receive(:local).with(3306, ipv6_host, 3306)
         @ssh.should_receive(:loop).and_raise(Interrupt.new)
       end
       it "should exit when user interrupts" do