Fixed inconsistent double definition of the mapping file location (#48)

* Fixed inconsistent duplicate definitions of mapping file location

* Added redirect to curl commands

Author: vrbanecd

rpm/teapot-rpm-alma.sh

@@ -26,8 +26,8 @@ rm storm-webdav-server.jar
 mv storm-webdav-server.tar.gz "${HOME}"/rpmbuild/SOURCES/
 
 cd /tmp || exit
-curl -O https://syncandshare.desy.de/index.php/s/ZE6M6ZDYPoftnbG/download/python-lib64-alma1.tar.gz .
-curl -O https://syncandshare.desy.de/index.php/s/WdEpm9idqqYy8Sp/download/python-lib-alma1.tar.gz .
+curl -L -O https://syncandshare.desy.de/index.php/s/ZE6M6ZDYPoftnbG/download/python-lib64-alma1.tar.gz
+curl -L -O https://syncandshare.desy.de/index.php/s/WdEpm9idqqYy8Sp/download/python-lib-alma1.tar.gz
 mv /tmp/python-lib*.tar.gz "${HOME}"/rpmbuild/SOURCES/
 
 #building the RPM package

rpm/teapot-rpm-fedora.sh

@@ -26,8 +26,8 @@ rm storm-webdav-server.jar
 mv storm-webdav-server.tar.gz "${HOME}"/rpmbuild/SOURCES/
 
 cd /tmp || exit
-curl -O https://syncandshare.desy.de/index.php/s/oSjdrPwCd6KkfJm/download/python-lib64-fedora.tar.gz .
-curl -O https://syncandshare.desy.de/index.php/s/PqN432X83764Lm4/download/python-lib-fedora.tar.gz .
+curl -L -O https://syncandshare.desy.de/index.php/s/oSjdrPwCd6KkfJm/download/python-lib64-fedora.tar.gz
+curl -L -O https://syncandshare.desy.de/index.php/s/PqN432X83764Lm4/download/python-lib-fedora.tar.gz
 mv /tmp/python-lib*.tar.gz "${HOME}"/rpmbuild/SOURCES/
 
 #building the RPM package

rpm/teapot-rpm-rocky.sh

@@ -26,8 +26,8 @@ rm storm-webdav-server.jar
 mv storm-webdav-server.tar.gz "${HOME}"/rpmbuild/SOURCES/
 
 cd /tmp || exit
-curl -O https://syncandshare.desy.de/index.php/s/nsCALcFF3JAnW9j/download/python-lib64-rocky1.tar.gz .
-curl -O https://syncandshare.desy.de/index.php/s/y2y95e8BTxrqyZG/download/python-lib-rocky1.tar.gz .
+curl -L -O https://syncandshare.desy.de/index.php/s/nsCALcFF3JAnW9j/download/python-lib64-rocky1.tar.gz
+curl -L -O https://syncandshare.desy.de/index.php/s/y2y95e8BTxrqyZG/download/python-lib-rocky1.tar.gz
 mv /tmp/python-lib*.tar.gz "${HOME}"/rpmbuild/SOURCES/
 
 #building the RPM package

teapot.py

@@ -206,17 +206,6 @@ async def _create_user_dirs(username, port, sub):
     # - /etc/APP_NAME/user-mapping.csv
 
     logger.debug("creating user configuration directories")
-    config_dir = f"/etc/{APP_NAME}"
-
-    if mapping == "FILE":
-        mapping_file = f"{config_dir}/user-mapping.csv"
-        if not exists(mapping_file):
-            logger.error(
-                "%s does not exist. It should consist of two variables per user: "
-                + "username and subject claim separated by a single space.",
-                mapping_file,
-            )
-            return False
 
     app_dir = f"/var/lib/{APP_NAME}"
     if not exists(app_dir):
@@ -724,20 +713,27 @@ async def _map_fed_to_local(sub, iss, eduperson_entitlement):
     """
     logger.debug("For the user's identity mapping, %s method is used", mapping)
     if mapping == "FILE":
-        with open(
-            config["Teapot"]["mapping_file"], "r", encoding="utf-8"
-        ) as mapping_file:
-            mappingreader = csv.reader(mapping_file, delimiter=" ")
+        mapping_file = config["Teapot"]["mapping_file"]
+        if not exists(mapping_file):
+            logger.error(
+                "%s does not exist. It should consist of two variables per user: "
+                "username and subject claim separated by a single space.",
+                mapping_file,
+            )
+            return None
+
+        with open(mapping_file, "r", encoding="utf-8") as mapping_file_obj:
+            mappingreader = csv.reader(mapping_file_obj, delimiter=" ")
             for row in mappingreader:
                 if row[1] == sub:
                     if not row[0]:
                         logger.error("local user identity is unknown")
                         return None
                     logger.info("local user identity is %s", row[0])
                     return row[0]
-            else:
-                RuntimeError("The local user for sub claim %s does not exist", sub)
-        return None
+
+            raise RuntimeError(f"The local user for sub claim {sub} does not exist")
+
     elif mapping == "ALISE":
         alise_instance = Alise()
         local_username = alise_instance.get_local_username(sub, iss)
@@ -776,7 +772,7 @@ async def storm_webdav_state(state, condition, sub, iss, eduperson_entitlement):
     user = await _map_fed_to_local(sub, iss, eduperson_entitlement)
 
     should_start_sw = False
-    logger.info("Assesing the state of the storm webdav instance for user %s", user)
+    logger.info("Assessing the state of the storm webdav instance for user %s", user)
 
     async with condition:
         if user not in state: