From e6631f5a8bbf3218eaed1e973bfb42aa40902667 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Mon, 11 Nov 2013 09:54:29 +0100
Subject: ssh: Add option to disallow CLI

OTP-10976
---
 lib/ssh/doc/src/ssh.xml        | 7 ++++---
 lib/ssh/src/ssh.erl            | 2 ++
 lib/ssh/src/ssh_connection.erl | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 3409681af4..acf31fc0e9 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -248,13 +248,14 @@
 	    <c><![CDATA[{shell, start, []}]]></c>
 	  </item>
 	  <tag><c><![CDATA[{ssh_cli, {channel_callback(),
-	  channel_init_args()}}]]></c></tag>
+	  channel_init_args()} | no_cli}]]></c></tag>
 	  <item>
-	    Provides your own cli implementation, i.e. a channel callback
+	    Provides your own CLI implementation, i.e. a channel callback
 	    module that implements a shell and command execution. Note
 	    that you may customize the shell read-eval-print loop using the
 	    option <c>shell</c> which is much less work than implementing
-	    your own cli channel.
+	    your own CLI channel. If set to  <c>no_cli</c> you will disable
+	    CLI channels and only subsystem channels will be allowed.
 	  </item>
 	  <tag><c><![CDATA[{user_dir, String}]]></c></tag>
 	  <item>
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 4e78c4e65a..2685b1553b 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -401,6 +401,8 @@ handle_ssh_option({subsystems, Value} = Opt) when is_list(Value) ->
     Opt;
 handle_ssh_option({ssh_cli, {Cb, _}}= Opt) when is_atom(Cb) ->
     Opt;
+handle_ssh_option({ssh_cli, no_cli} = Opt) ->
+    Opt;
 handle_ssh_option({shell, {Module, Function, _}} = Opt)  when is_atom(Module),
 							      is_atom(Function) ->
     Opt;
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index d3760f8295..7016f349e8 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.erl
@@ -933,6 +933,8 @@ child_spec(Callback, Id, Args, Exec) ->
     Type = worker,
     {Name, StartFunc, Restart, Shutdown, Type, [ssh_channel]}.
 
+start_cli(#connection{cli_spec = no_cli}, _) ->
+    {error, cli_disabled};
 start_cli(#connection{cli_spec = {CbModule, Args}, exec = Exec,
 		      sub_system_supervisor = SubSysSup}, ChannelId) ->
     start_channel(CbModule, ChannelId, Args, SubSysSup, Exec).
-- 
cgit v1.2.3