keep uftpfs connection details

Author: BerndSchuller

CHANGES.md

@@ -3,7 +3,7 @@ Changelog for PyUNICORE
 
 Issue tracker: https://github.com/HumanBrainProject/pyunicore
 
-Version 1.3.0 (mmm dd, 2025)
+Version 1.3.0 (May 12, 2025)
 ----------------------------
  - new feature: CLI: implemented more authentication options
    (oidc-agent, oidc-server, anonymous)

pyunicore/credentials.py

@@ -72,7 +72,7 @@ def get_token(self):
 
 class BearerToken(Credential):
     """
-    Produces a header value "Basic <auth_token>"
+    Produces a header value "Bearer <auth_token>"
 
     Args:
         token: the value of the auth token

pyunicore/uftp/uftpfs.py

@@ -37,8 +37,12 @@ class UFTPFS(FTPFS):
 
     def __init__(self, auth_url, creds, base_path="/"):
         """Creates a new UFTP FS instance authenticating using the given URL and credentials"""
-        uftp_host, uftp_port, uftp_password = UFTP().authenticate(creds, auth_url, base_path)
-        super().__init__(uftp_host, port=uftp_port, user="anonymous", passwd=uftp_password)
+        self.uftp_host, self.uftp_port, self.uftp_password = UFTP().authenticate(
+            creds, auth_url, base_path
+        )
+        super().__init__(
+            self.uftp_host, port=self.uftp_port, user="anonymous", passwd=self.uftp_password
+        )
         self.base_path = base_path
 
     def hassyspath(self, path):

pyunicore/uftp/uftpfuse.py

@@ -87,16 +87,18 @@ def __init__(self, host, port, password, debug=False, read_only=False):
         self.host = host
         self.port = port
         self.password = password
-        self.uftp_session = self.new_session()
         self.last_file = None
         self.file_map = {}
         self.next_file_handle = 0
         self.debug = debug
         self.read_only = read_only
+        self.uftp_session = self.new_session()
 
     def new_session(self):
         uftp_session = UFTP()
         uftp_session.open_uftp_session(self.host, self.port, self.password)
+        if self.debug:
+            print("UFTP session initialised.")
         return uftp_session
 
     def chmod(self, path, mode):
@@ -228,11 +230,22 @@ def main():
         action="store_true",
         help="read-only mode, prevents writes, renames, etc",
     )
+    parser.add_argument(
+        "-f",
+        "--foreground",
+        action="store_true",
+        help="run fusedriver in foreground",
+    )
     parser.add_argument(
         "-P",
         "--password",
         help="one-time password (if not given, it is expected in the environment UFTP_PASSWORD)",
     )
+    parser.add_argument(
+        "-o",
+        "--fuse-options",
+        help="additional options (key1=value1,key2=value2,...) for fusepy",
+    )
     parser.add_argument("address", help="UFTPD server's address (host:port)")
     parser.add_argument(
         "mount_point",
@@ -248,18 +261,27 @@ def main():
             "UFTP one-time password must be given with '-P ...' or as environment UFTP_PASSWORD"
         )
     _host, _port = args.address.split(":")
-
+    foreground = args.foreground or args.debug
+    extra_opts = _parse_args(args.fuse_options)
+    driver = UFTPDriver(_host, int(_port), _pwd, debug=args.debug, read_only=args.read_only)
     FUSE(
-        UFTPDriver(_host, int(_port), _pwd, debug=args.debug, read_only=args.read_only),
+        driver,
         args.mount_point,
         debug=args.debug,
-        foreground=args.debug,
+        foreground=foreground,
         nothreads=True,
-        big_writes=True,
-        max_read=131072,
-        max_write=131072,
+        **extra_opts,
     )
 
 
+def _parse_args(args: str) -> dict:
+    result = {}
+    if args:
+        for opt in args.split(","):
+            kv = opt.split("=")
+            result[kv[0]] = kv[1]
+    return result
+
+
 if __name__ == "__main__":
     main()

pyunicore/uftp/uftpmountfs.py

@@ -38,11 +38,11 @@ class UFTPMOUNTFS(OSFS):
 
     def __init__(self, auth_url, creds, base_path="/", mount_dir="./uftp_mount"):
         """Creates a new UFTP FS instance authenticating using the given URL and credentials"""
-        self.host, self.port, uftp_password = UFTP().authenticate(creds, auth_url, base_path)
+        self.host, self.port, self.uftp_password = UFTP().authenticate(creds, auth_url, base_path)
         self.base_path = base_path
         self.mount_dir = mount_dir
         self._ensure_unmount()
-        self._run_fusedriver(uftp_password)
+        self._run_fusedriver(self.uftp_password)
         super().__init__(mount_dir)
 
     def close(self):