A bit of cleaning in the server part.

Author: freddieknets

xboinc/register.py

@@ -48,7 +48,7 @@ def register(user, folder):
     except Exception as e:
         user_file.unlink()
         raise Exception(e)
-    if cp_to_eos(user_file, dropdir, maximum_trials=1, is_server=False):  # returncode 1 means error
+    if cp_to_eos(user_file, dropdir, maximum_trials=1):  # returncode 1 means error
         user_file.unlink()
         raise Exception(f"Failed to copy register file to server dropdir.\n"
                        + "Do you have permissions?\n"

xboinc/server/afs.py

@@ -6,46 +6,69 @@
 import subprocess
 from pathlib import Path
 
+from .tools import log_debug, log_info, log_error
 
-def afs_add_acl(user, folder, acl='rlwik'):
-    folder = Path(folder).resolve()
-    if folder.is_dir():
-        cmd = subprocess.run(['fs', 'sa', folder, user, acl],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        if cmd.returncode == 0:
-            print(f"Set ACL '{acl}' on folder {folder} for user {user}.")
+
+def afs_add_acl(user, folder, acl='rlwik', is_server=False):
+    try:
+        folder = Path(folder).resolve()
+        if folder.is_dir():
+            cmd = subprocess.run(['fs', 'sa', folder, user, acl],
+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            if cmd.returncode == 0:
+                log_info(f"Set ACL '{acl}' on folder {folder} for user {user}.", is_server=is_server)
+                return 0
+            else:
+                stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+                log_error(f"Failed to set ACL '{acl}' on {folder} for user {user}.\n{stderr}", is_server=is_server)
+                return 1
         else:
-            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
-            raise Exception(f"Failed to set ACL on {folder} for user {user}.\n{stderr}")
-    else:
-        raise Exception(f"Folder {folder} not found. Do you have access permissions?")
-
-
-def afs_remove_acl(user, folder):
-    folder = Path(folder).resolve()
-    if folder.is_dir():
-        cmd = subprocess.run(['fs', 'sa', folder, user, 'none'],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        if cmd.returncode == 0:
-            print(f"Removed ACL on folder {folder} for user {user}.")
+            log_error(f"Folder {folder} not found. Do you have access permissions?", is_server=is_server)
+            return 1
+    except Exception as e:
+        log_error(f"Failed to set ACL '{acl}' on {folder} for user {user}.\n{stderr}", e, is_server=is_server)
+        return 1
+
+
+def afs_remove_acl(user, folder, is_server=False):
+    try:
+        folder = Path(folder).resolve()
+        if folder.is_dir():
+            cmd = subprocess.run(['fs', 'sa', folder, user, 'none'],
+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            if cmd.returncode == 0:
+                log_info(f"Removed ACL on folder {folder} for user {user}.", is_server=is_server)
+                return 0
+            else:
+                stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+                log_error(f"Failed to remove ACL on {folder} for user {user}.\n{stderr}", is_server=is_server)
+                return 1
         else:
-            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
-            raise Exception(f"Failed to remove ACL on {folder} for user {user}.\n{stderr}")
-    else:
-        raise Exception(f"Folder {folder} not found. Do you have access permissions?")
-
-
-def afs_print_acl(folder):
-    folder = Path(folder).resolve()
-    if folder.is_dir():
-        cmd = subprocess.run(['fs', 'la', folder],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        if cmd.returncode == 0:
-            stdout = cmd.stdout.decode('UTF-8').strip().split('\n')
-            print(f"{stdout}")
+            log_error(f"Folder {folder} not found. Do you have access permissions?", is_server=is_server)
+            return 1
+    except Exception as e:
+        log_error(f"Failed to remove ACL on {folder} for user {user}.\n{stderr}", e, is_server=is_server)
+        return 1
+
+
+def afs_print_acl(folder, is_server=False):
+    try:
+        folder = Path(folder).resolve()
+        if folder.is_dir():
+            cmd = subprocess.run(['fs', 'la', folder],
+                                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            if cmd.returncode == 0:
+                stdout = cmd.stdout.decode('UTF-8').strip().split('\n')
+                log_info(f"{stdout}", is_server=is_server)
+                return 0
+            else:
+                stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+                log_error(f"Failed to remove ACL on {folder} for user {user}.\n{stderr}", is_server=is_server)
+                return 1
         else:
-            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
-            raise Exception(f"Failed to remove ACL on {folder} for user {user}.\n{stderr}")
-    else:
-        raise Exception(f"Folder {folder} not found. Do you have access permissions?")
+            log_error(f"Folder {folder} not found. Do you have access permissions?", is_server=is_server)
+            return 1
+    except Exception as e:
+        log_error(f"Failed to remove ACL on {folder} for user {user}.\n{stderr}", e, is_server=is_server)
+        return 1
 

xboinc/server/eos.py

@@ -38,7 +38,7 @@ def _xrd_path(path):
     path = Path(path).expanduser().resolve()
     return EOS_MGM_URL + '/' + _eos_path(path)
 
-def eos_glob(pattern, path, is_server=True):
+def eos_glob(pattern, path, is_server=False):
     try:
         path = Path(path).expanduser().resolve()
         cmd = subprocess.run(['eos', 'find', '-name', pattern, _eos_path(path)],
@@ -51,7 +51,7 @@ def eos_glob(pattern, path, is_server=True):
         log_error(f"Failed eos_glob {pattern} in {path}!\n", e, is_server=is_server)
         return []
 
-def eos_exists(path, is_server=True):
+def eos_exists(path, is_server=False):
     try:
         path = Path(path).expanduser().resolve()
         cmd = subprocess.run(['eos', 'find', '-name', path.name, _eos_path(path.parent)],
@@ -63,7 +63,7 @@ def eos_exists(path, is_server=True):
         log_error(f"Failed eos_exists for {path}!\n", e, is_server=is_server)
         return False
 
-def eos_rm(path, is_server=True):
+def eos_rm(path, is_server=False):
     try:
         path = Path(path).expanduser().resolve()
         cmd = subprocess.run(['eos', 'rm', _eos_path(path)], stdout=subprocess.PIPE, env=eos_env)
@@ -79,7 +79,7 @@ def eos_rm(path, is_server=True):
 
 
 # Always use this file by file, not for a list of files
-def cp_from_eos(source, target, maximum_trials=10, wait=2.7, is_server=True):
+def cp_from_eos(source, target, maximum_trials=10, wait=2.7, is_server=False):
     try:
         target = Path(target).expanduser().resolve()
         for i in range(maximum_trials):
@@ -101,13 +101,13 @@ def cp_from_eos(source, target, maximum_trials=10, wait=2.7, is_server=True):
         log_error(f"Failed to copy {str(source)} to {str(target)}!\n", e, is_server=is_server)
         return 1
 
-def mv_from_eos(source, target, maximum_trials=10, wait=2.7, is_server=True):
+def mv_from_eos(source, target, maximum_trials=10, wait=2.7, is_server=False):
     if not cp_from_eos(source, target, maximum_trials, wait, is_server=is_server):   # returncode 0 means success
         eos_rm(source, is_server=is_server)
 
 
 # Always use this file by file, not for a list of files
-def cp_to_eos(source, target, maximum_trials=10, wait=2.7, is_server=True):
+def cp_to_eos(source, target, maximum_trials=10, wait=2.7, is_server=False):
     try:
         source = Path(source).expanduser().resolve()
         target = Path(target, source.name).expanduser().resolve()
@@ -131,6 +131,6 @@ def cp_to_eos(source, target, maximum_trials=10, wait=2.7, is_server=True):
         log_error(f"Failed to copy {str(source)} to {str(target)}!\n", e, is_server=is_server)
         return 1
 
-def mv_to_eos(source, target, maximum_trials=10, wait=2.7, is_server=True):
+def mv_to_eos(source, target, maximum_trials=10, wait=2.7, is_server=False):
     if not cp_to_eos(source, target, maximum_trials, wait, is_server=is_server):   # returncode 0 means success
         source.unlink()

xboinc/server/paths.py

@@ -6,4 +6,4 @@
 from pathlib import Path
 
 eosdir  = Path('/','eos','user','s','sixtadm','spooldirs','xtrack') # EOS spooldir for server
-dropdir = eosdir / 'drop'                                           # only location where users have write access (i.e. to register)
+dropdir = eosdir / 'drop'                                           # only location where users have write access (i.e. to register)

xboinc/server/tools.py

@@ -3,13 +3,10 @@
 # Copyright (c) CERN, 2023.                 #
 # ######################################### #
 
-import os, sys
 from pathlib import Path
 import logging as lg
 import traceback
 import tarfile
-import atexit
-import base64
 import datetime
 
 
@@ -19,56 +16,34 @@ def timestamp(ms=False):
     return datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S.%f")[:ms]
 
 
-def log_debug(message, is_server=True):
+def log_debug(message, is_server=False):
     if is_server:
         lg.debug(f"{timestamp(ms=True)}:  {message}")
     else:
         print(message)
 
-def log_info(message, is_server=True):
+def log_info(message, is_server=False):
     if is_server:
         lg.info(f"{timestamp(ms=True)}:  {message}")
     else:
         print(message)
 
-def log_error(message, e=None, is_server=True):
+def log_error(message, e=None, is_server=False):
     if is_server:
         stack = '' if e is None else f"\n{traceback.format_exc()}\n{e}"
         lg.error(f"{timestamp(ms=True)}:  {message}{stack}")
     else:
         raise Exception(message, e)
 
-
-def ranID():
-    ran = base64.urlsafe_b64encode(os.urandom(8)).decode('utf-8')
-    return ''.join(c if c.isalnum() else 'X' for c in ran)
-
-
-def untar(filename):
+def untar(filename, is_server=False):
     try:
         filename = Path(filename)
         thisdir = filename.parent / filename.stem[:-4]
         thisdir.mkdir(parents=True, exist_ok=True)
         with tarfile.open(filename, 'r:gz') as fid:
             fid.extractall(path=thisdir)
         filename.unlink()
-        log_debug(f"Extracted {filename}.")
+        log_debug(f"Extracted {filename}.", is_server)
 
     except Exception as e:
-        log_error(f"Failed extracting {filename}", e)
-
-
-def lock(lockfile):
-    lockfile = Path(lockfile)
-    # Check if previous process still running
-    if lockfile.exists():
-        sys.exit(f"Previous {lockfile.name} script still active! Exiting...")
-    else:
-        # Otherwise register a lockfile
-        lockfile.touch()
-        def exit_handler():
-            lockfile.unlink()
-        atexit.register(exit_handler)
-
-
-
+        log_error(f"Failed extracting {filename}", e, is_server)