Merge branch 'hans/ssh/remove_tcpip_forward'

3 files changed, 3 insertions, 183 deletions

diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl
index 47a166dcfd..4fb6bc39f3 100644
--- a/lib/ssh/src/ssh_connect.hrl
+++ b/lib/ssh/src/ssh_connect.hrl
@@ -243,7 +243,7 @@
 
 -record(channel,
 	{
-	  type,          %% "session", "x11", "forwarded-tcpip", "direct-tcpip"
+	  type,          %% "session"
 	  sys,           %% "none", "shell", "exec" "subsystem"
 	  user,          %% "user" process id (default to cm user)
 	  flow_control, 
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 25d552240a..d0f2d54c06 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -38,8 +38,7 @@
 
 %% Potential API currently unsupported and not tested
 -export([window_change/4, window_change/6,
-	 direct_tcpip/6, direct_tcpip/8, tcpip_forward/3,
-	 cancel_tcpip_forward/3, signal/3, exit_status/3]).
+	 signal/3, exit_status/3]).
 
 %% Internal application API
 -export([channel_data/5, handle_msg/3, channel_eof_msg/1,
@@ -48,7 +47,7 @@
 	 channel_adjust_window_msg/2, channel_data_msg/3,
 	 channel_open_msg/5, channel_open_confirmation_msg/4,
 	 channel_open_failure_msg/4, channel_request_msg/4,
-	 global_request_msg/3, request_failure_msg/0, 
+	 request_failure_msg/0, 
 	 request_success_msg/1, bind/4, unbind/3, unbind_channel/2, 
 	 bound_channel/3, encode_ip/1]).
 
@@ -232,58 +231,6 @@ exit_status(ConnectionHandler, Channel, Status) ->
     ssh_connection_handler:request(ConnectionHandler, Channel,
 				   "exit-status", false, [?uint32(Status)], 0).
 
-%% The client wants the server to make a tcp connection on behalf of
-%% the client
-direct_tcpip(ConnectionHandler, RemoteHost,
-	     RemotePort, OrigIP, OrigPort, Timeout) ->
-    direct_tcpip(ConnectionHandler, RemoteHost, RemotePort, OrigIP, OrigPort,
-		 ?DEFAULT_WINDOW_SIZE, ?DEFAULT_PACKET_SIZE, Timeout).
-
-direct_tcpip(ConnectionHandler, RemoteIP, RemotePort, OrigIP, OrigPort,
-	     InitialWindowSize, MaxPacketSize, Timeout) ->
-    case {encode_ip(RemoteIP), encode_ip(OrigIP)} of
-	{false, _} -> 
-	    {error, einval};
-	{_, false} -> 
-	    {error, einval};
-	{RIP, OIP} ->
-	    ssh_connection_handler:open_channel(ConnectionHandler,
-						"direct-tcpip",
-						[?string(RIP), 
-						 ?uint32(RemotePort),
-						 ?string(OIP),
-						 ?uint32(OrigPort)],
-						InitialWindowSize, 
-						MaxPacketSize,
-						Timeout)
-    end.
-
-%% The client wants the server to listen on BindIP:BindPort for tcp
-%% connections. When there is a tcp connect (SYN) to that pair on the
-%% server, the server sends a #ssh_msg_channel_open{"forwarded-tcpip"}
-%% back to the client for each new tcp connection
-tcpip_forward(ConnectionHandler, BindIP, BindPort) ->
-    case encode_ip(BindIP) of
-	false -> 
-	    {error, einval};
-	IPStr ->
-	    ssh_connection_handler:global_request(ConnectionHandler,
-						  "tcpip-forward", true,
-						  [?string(IPStr),
-						   ?uint32(BindPort)])
-    end.
-
-cancel_tcpip_forward(ConnectionHandler, BindIP, Port) ->
-    case encode_ip(BindIP) of
-	false -> 
-	    {error, einval};
-	IPStr ->
-	    ssh_connection_handler:global_request(ConnectionHandler,
-						  "cancel-tcpip-forward", true,
-						  [?string(IPStr),
-						   ?uint32(Port)])
-    end.
-
 %%--------------------------------------------------------------------
 %%% Internal API
 %%--------------------------------------------------------------------
