Basic functionality for sftp ver6 and testcase

4 files changed, 70 insertions, 39 deletions

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 719c97e940..22c55f8bf0 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -364,6 +364,8 @@ handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
+handle_option([{sftp_vsn, _} = Opt | Rest], SocketOptions, SshOptions) ->
+    handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
 handle_option([Opt | Rest], SocketOptions, SshOptions) ->
     handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
 
@@ -440,6 +442,8 @@ handle_ssh_option({quiet_mode, Value} = Opt) when Value == true;
     Opt;
 handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 ->
     Opt;
+handle_ssh_option({sftp_vsn, Value} = Opt) when is_integer(Value), Value > 0, Value < 7 ->
+    Opt;
 handle_ssh_option(Opt) ->
     throw({error, {eoptions, Opt}}).
 
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index ec7b76b0b3..d6a7ee3859 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -119,9 +119,7 @@ init(Options) ->
 		{Root0, State0}
 	end,
     MaxLength = proplists:get_value(max_files, Options, 0),
-
-    Vsn = proplists:get_value(vsn, Options, 5),
-
+    Vsn = proplists:get_value(sftp_vsn, Options, 5),
     {ok,  State#state{cwd = CWD, root = Root, max_files = MaxLength,
 		      handles = [], pending = <<>>,
 		      xf = #ssh_xfer{vsn = Vsn, ext = []}}}.
@@ -369,17 +367,20 @@ handle_op(?SSH_FXP_FSETSTAT, ReqId, <<?UINT32(HLen), BinHandle:HLen/binary,
 	    State0
     end;
 handle_op(?SSH_FXP_REMOVE, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>, 
-	  State0 = #state{file_handler = FileMod, file_state = FS0}) ->
+	  State0 = #state{file_handler = FileMod, file_state = FS0, xf = #ssh_xfer{vsn = Vsn}}) ->
     Path = relate_file_name(BPath, State0),
-    %%  case FileMod:is_dir(Path) of %% This version 6 we still have ver 5
-    %% 	true ->
-    %% 	    ssh_xfer:xf_send_status(State#state.xf, ReqId,
-    %% 				    ?SSH_FX_FILE_IS_A_DIRECTORY); 
-    %% 	false ->
-    {Status, FS1} = FileMod:delete(Path, FS0),
-    State1 = State0#state{file_state = FS1},
-    send_status(Status, ReqId, State1);
-    %%end;
+    case FileMod:is_dir(Path) of %% This version 6 we still have ver 5
+	true when Vsn > 5 ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+				    ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory"); 
+	true ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+				    ?SSH_FX_FAILURE, "File is a directory"); 
+	false ->
+	    {Status, FS1} = FileMod:delete(Path, FS0),
+	    State1 = State0#state{file_state = FS1},
+	    send_status(Status, ReqId, State1)
+    end;
 handle_op(?SSH_FXP_RMDIR, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>, 
 	  State0 = #state{file_handler = FileMod, file_state = FS0}) ->
     Path = relate_file_name(BPath, State0),
@@ -637,31 +638,33 @@ open(Vsn, ReqId, Data, State) when Vsn >= 4 ->
     do_open(ReqId, State, Path, Flags).
 
 do_open(ReqId, State0, Path, Flags) ->
-    #state{file_handler = FileMod, file_state = FS0, root = Root} = State0,
+    #state{file_handler = FileMod, file_state = FS0, root = Root, xf = #ssh_xfer{vsn = Vsn}} = State0,
     XF = State0#state.xf,
     F = [binary | Flags],
-    %%   case FileMod:is_dir(Path) of %% This is version 6 we still have 5
-    %% 	true ->
-    %% 	    ssh_xfer:xf_send_status(State#state.xf, ReqId,
-    %% 				    ?SSH_FX_FILE_IS_A_DIRECTORY);
-    %% 	false ->
-    
-    AbsPath = case Root of
-		  "" ->
-		      Path;
-		  _ ->
-		      relate_file_name(Path, State0)  
-	      end,
-
-    {Res, FS1} = FileMod:open(AbsPath, F, FS0),
-    State1 = State0#state{file_state = FS1},
-    case Res of
-	{ok, IoDevice} ->
-	    add_handle(State1, XF, ReqId, file, {Path,IoDevice});
-	{error, Error} ->
-	    ssh_xfer:xf_send_status(State1#state.xf, ReqId,
-				    ssh_xfer:encode_erlang_status(Error)),
-	    State1
+    case FileMod:is_dir(Path) of 
+	true when Vsn > 5 ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+    				    ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory");
+	true ->
+	    ssh_xfer:xf_send_status(State0#state.xf, ReqId,
+    				    ?SSH_FX_FAILURE, "File is a directory");
+	false ->
+	    AbsPath = case Root of
+			  "" ->
+			      Path;
+			  _ ->
+			      relate_file_name(Path, State0)  
+		      end,
+	    {Res, FS1} = FileMod:open(AbsPath, F, FS0),
+	    State1 = State0#state{file_state = FS1},
+	    case Res of
+		{ok, IoDevice} ->
+		    add_handle(State1, XF, ReqId, file, {Path,IoDevice});
+		{error, Error} ->
+		    ssh_xfer:xf_send_status(State1#state.xf, ReqId,
+					    ssh_xfer:encode_erlang_status(Error)),
+		    State1
+	    end
     end.
 
 %% resolve all symlinks in a path
diff --git a/lib/ssh/src/ssh_xfer.hrl b/lib/ssh/src/ssh_xfer.hrl
index c13950eb6e..0d85cf2094 100644
--- a/lib/ssh/src/ssh_xfer.hrl
+++ b/lib/ssh/src/ssh_xfer.hrl
@@ -58,7 +58,6 @@
 %%% #   SSH_FX_xxx
 %%% Description: Response packet types for file transfer protocol.
 %%%----------------------------------------------------------------------
-
 -define(SSH_FX_OK,			0).
 -define(SSH_FX_EOF,			1).
 -define(SSH_FX_NO_SUCH_FILE,		2).
@@ -79,7 +78,18 @@
 -define(SSH_FX_LOCK_CONFlICT,           17).
 -define(SSH_FX_DIR_NOT_EMPTY,           18).
 -define(SSH_FX_NOT_A_DIRECTORY,         19).
+-define(SSH_FX_INVALID_FILENAME,        20).
+-define(SSH_FX_LINK_LOOP,               21).
+-define(SSH_FX_CANNOT_DELETE,           22).
+-define(SSH_FX_INVALID_PARAMETER,       23).
 -define(SSH_FX_FILE_IS_A_DIRECTORY,     24). 
+-define(SSH_FX_BYTE_RANGE_LOCK_CONFLICT,25).
+-define(SSH_FX_BYTE_RANGE_LOCK_REFUSED, 26).
+-define(SSH_FX_DELETE_PENDING,          27).
+-define(SSH_FX_FILE_CORRUPT,            28).
+-define(SSH_FX_OWNER_INVALID,           29).
+-define(SSH_FX_GROUP_INVALID,           30).
+-define(SSH_FX_NO_MATCHING_BYTE_RANGE_LOCK,31).
 
 %%%----------------------------------------------------------------------
 %%% #   SSH_FILEXFER_xxx
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index b995eb9f0e..ad4652521f 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -58,7 +58,8 @@ all() ->
      links,
      ver3_rename, 
      relpath, 
-     sshd_read_file].
+     sshd_read_file,
+     ver6_basic].
 
 groups() -> 
     [].
@@ -128,6 +129,8 @@ init_per_testcase(TestCase, Config) ->
     ProtocolVer = case atom_to_list(TestCase) of
 		      "ver3_" ++ _ ->
 			  3;
+		      "ver6_" ++ _ ->
+			  6;
 		      _ ->
 			  ?SSH_SFTP_PROTOCOL_VERSION
 		  end,
@@ -591,7 +594,18 @@ sshd_read_file(Config) when is_list(Config) ->
 	read_file(Handle, 100, 0, Cm, Channel, NewReqId),
 
     {ok, Data} = file:read_file(FileName).
-
+ver6_basic(doc) ->
+    ["Test SFTP Version 6"];
+ver6_basic(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    %FileName = filename:join(PrivDir, "test.txt"),
+    {Cm, Channel} = ?config(sftp, Config),
+    ReqId = 0,
+    {ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),  % Ver 6 we have 5
+	   ?UINT32(?SSH_FX_FILE_IS_A_DIRECTORY), _/binary>>, _} =
+	open_file(PrivDir, Cm, Channel, ReqId,
+		  ?ACE4_READ_DATA  bor ?ACE4_READ_ATTRIBUTES,
+		  ?SSH_FXF_OPEN_EXISTING).
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------