store-server: Added quota management

miscellaneous/store-server/CloudStore.py

@@ -65,7 +65,7 @@ def neptun_GET(neptun):
     if os.path.exists(home_path) != True:
     if os.path.exists(home_path) != True:
         abort(401, 'The requested user does not exist!')
         abort(401, 'The requested user does not exist!')
     else:
     else:
-        statistics=getQuotaStatus(neptun)
+        statistics=get_quota(neptun)
         return { 'Used' : statistics[0], 'Soft' : statistics[1], 'Hard' : statistics[2]}
         return { 'Used' : statistics[0], 'Soft' : statistics[1], 'Hard' : statistics[2]}
 
 
 COMMANDS = {}
 COMMANDS = {}
@@ -222,6 +222,18 @@ def set_keys(neptun):
         return
         return
     elif result == 2:
     elif result == 2:
         abort(403, 'User does not exist!')
         abort(403, 'User does not exist!')
+@route('/quota/<neptun>', method='POST')
+@force_ssl
+def set_quota(neptun):
+    try:
+        quota = request.json['QUOTA']
+    except:
+        abort(400, 'Wrong syntax!')
+    result = subprocess.call([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'setquota', neptun, quota, hard_quota(quota)])
+    if result == 0:
+        return
+    elif result == 2:
+        abort(403, 'User does not exist!')
 
 
 
 
 @route('/new/<neptun>', method='POST')
 @route('/new/<neptun>', method='POST')
@@ -231,10 +243,11 @@ def new_user(neptun):
     smbpasswd=''
     smbpasswd=''
     try:
     try:
         smbpasswd = request.json['SMBPASSWD']
         smbpasswd = request.json['SMBPASSWD']
+        quota = request.josn['QUOTA']
     except:
     except:
         abort(400, 'Invalid syntax')
         abort(400, 'Invalid syntax')
     # Call user creator script
     # Call user creator script
-    result = subprocess.call([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'add', neptun, smbpasswd])
+    result = subprocess.call([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'add', neptun, smbpasswd, quota, hard_quota(quota)])
     if result == 0:
     if result == 0:
         try:
         try:
             for key in request.json['KEYS']:
             for key in request.json['KEYS']:
@@ -311,7 +324,9 @@ def upload(hash_num):
     redirect(redirect_address)
     redirect(redirect_address)
     #return 'Upload finished: '+file_name+' - '+str(datalength)+' Byte'
     #return 'Upload finished: '+file_name+' - '+str(datalength)+' Byte'
 
 
-
+# Return hard quota from quota
+def hard_quota(quota):
+    return str(int(quota)*1.25)
 
 
 # Define filebuffer for big uploads
 # Define filebuffer for big uploads
 def fbuffer(f, chunk_size=4096):
 def fbuffer(f, chunk_size=4096):
@@ -369,10 +384,17 @@ def file_dict(path, home):
             'MTIME': os.path.getmtime(path),
             'MTIME': os.path.getmtime(path),
             'DIR': os.path.relpath(os.path.dirname(path), home)}
             'DIR': os.path.relpath(os.path.dirname(path), home)}
 
 
-def getQuotaStatus(neptun):
+def get_quota(neptun):
     output=subprocess.check_output([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'status', neptun], stderr=subprocess.STDOUT)
     output=subprocess.check_output([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'status', neptun], stderr=subprocess.STDOUT)
     return output.split()
     return output.split()
 
 
+def set_quota(neptun, quota):
+    try:
+        output=subprocess.check_output([ROOT_BIN_FOLDER+'/'+USER_MANAGER, 'setquota', neptun, quota, hard_quota(quota)], stderr=subprocess.STDOUT)
+    except:
+        return False
+    return True
+
 if __name__ == "__main__":
 if __name__ == "__main__":
     run(host=SITE_HOST, port=SITE_PORT)
     run(host=SITE_HOST, port=SITE_PORT)
 else:
 else:

miscellaneous/store-server/UserManager.sh

@@ -13,14 +13,20 @@ USER_NAME="$2"
 SMB_PASSWD="$3"
 SMB_PASSWD="$3"
 umask 022
 umask 022
 
 
-case $COMMAND in
-    'add')
         if [ "x${USER_NAME}" == "x" ]; then
         if [ "x${USER_NAME}" == "x" ]; then
             exit 1
             exit 1
         fi
         fi
+case $COMMAND in
+    'add')
         if [ "x${SMB_PASSWD}" == "x" ]; then
         if [ "x${SMB_PASSWD}" == "x" ]; then
             exit 1
             exit 1
         fi
         fi
+        if [ "x${SOFT_QUOTA}" == "x" ]; then
+            exit 1
+        fi
+        if [ "x${HARD_QUOTA}" == "x" ]; then
+            exit 1
+        fi
         #Check if user already exist
         #Check if user already exist
         id ${USER_NAME} > /dev/null 2>&1
         id ${USER_NAME} > /dev/null 2>&1
         if [ $? == '0' ]; then
         if [ $? == '0' ]; then
@@ -40,9 +46,13 @@ case $COMMAND in
         echo "User ${USER_NAME} CREATED at `date`" >> /root/users.log
         echo "User ${USER_NAME} CREATED at `date`" >> /root/users.log
         #Set quotas
         #Set quotas
         #           Username   Soft     Hard Inode Dev
         #           Username   Soft     Hard Inode Dev
-        setquota ${USER_NAME} 2097152 2621440 0 0 /home
+#        setquota ${USER_NAME} 2097152 2621440 0 0 /home
+        setquota ${USER_NAME} ${SOFT_QUOTA} ${HARD_QUOTA} 0 0 /home
         ;;
         ;;
     'set')
     'set')
+        if [ "x${SMB_PASSWD}" == "x" ]; then
+            exit 1
+        fi
         id ${USER_NAME} > /dev/null 2>&1
         id ${USER_NAME} > /dev/null 2>&1
         if [ $? == '0' ]; then
         if [ $? == '0' ]; then
             echo -e "${SMB_PASSWD}\n${SMB_PASSWD}\n" | passwd ${USER_NAME} >/dev/null 2>&1
             echo -e "${SMB_PASSWD}\n${SMB_PASSWD}\n" | passwd ${USER_NAME} >/dev/null 2>&1
@@ -81,6 +91,17 @@ case $COMMAND in
     'status')
     'status')
         echo $(quota -w ${USER_NAME} 2>/dev/null | tail -1 | awk '{ print $2" "$3" "$4 }')
         echo $(quota -w ${USER_NAME} 2>/dev/null | tail -1 | awk '{ print $2" "$3" "$4 }')
         ;;
         ;;
+    'setquota')
+        SOFT_QUOTA="$3"
+        HARD_QUOTA="$4"
+        if [ "x${SOFT_QUOTA}" == "x" ]; then
+            exit 1
+        fi
+        if [ "x${HARD_QUOTA}" == "x" ]; then
+            exit 1
+        fi
+        setquota ${USER_NAME} ${SOFT_QUOTA} ${HARD_QUOTA} 0 0 /home
+        ;;
     *)
     *)
         echo "Usage: UserManager.sh COMMAND USER PASSWORD"
         echo "Usage: UserManager.sh COMMAND USER PASSWORD"
         exit 1
         exit 1