@@ -504,73 +451,6 @@ handle_msg(#ssh_msg_channel_open{channel_type = "session",
     {{replies, [{connection_reply, FailMsg}]},
      Connection};
 
-handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip" = Type,
-				 sender_channel = RemoteId,
-				 initial_window_size = RWindowSz,
-				 maximum_packet_size = RPacketSz,
-				 data = Data}, 
-	   #connection{channel_cache = Cache, options = SSHopts} = Connection0,
-	   server) ->
-    <<?UINT32(ALen), Address:ALen/binary, ?UINT32(Port),
-      ?UINT32(OLen), Orig:OLen/binary, ?UINT32(OrigPort)>> = Data,
-    
-    MinAcceptedPackSz = proplists:get_value(minimal_remote_max_packet_size, SSHopts, 0),
-    
-    if 
-	MinAcceptedPackSz =< RPacketSz ->
-	    case bound_channel(Address, Port, Connection0) of
-		undefined ->
-		    FailMsg = channel_open_failure_msg(RemoteId, 
-						       ?SSH_OPEN_CONNECT_FAILED,
-						       "Connection refused", "en"),
-		    {{replies, 
-		      [{connection_reply, FailMsg}]}, Connection0};
-		ChannelPid ->
-		    {ChannelId, Connection1} = new_channel_id(Connection0),
-		    LWindowSz = ?DEFAULT_WINDOW_SIZE,
-		    LPacketSz = ?DEFAULT_PACKET_SIZE,
-		    Channel = #channel{type = Type,
-				       sys = "none",
-				       user = ChannelPid,
-				       local_id = ChannelId,
-				       recv_window_size = LWindowSz,
-				       recv_packet_size = LPacketSz,
-				       send_window_size = RWindowSz,
-				       send_packet_size = RPacketSz,
-				       send_buf = queue:new()
-				      },
-		    ssh_channel:cache_update(Cache, Channel),
-		    OpenConfMsg = channel_open_confirmation_msg(RemoteId, ChannelId,
-								LWindowSz, LPacketSz),
-		    {OpenMsg, Connection} = 
-			reply_msg(Channel, Connection1, 
-				  {open,  Channel, {forwarded_tcpip,
-						    decode_ip(Address), Port,
-						    decode_ip(Orig), OrigPort}}),
-		    {{replies, [{connection_reply, OpenConfMsg},
-				OpenMsg]}, Connection}
-	    end;
-
-	MinAcceptedPackSz > RPacketSz ->
-	    FailMsg = channel_open_failure_msg(RemoteId, 
-					       ?SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
-					       lists:concat(["Maximum packet size below ",MinAcceptedPackSz,
-							     " not supported"]), "en"),
-	    {{replies, [{connection_reply, FailMsg}]}, Connection0}
-    end;
-
-
-handle_msg(#ssh_msg_channel_open{channel_type = "forwarded-tcpip",
-				 sender_channel = RemoteId}, 
-	   Connection, client) ->
-    %% Client implementations SHOULD reject direct TCP/IP open requests for
-    %% security reasons. See RFC 4254 7.2.
-    FailMsg = channel_open_failure_msg(RemoteId, 
-				       ?SSH_OPEN_CONNECT_FAILED,
-				       "Connection refused", "en"),
-    {{replies, [{connection_reply, FailMsg}]}, Connection};
-
-
 handle_msg(#ssh_msg_channel_open{sender_channel = RemoteId}, Connection, _) ->
     FailMsg = channel_open_failure_msg(RemoteId, 
 				       ?SSH_OPEN_ADMINISTRATIVELY_PROHIBITED,
@@ -881,10 +761,6 @@ channel_request_msg(ChannelId, Type, WantReply, Data) ->
 			     want_reply = WantReply,
 			     data = Data}.
 
-global_request_msg(Type, WantReply, Data) ->
-    #ssh_msg_global_request{name = Type,
-			    want_reply = WantReply,
-			    data = Data}.
 request_failure_msg() ->
     #ssh_msg_request_failure{}.
 
