From be5fa7803273eff223972f6b703d8b41cc2a51b8 Mon Sep 17 00:00:00 2001
From: "ggtakec@gmail.com"
 <ggtakec@gmail.com@df820570-a93a-0410-bd06-b72b767a4274>
Date: Tue, 21 May 2013 05:29:07 +0000
Subject: [PATCH] Fixed Issue 340 and some bugs.

1) Fixes a bug which object owner/group is set wrong id.
    When do chown(chgrp) command without group(owner), s3fs set wrong id(-1)
    for group(owner) id.
    Fixes this bug.

2) The permission of mount point when allow_other option is specified.
    When allow_other option is specified, s3fs forces the mount point directory
    permission to set executable permission(mode | 0111).

3) Fixes a bug about permission
    For example, when the directory permission is 0557, other user(who is not owner
    and same group) gets a permission error when making file or directory in that dir.
    Fixes this bug.

4) Compile error: blkcnt_t(Issue 340)
    Fixes a bug: Compile error: blkcnt_t(Issue 340)



git-svn-id: http://s3fs.googlecode.com/svn/trunk@428 df820570-a93a-0410-bd06-b72b767a4274
---
 src/s3fs.cpp      | 51 +++++++++++++++++++++++++++++++----------------
 src/s3fs_util.cpp |  1 +
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/s3fs.cpp b/src/s3fs.cpp
index c82879b..c44b316 100644
--- a/src/s3fs.cpp
+++ b/src/s3fs.cpp
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
+#include <sys/stat.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/tree.h>
@@ -106,6 +107,7 @@ static bool nocopyapi             = false;
 static bool norenameapi           = false;
 static bool nonempty              = false;
 static bool content_md5           = false;
+static bool allow_other           = false;
 static uid_t s3fs_uid             = 0; // default = root.
 static gid_t s3fs_gid             = 0; // default = root.
 
@@ -316,9 +318,9 @@ static int get_object_attribute(const char *path, struct stat *pstbuf, headers_t
 //FGPRINT("   get_object_attribute[path=%s]\n", path);
 
   memset(pstat, 0, sizeof(struct stat));
-  if(strcmp(path, "/") == 0) {
+  if(0 == strcmp(path, "/") || 0 == strcmp(path, ".")){
     pstat->st_nlink = 1; // see fuse faq
-    pstat->st_mode  = root_mode | S_IFDIR;
+    pstat->st_mode  = root_mode;
     return 0;
   }
 
@@ -466,18 +468,16 @@ static int check_object_access(const char *path, int mask, struct stat* pstbuf)
   gid_t  obj_gid = (0 != s3fs_gid ? s3fs_gid : pst->st_gid);
 
   // compare file mode and uid/gid + mask.
-  mode_t mode = pst->st_mode;
-  mode_t base_mask = 0;
+  mode_t mode      = pst->st_mode;
+  mode_t base_mask = S_IRWXO;
   if(pcxt->uid == obj_uid){
-    base_mask = S_IRWXU;
-  }else if(pcxt->gid == obj_gid){
-    base_mask = S_IRWXG;
-  }else{
-    if(1 == is_uid_inculde_group(pcxt->uid, obj_gid)){
-      base_mask = S_IRWXG;
-    }else{
-      base_mask = S_IRWXO;
-    }
+    base_mask |= S_IRWXU;
+  }
+  if(pcxt->gid == obj_gid){
+    base_mask |= S_IRWXG;
+  }
+  if(1 == is_uid_inculde_group(pcxt->uid, obj_gid)){
+    base_mask |= S_IRWXG;
   }
   mode &= base_mask;
 
@@ -543,6 +543,10 @@ static int check_parent_object_access(const char *path, int mask)
 
 //FGPRINT("  check_parent_object_access[path=%s]\n", path);
 
+  if(0 == strcmp(path, "/") || 0 == strcmp(path, ".")){
+    // path is mount point.
+    return 0;
+  }
   if(X_OK == (mask & X_OK)){
     for(parent = mydirname(path); 0 < parent.size(); parent = mydirname(parent.c_str())){
       if(parent == "."){
@@ -2508,6 +2512,12 @@ static int s3fs_chown(const char *path, uid_t uid, gid_t gid) {
     return result;
   }
 
+  if((uid_t)(-1) == uid){
+    uid = stbuf.st_uid;
+  }
+  if((gid_t)(-1) == gid){
+    gid = stbuf.st_gid;
+  }
   if(S_ISDIR(stbuf.st_mode)){
     result      = chk_dir_object_type(path, newpath, strpath, nowcache, &meta, &nDirType);
     s3_realpath = get_realpath(strpath.c_str());
@@ -4081,14 +4091,17 @@ static int my_fuse_opt_proc(void *data, const char *arg, int key, struct fuse_ar
           program_name.c_str(), mountpoint.c_str(), strerror(errno));
       return -1;
     }
-
-    root_mode = stbuf.st_mode; // save mode for later usage
-    
-    if(!(S_ISDIR(stbuf.st_mode ))) {
+    if(!(S_ISDIR(stbuf.st_mode))){
       fprintf(stderr, "%s: MOUNTPOINT: %s is not a directory\n", 
               program_name.c_str(), mountpoint.c_str());
       return -1;
     } 
+    root_mode = stbuf.st_mode; // save mode for later usage
+    if(allow_other){
+      root_mode |= (S_IXUSR | S_IXGRP | S_IXOTH | S_IFDIR);
+    }else{
+      root_mode |= S_IFDIR;
+    }
 
     if(!nonempty){
       struct dirent *ent;
@@ -4118,6 +4131,10 @@ static int my_fuse_opt_proc(void *data, const char *arg, int key, struct fuse_ar
       s3fs_gid = strtoul(strchr(arg, '=') + 1, 0, 10);
       return 1; // continue for fuse option
     }
+    if(strstr(arg, "allow_other") != 0){
+      allow_other = true;
+      return 1; // continue for fuse option
+    }
     if (strstr(arg, "default_acl=") != 0) {
       default_acl = strchr(arg, '=') + 1;
       return 0;
diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp
index 7601958..70083a6 100644
--- a/src/s3fs_util.cpp
+++ b/src/s3fs_util.cpp
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <libgen.h>
+#include <sys/stat.h>
 #include <pwd.h>
 #include <grp.h>
 #include <syslog.h>