Changeset 3170

Timestamp:

06/12/12 19:11:46 (11 months ago)

Author:

squidly

Message:

modification du script fixperms.sh pour modfier les ACL par fichiers, afin de les modifier après upload par le panel

Location:

alternc/trunk

Files:

• bureau/class/m_bro.php (modified) (2 diffs)
• etc/alternc/alternc-sudoers (modified) (1 diff)
• src/fixperms.sh (modified) (3 diffs)

alternc/trunk/bureau/class/m_bro.php

@@ -510 +510 @@
    */
   function UploadFile($R) {
-    global $_FILES,$err;
+    global $_FILES,$err,$cuid;
     $absolute=$this->convertabsolute($R,0);
     if (!$absolute) {
@@ -522 +522 @@
         }
         if (@move_uploaded_file($_FILES['userfile']['tmp_name'], $absolute."/".$_FILES['userfile']['name'])) {
-          return $absolute."/".$_FILES['userfile']['name'];
+                        exec("sudo /usr/lib/alternc/fixperms.sh -u ".$cuid." -f ".$absolute."/".$_FILES['userfile']['name']);
+                        return $absolute."/".$_FILES['userfile']['name'];
         } else {
           $err->raise("bro",3);

alternc/trunk/etc/alternc/alternc-sudoers

@@ -1 @@
-alterncpanel    ALL = NOPASSWD : /usr/bin/quota, /usr/sbin/setquota
+alterncpanel    ALL = NOPASSWD : /usr/bin/quota, /usr/sbin/setquota, /usr/lib/alternc/fixperms.sh
 vmail           ALL = NOPASSWD : /usr/lib/dovecot/deliver

alternc/trunk/src/fixperms.sh

@@ -32 +32 @@
 query="SELECT uid,login FROM membres"
 sub_dir=""
-
+file=""
 #Two optionals argument
 # -l string : a specific login to fix
-# -u interger : a specifi uid to fix
-while getopts "l:u:d:" optname
+# -u interger : a specific uid to fix
+# -f interger : a specific file to fix according to a given uid 
+
+while getopts "l:u:f:d:" optname
   do
     case "$optname" in
       "l")
-        query="SELECT uid,login FROM membres WHERE login LIKE '$OPTARG'"
+                if [[ "$OPTARG" =~ ^[a-zA-Z0-9_]+$ ]] ; then
+                query="SELECT uid,login FROM membres WHERE login LIKE '$OPTARG'"
+                else    
+                        echo "Bad login provided"
+                        exit
+                fi
         ;;
       "u")
-        query="SELECT uid,login FROM membres WHERE uid LIKE '$OPTARG'"
+                if [[ "$OPTARG" =~ ^[0-9]+$ ]] ; then
+                        query="SELECT uid,login FROM membres WHERE uid LIKE '$OPTARG'"
+                else
+                        echo "Bad uid provided"
+                        exit
+                fi
+        ;;
+      "f")
+                  file="$OPTARG"
         ;;
       "d")
@@ -98 +113 @@
       # Set the defaults acl on all the files
       setfacl -b -k -m d:g:alterncpanel:rwx -m d:u:$GID:rw- -m d:g:$GID:rw- \
-                    -m   g:alterncpanel:rwx -m   u:$GID:rw- -m   g:$GID:rw- \
-              -R "$REP"
+                    -Rm   g:alterncpanel:rwx -m   u:$GID:rw- -m   g:$GID:rw- \
+               "$REP"
 
       read GID LOGIN
@@ -105 +120 @@
 }
 
-mysql --defaults-file=/etc/alternc/my.cnf --skip-column-names -B -e "$query" |doone
+fixefile(){
+        read GID LOGIN
+        /usr/bin/setfacl  -bk $file
+        echo "gid: $GID"
+        echo "file: $file"
+        chown $GID:$GID $file
+        chmod 0770 $file
+        /usr/bin/setfacl  -m u:$GID:rw- -m g:$GID:rw- -m g:alterncpanel:rw- -m u:$GID:rw- -m g:$GID:rw- $file
+        echo file ownership and ACLs changed
 
+}
+
+if [[  $file != "" ]]; then
+        if [ -e $file ]; then
+                mysql --defaults-file=/etc/alternc/my.cnf --skip-column-names -B -e "$query" |fixefile
+        else
+                echo "file not found"
+        fi
+else
+        mysql --defaults-file=/etc/alternc/my.cnf --skip-column-names -B -e "$query" |doone
+fi