From: Nishtha Rai <nishtha3rai@gmail.com>
Date: Mon, 20 Jul 2015 16:04:04 +0000 (+0530)
Subject: test_auth_caps: add test for user bits
X-Git-Tag: v10.0.0~123^2~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1aaee87d2b542ceecdba28cd001c0e6f5986c30e;p=ceph.git

test_auth_caps: add test for user bits

Signed-off-by: Nishtha Rai <nishtha3rai@gmail.com>
---

diff --git a/qa/workunits/fs/test_auth_caps.sh b/qa/workunits/fs/test_auth_caps.sh
index 228439c8b643..20e36f15e3fd 100644
--- a/qa/workunits/fs/test_auth_caps.sh
+++ b/qa/workunits/fs/test_auth_caps.sh
@@ -3,7 +3,7 @@
 cleanup()
 {
 	echo "*** Restoring to old state"
-	sudo rm -r mnt.admin/foo1 mnt.admin/foo2
+	sudo rm -rf mnt.admin/foo1 mnt.admin/foo2 mnt.admin/foo3 mnt.admin/foo4
 	fusermount -u mnt.admin
 	fusermount -u mnt.foo
 	rmdir mnt.admin mnt.foo
@@ -20,21 +20,24 @@ echo "*** Trying mount as admin"
 
 echo "*** Trying mount as client.foo"
 UID="$(id -u)"
+OTH_UID=$((UID+1))
 AUTH_TEMPLATE='./ceph-authtool -C keyring.foo -n client.foo --cap osd "allow rw" --cap mon "allow rw" --cap mds "allow rw uid=UID" --gen-key'
 AUTH="$(echo $AUTH_TEMPLATE | sed -e 's/UID/'$UID'/g')"
 eval $AUTH
 ./ceph auth import -i keyring.foo
 ./ceph-fuse mnt.foo -n client.foo -k keyring.foo
 
-
 echo "*** Creating directories for client.admin"
 sudo mkdir -m 777 mnt.admin/foo1
 sudo mkdir -m 700 mnt.admin/foo2
+sudo mkdir -m 755 mnt.admin/foo3
+sudo mkdir -m 755 mnt.admin/foo4
 
-
-echo "*** Granting ownership of directories to client.foo"
+echo "*** Granting ownership of directories to other users"
 sudo chown $USER mnt.admin/foo1
 sudo chown $USER mnt.admin/foo2
+sudo chown $USER mnt.admin/foo3
+sudo chown $OTH_UID mnt.admin/foo4
 
 echo "*** Testing auth checks"
 expect_false()
@@ -44,5 +47,7 @@ expect_false()
 }
 mkdir mnt.foo/foo1/asdf
 expect_false mkdir mnt.foo/foo2/asdf
+mkdir mnt.foo/foo3/asdf
+expect_false mkdir mnt.foo/foo4/asdf