From 5265f855ed1878158b2dc546fa3037b86743229c Mon Sep 17 00:00:00 2001
From: Hamidreza Soleimani <hamidreza.s@gmail.com>
Date: Mon, 14 Aug 2017 22:49:58 +0200
Subject: Fix file owner access permission in ssh_sftp module

Previously, a hard-coded atom (read_write) has been used as file owner access permission
in response to ssh_sftp:read_file_info/2 function. With this fix, the actual value of
file owner access permission is added to the returning record. That value is calculated
from file mode value.
---
 lib/ssh/src/ssh_sftp.erl        | 24 +++++++++++++++++++++++-
 lib/ssh/test/ssh_sftp_SUITE.erl | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 53 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index c1558a19b1..9e1229dc85 100644
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -1050,7 +1050,7 @@ attr_to_info(A) when is_record(A, ssh_xfer_attr) ->
     #file_info{
       size   = A#ssh_xfer_attr.size,
       type   = A#ssh_xfer_attr.type,
-      access = read_write, %% FIXME: read/write/read_write/none
+      access = file_mode_to_owner_access(A#ssh_xfer_attr.permissions),
       atime  = unix_to_datetime(A#ssh_xfer_attr.atime),
       mtime  = unix_to_datetime(A#ssh_xfer_attr.mtime),
       ctime  = unix_to_datetime(A#ssh_xfer_attr.createtime),
@@ -1062,6 +1062,28 @@ attr_to_info(A) when is_record(A, ssh_xfer_attr) ->
       uid    = A#ssh_xfer_attr.owner,
       gid    = A#ssh_xfer_attr.group}.
 
+file_mode_to_owner_access(FileMode)
+  when is_integer(FileMode) ->
+    %% The file mode contains the access permissions.
+    %% The read and write access permission of file owner
+    %% are located in 8th and 7th bit of file mode respectively.
+
+    ReadPermission = ((FileMode bsr 8) band 1),
+    WritePermission =  ((FileMode bsr 7) band 1),
+    case {ReadPermission, WritePermission} of
+        {1, 1} ->
+            read_write;
+        {1, 0} ->
+            read;
+        {0, 1} ->
+            write;
+        {0, 0} ->
+            none;
+        _ ->
+            undefined
+    end;
+file_mode_to_owner_access(_) ->
+    undefined.
 
 unix_to_datetime(undefined) ->
     undefined;
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 680a8ef52e..7aa3d8a00a 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -92,7 +92,7 @@ groups() ->
      {write_read_tests, [], [open_close_file, open_close_dir, read_file, read_dir,
 			     write_file, write_file_iolist, write_big_file, sftp_read_big_file,
 			     rename_file, mk_rm_dir, remove_file, links,
-			     retrieve_attributes, set_attributes, async_read,
+			     retrieve_attributes, set_attributes, file_owner_access, async_read,
 			     async_write, position, pos_read, pos_write,
 			     start_channel_sock
 			    ]}
@@ -521,7 +521,36 @@ set_attributes(Config) when is_list(Config) ->
     ok = file:write_file(FileName, "hello again").
 
 %%--------------------------------------------------------------------
+file_owner_access() ->
+    [{doc,"Test file user access validity"}].
+file_owner_access(Config) when is_list(Config) ->
+    case os:type() of
+        {win32, _} ->
+            {skip, "Not a relevant test on Windows"};
+        _ ->
+            FileName = proplists:get_value(filename, Config),
+            {Sftp, _} = proplists:get_value(sftp, Config),
+
+            {ok, #file_info{mode = InitialMode}} = ssh_sftp:read_file_info(Sftp, FileName),
+
+            ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#000}),
+            {ok, #file_info{access = none}} = ssh_sftp:read_file_info(Sftp, FileName),
+
+            ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#400}),
+            {ok, #file_info{access = read}} = ssh_sftp:read_file_info(Sftp, FileName),
+
+            ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#200}),
+            {ok, #file_info{access = write}} = ssh_sftp:read_file_info(Sftp, FileName),
 
+            ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=8#600}),
+            {ok, #file_info{access = read_write}} = ssh_sftp:read_file_info(Sftp, FileName),
+
+            ok = ssh_sftp:write_file_info(Sftp, FileName, #file_info{mode=InitialMode}),
+
+            ok
+    end.
+
+%%--------------------------------------------------------------------
 async_read() ->
     [{doc,"Test API aread/3"}].
 async_read(Config) when is_list(Config) ->
-- 
cgit v1.2.3