@@ -1346,11 +1222,6 @@ decode_pty_opts2(<<Code, ?UINT32(Value), Tail/binary>>) ->
 	 end,    
     [{Op, Value} | decode_pty_opts2(Tail)].
 
-decode_ip(Addr) when is_binary(Addr) ->
-    case inet_parse:address(binary_to_list(Addr)) of
-	{error,_} -> Addr;
-	{ok,A}    -> A
-    end.
 
 backwards_compatible([], Acc) ->
     Acc;
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index e5229eb954..0327a72c12 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -49,7 +49,6 @@
 	 open_channel/6,
 	 request/6, request/7,
 	 reply_request/3, 
-	 global_request/4,
 	 send/5,
 	 send_eof/2,
 	 info/1, info/2,
@@ -217,23 +216,6 @@ reply_request(ConnectionHandler, Status, ChannelId) ->
     cast(ConnectionHandler, {reply_request, Status, ChannelId}).
 
 %%--------------------------------------------------------------------
--spec global_request(connection_ref(),
-		     string(),
-		     boolean(),
-		     iolist()
-		    ) -> ok | error.
-%% . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
-global_request(ConnectionHandler, Type, true = Reply, Data) ->
-    case call(ConnectionHandler, {global_request, self(), Type, Reply, Data}) of
-	{ssh_cm, ConnectionHandler, {success, _}} ->
-	    ok;
-	{ssh_cm, ConnectionHandler, {failure, _}} ->
-	    error
-    end;
-global_request(ConnectionHandler, Type, false = Reply, Data) ->
-    cast(ConnectionHandler, {global_request, self(), Type, Reply, Data}).
-
-%%--------------------------------------------------------------------
 -spec send(connection_ref(),
 	   channel_id(),
 	   non_neg_integer(),
@@ -1078,12 +1060,6 @@ handle_event({call,From}, {request, ChannelId, Type, Data, Timeout}, {connected,
     start_channel_request_timer(ChannelId, From, Timeout),
     {keep_state, cache_request_idle_timer_check(D)};
 
-handle_event({call,From}, {global_request, Pid, _, _, _} = Request, {connected,_}, D0) ->
-    D1 = handle_global_request(Request, D0),
-    Channel = ssh_channel:cache_find(Pid, cache(D1)),
-    D = add_request(true, Channel#channel.local_id, From, D1),
-    {keep_state, D};
-
 handle_event({call,From}, {data, ChannelId, Type, Data, Timeout}, {connected,_}, D0) ->
     {{replies, Replies}, Connection} =
 	ssh_connection:channel_data(ChannelId, Type, Data, D0#data.connection_state, From),
@@ -1628,33 +1604,6 @@ handle_request(ChannelId, Type, Data, WantReply, From, D) ->
     end.
 
 %%%----------------------------------------------------------------
-handle_global_request({global_request, ChannelPid,
-		       "tcpip-forward" = Type, WantReply,
-		       <<?UINT32(IPLen),IP:IPLen/binary, ?UINT32(Port)>> = Data
-		      },
-		      D) ->
-    ssh_channel:cache_update(cache(D),
-			     #channel{user = ChannelPid,
-				      type = "forwarded-tcpip",
-				      sys = none}),
-    Connection = ssh_connection:bind(IP, Port, ChannelPid, D#data.connection_state),
-    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
-    send_msg(Msg, D#data{connection_state = Connection});
-
-handle_global_request({global_request, _Pid, "cancel-tcpip-forward" = Type,
-		       WantReply, <<?UINT32(IPLen),
-				   IP:IPLen/binary, ?UINT32(Port)>> = Data},
-		      #data{connection_state = Connection0} = State) ->
-    Connection = ssh_connection:unbind(IP, Port, Connection0),
-    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
-    send_msg(Msg, State#data{connection_state = Connection});
-
-handle_global_request({global_request, _, "cancel-tcpip-forward" = Type,
-		       WantReply, Data}, State) ->
-    Msg = ssh_connection:global_request_msg(Type, WantReply, Data),
-    send_msg(Msg, State).
-
-%%%----------------------------------------------------------------
 handle_channel_down(ChannelPid, D) ->
     ssh_channel:cache_foldl(
 	       fun(Channel, Acc) when Channel#channel.user == ChannelPid ->