lfss 0.6.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

lfss/src/datatype.py

@@ -25,7 +25,7 @@ class UserRecord:
 class FileRecord:
     url: str
     owner_id: int
-    file_id: str      # defines mapping from fmata to fdata
+    file_id: str      # defines mapping from fmata to blobs.fdata
     file_size: int
     create_time: str
     access_time: str

lfss/src/server.py

@@ -17,20 +17,24 @@ from .log import get_logger
 from .stat import RequestDB
 from .config import MAX_BUNDLE_BYTES, MAX_FILE_BYTES, LARGE_FILE_BYTES
 from .utils import ensure_uri_compnents, format_last_modified, now_stamp
-from .database import Database, UserRecord, DECOY_USER, FileRecord, check_user_permission, FileReadPermission
+from .connection_pool import global_connection_init, global_connection_close, unique_cursor
+from .database import Database, UserRecord, DECOY_USER, FileRecord, check_user_permission, FileReadPermission, UserConn, FileConn
 
 logger = get_logger("server", term_level="DEBUG")
 logger_failed_request = get_logger("failed_requests", term_level="INFO")
-conn = Database()
+db = Database()
 req_conn = RequestDB()
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
-    global conn
-    await asyncio.gather(conn.init(), req_conn.init())
-    yield
-    await asyncio.gather(conn.commit(), req_conn.commit())
-    await asyncio.gather(conn.close(), req_conn.close())
+    global db
+    try:
+        await global_connection_init(n_read = 2)
+        await asyncio.gather(db.init(), req_conn.init())
+        yield
+        await req_conn.commit()
+    finally:
+        await asyncio.gather(req_conn.close(), global_connection_close())
 
 def handle_exception(fn):
     @wraps(fn)
@@ -58,13 +62,15 @@ async def get_current_user(
     First try to get the user from the bearer token, 
     if not found, try to get the user from the query parameter
     """
-    if token:
-        user = await conn.user.get_user_by_credential(token.credentials)
-    else:
-        if not q_token:
-            return DECOY_USER
+    async with unique_cursor() as conn:
+        uconn = UserConn(conn)
+        if token:
+            user = await uconn.get_user_by_credential(token.credentials)
         else:
-            user = await conn.user.get_user_by_credential(q_token)
+            if not q_token:
+                return DECOY_USER
+            else:
+                user = await uconn.get_user_by_credential(q_token)
 
     if not user:
         raise HTTPException(status_code=401, detail="Invalid token")
@@ -116,25 +122,31 @@ async def get_file(path: str, download = False, user: UserRecord = Depends(get_c
     if path == "": path = "/"
     if path.endswith("/"):
         # return file under the path as json
-        if user.id == 0:
-            raise HTTPException(status_code=403, detail="Permission denied, credential required")
-        if path == "/":
-            return {
-                "dirs": await conn.file.list_root(user.username) \
-                    if not user.is_admin else await conn.file.list_root(),
-                "files": []
-            }
-
-        if not path.startswith(f"{user.username}/") and not user.is_admin:
-            raise HTTPException(status_code=403, detail="Permission denied, path must start with username")
-
-        return await conn.file.list_path(path, flat = False)
+        async with unique_cursor() as conn:
+            fconn = FileConn(conn)
+            if user.id == 0:
+                raise HTTPException(status_code=403, detail="Permission denied, credential required")
+            if path == "/":
+                return {
+                    "dirs": await fconn.list_root(user.username) \
+                        if not user.is_admin else await fconn.list_root(),
+                    "files": []
+                }
+
+            if not path.startswith(f"{user.username}/") and not user.is_admin:
+                raise HTTPException(status_code=403, detail="Permission denied, path must start with username")
+
+            return await fconn.list_path(path, flat = False)
     
-    file_record = await conn.file.get_file_record(path)
-    if not file_record:
-        raise HTTPException(status_code=404, detail="File not found")
+    async with unique_cursor() as conn:
+        fconn = FileConn(conn)
+        file_record = await fconn.get_file_record(path)
+        if not file_record:
+            raise HTTPException(status_code=404, detail="File not found")
+
+        uconn = UserConn(conn)
+        owner = await uconn.get_user_by_id(file_record.owner_id)
 
-    owner = await conn.user.get_user_by_id(file_record.owner_id)
     assert owner is not None, "Owner not found"
     allow_access, reason = check_user_permission(user, owner, file_record)
     if not allow_access:
@@ -145,7 +157,7 @@ async def get_file(path: str, download = False, user: UserRecord = Depends(get_c
         if media_type is None:
             media_type = file_record.mime_type
         if not file_record.external:
-            fblob = await conn.read_file(path)
+            fblob = await db.read_file(path)
             return Response(
                 content=fblob, media_type=media_type, headers={
                     "Content-Disposition": f"{disposition}; filename={fname}", 
@@ -155,7 +167,7 @@ async def get_file(path: str, download = False, user: UserRecord = Depends(get_c
             )
         else:
             return StreamingResponse(
-                await conn.read_file_stream(path), media_type=media_type, headers={
+                await db.read_file_stream(path), media_type=media_type, headers={
                     "Content-Disposition": f"{disposition}; filename={fname}", 
                     "Content-Length": str(file_record.file_size),
                     "Last-Modified": format_last_modified(file_record.create_time)
@@ -192,7 +204,10 @@ async def put_file(
     
     logger.info(f"PUT {path}, user: {user.username}")
     exists_flag = False
-    file_record = await conn.file.get_file_record(path)
+    async with unique_cursor() as conn:
+        fconn = FileConn(conn)
+        file_record = await fconn.get_file_record(path)
+
     if file_record:
         if conflict == "abort":
             raise HTTPException(status_code=409, detail="File exists")
@@ -202,7 +217,7 @@ async def put_file(
             }, content=json.dumps({"url": path}))
         # remove the old file
         exists_flag = True
-        await conn.delete_file(path)
+        await db.delete_file(path)
     
     # check content-type
     content_type = request.headers.get("Content-Type")
@@ -236,9 +251,9 @@ async def put_file(
             chunk_size = 16 * 1024 * 1024    # 16MB
             for b in range(0, len(blobs), chunk_size):
                 yield blobs[b:b+chunk_size]
-        await conn.save_file(user.id, path, blob_reader(), permission = FileReadPermission(permission), mime_type = mime_t)
+        await db.save_file(user.id, path, blob_reader(), permission = FileReadPermission(permission), mime_type = mime_t)
     else:
-        await conn.save_file(user.id, path, blobs, permission = FileReadPermission(permission), mime_type=mime_t)
+        await db.save_file(user.id, path, blobs, permission = FileReadPermission(permission), mime_type=mime_t)
 
     # https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Methods/PUT
     if exists_flag:
@@ -262,11 +277,11 @@ async def delete_file(path: str, user: UserRecord = Depends(get_current_user)):
     logger.info(f"DELETE {path}, user: {user.username}")
 
     if path.endswith("/"):
-        res = await conn.delete_path(path)
+        res = await db.delete_path(path)
     else:
-        res = await conn.delete_file(path)
+        res = await db.delete_file(path)
 
-    await conn.user.set_active(user.username)
+    await db.record_user_activity(user.username)
     if res:
         return Response(status_code=200, content="Deleted")
     else:
@@ -291,14 +306,14 @@ async def bundle_files(path: str, user: UserRecord = Depends(get_current_user)):
         owner_id = file_record.owner_id
         owner = owner_records_cache.get(owner_id, None)
         if owner is None:
-            owner = await conn.user.get_user_by_id(owner_id)
-            assert owner is not None, f"File owner not found: id={owner_id}"
             owner_records_cache[owner_id] = owner
             
         allow_access, _ = check_user_permission(user, owner, file_record)
         return allow_access
     
-    files = await conn.file.list_path(path, flat = True)
+    async with unique_cursor() as conn:
+        fconn = FileConn(conn)
+        files = await fconn.list_path(path, flat = True)
     files = [f for f in files if await is_access_granted(f)]
     if len(files) == 0:
         raise HTTPException(status_code=404, detail="No files found")
@@ -309,7 +324,7 @@ async def bundle_files(path: str, user: UserRecord = Depends(get_current_user)):
         raise HTTPException(status_code=400, detail="Too large to zip")
 
     file_paths = [f.url for f in files]
-    zip_buffer = await conn.zip_path(path, file_paths)
+    zip_buffer = await db.zip_path(path, file_paths)
     return Response(
         content=zip_buffer.getvalue(), media_type="application/zip", headers={
             "Content-Disposition": f"attachment; filename=bundle.zip", 
@@ -322,8 +337,11 @@ async def bundle_files(path: str, user: UserRecord = Depends(get_current_user)):
 async def get_file_meta(path: str, user: UserRecord = Depends(get_current_user)):
     logger.info(f"GET meta({path}), user: {user.username}")
     path = ensure_uri_compnents(path)
-    get_fn = conn.file.get_file_record if not path.endswith("/") else conn.file.get_path_record
-    record = await get_fn(path)
+    async with unique_cursor() as conn:
+        fconn = FileConn(conn)
+        get_fn = fconn.get_file_record if not path.endswith("/") else fconn.get_path_record
+        record = await get_fn(path)
+
     if not record:
         raise HTTPException(status_code=404, detail="Path not found")
     return record
@@ -341,30 +359,22 @@ async def update_file_meta(
     path = ensure_uri_compnents(path)
     if path.startswith("/"):
         path = path[1:]
-    await conn.user.set_active(user.username)
+    await db.record_user_activity(user.username)
 
     # file
     if not path.endswith("/"):
-        file_record = await conn.file.get_file_record(path)
-        if not file_record:
-            logger.debug(f"Reject update meta request from {user.username} to {path}")
-            raise HTTPException(status_code=404, detail="File not found")
-        
-        if not (user.is_admin or user.id == file_record.owner_id):
-            logger.debug(f"Reject update meta request from {user.username} to {path}")
-            raise HTTPException(status_code=403, detail="Permission denied")
-        
         if perm is not None:
             logger.info(f"Update permission of {path} to {perm}")
-            await conn.file.update_file_record(
-                url = file_record.url, 
+            await db.update_file_record(
+                user = user,
+                url = path, 
                 permission = FileReadPermission(perm)
             )
     
         if new_path is not None:
             new_path = ensure_uri_compnents(new_path)
             logger.info(f"Update path of {path} to {new_path}")
-            await conn.move_file(path, new_path)
+            await db.move_file(path, new_path)
     
     # directory
     else:
@@ -372,24 +382,8 @@ async def update_file_meta(
         if new_path is not None:
             new_path = ensure_uri_compnents(new_path)
             logger.info(f"Update path of {path} to {new_path}")
-            assert new_path.endswith("/"), "New path must end with /"
-            if new_path.startswith("/"):
-                new_path = new_path[1:]
-
-            # check if new path is under the user's directory
-            first_component = new_path.split("/")[0]
-            if not (first_component == user.username or user.is_admin):
-                raise HTTPException(status_code=403, detail="Permission denied, path must start with username")
-            elif user.is_admin:
-                _is_user = await conn.user.get_user(first_component)
-                if not _is_user:
-                    raise HTTPException(status_code=404, detail="User not found, path must start with username")
-
-            # check if old path is under the user's directory (non-admin)
-            if not path.startswith(f"{user.username}/") and not user.is_admin:
-                raise HTTPException(status_code=403, detail="Permission denied, path must start with username")
             # currently only move own file, with overwrite
-            await conn.move_path(path, new_path, user_id = user.id)
+            await db.move_path(user, path, new_path)
 
     return Response(status_code=200, content="OK")
     

{lfss-0.6.0.dist-info → lfss-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.6.0
+Version: 0.7.1
 Summary: Lightweight file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: li, mengxun

{lfss-0.6.0.dist-info → lfss-0.7.1.dist-info}/RECORD

@@ -5,28 +5,29 @@ frontend/api.js,sha256=-ouhsmucEunAK3m1H__MqffQkXAjoeVEfM15BvqfIZs,7677
 frontend/index.html,sha256=VPJDs2LG8ep9kjlsKzjWzpN9vc1VGgdvOUlNTZWyQoQ,2088
 frontend/popup.css,sha256=VzkjG1ZTLxhHMtTyobnlvqYmVsTmdbJJed2Pu1cc06c,1007
 frontend/popup.js,sha256=3PgaGZmxSdV1E-D_MWgcR7aHWkcsHA1BNKSOkmP66tA,5191
-frontend/scripts.js,sha256=JkjcyT-IpzSypwI4oWwgY9UDdKkR1ZSYdSc4c6MlukE,21128
+frontend/scripts.js,sha256=hQ8m3L7P-LplLqrPUWD6pBo4C_tCUl2XZKRNtkWBy8I,21155
 frontend/styles.css,sha256=wly8O-zF4EUgV12Tv1bATSfmJsLITv2u3_SiyXVaxv4,4096
 frontend/utils.js,sha256=Ts4nlef8pkrEgpwX-uQwAhWvwxlIzex8ijDLNCa22ps,2372
-lfss/cli/balance.py,sha256=5kyjfknN7oNiyEs2DcDYzTMKzoOTDm0caF2nZyxJcHw,4707
-lfss/cli/cli.py,sha256=-BcLIH-6jCJxZfg48nA3gulnitO59Hnba3HoKqyKeUA,2245
+lfss/cli/balance.py,sha256=vhTlZoBF97dHBf5IittHpybKswaA-xXOfiPAdvIHD5Q,4794
+lfss/cli/cli.py,sha256=bJOeEyri_XVWUvnjohsw_oPYKp-bELxLrg5sVWOpKQA,2259
 lfss/cli/panel.py,sha256=iGdVmdWYjA_7a78ZzWEB_3ggIOBeUKTzg6F5zLaB25c,1401
 lfss/cli/serve.py,sha256=bO3GT0kuylMGN-7bZWP4e71MlugGZ_lEMkYaYld_Ntg,985
-lfss/cli/user.py,sha256=uSNgF8wGYpdOowN8Mah3V_ii6NlxRMNecrrVj3HaemU,3328
+lfss/cli/user.py,sha256=Bu2IOchLdClBqjBqVeDck3kE0UaKWpL6mG5SPihBorc,3498
 lfss/client/__init__.py,sha256=YttaGTBup7mxnW0CtxdZPF0HWga2cGM4twz9MXJIrts,1827
-lfss/client/api.py,sha256=KKDESF1rwjcPr_D87685tCfePxy9IUeG9KkMRPBCuds,4682
-lfss/sql/init.sql,sha256=oYcH114CpmAlIW_CF2wokSdk2yxtfAkSBybMqOpHlpA,1205
-lfss/sql/pragma.sql,sha256=krTf0ALmU_4s2hGM4PSYwmSCqjRXcaOxChmgMEhtJqI,134
+lfss/client/api.py,sha256=ICqpcyvSf-9QmYNv9EQ5fA_MViSuLxSNn-CIBNqWkW8,5414
+lfss/sql/init.sql,sha256=C-JtQAlaOjESI8uoF1Y_9dKukEVSw5Ll-7yA3gG-XHU,1210
+lfss/sql/pragma.sql,sha256=uENx7xXjARmro-A3XAK8OM8v5AxDMdCCRj47f86UuXg,206
 lfss/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lfss/src/config.py,sha256=SM6WVmpkf7e-YkV3RELTJltOnQGRtXkVtA1rVHwsg0g,484
-lfss/src/database.py,sha256=vLpMUPjoY9aysqxy8IBXcvPdmfo5_xvYoiTlIa_HdKY,33527
-lfss/src/datatype.py,sha256=cqUC8sN-XWIzlsD1m9YLj6ERu-z0jzxTZV4GSE_3DKA,1616
+lfss/src/config.py,sha256=0TjCCrqkoiLw45vOT0PbDciWbzpD7ztWtubwIwXCsPk,527
+lfss/src/connection_pool.py,sha256=Y47BJ1gsyusmmVA1PHoFBhytup8s3HbU9D_Aw0y4-TM,4848
+lfss/src/database.py,sha256=l0Z-ixfwAkYHbSgk9cVceOJ2vzkYUJeVw25Ny7HQxAA,31104
+lfss/src/datatype.py,sha256=BLS7vuuKnFZQg0nrKeP9SymqUhcN6HwPgejU0yBd_Ak,1622
 lfss/src/error.py,sha256=imbhwnbhnI3HLhkbfICROe3F0gleKrOk4XnqHJDOtuI,285
 lfss/src/log.py,sha256=qNE04sHoZ2rMbQ5dR2zT7Xaz1KVAfYp5hKpWJX42S9g,5244
-lfss/src/server.py,sha256=J8A9hUnqf-AzCF-Q2Ve9iMPkJYKZ81OP26dFLRm89BM,16219
+lfss/src/server.py,sha256=9mnBlcHJruwOV-aoHa1P146F4khpVDmif7rq58yZX3U,15306
 lfss/src/stat.py,sha256=hTMtQyM_Ukmhc33Bb9FGCfBMIX02KrGHQg8nL7sC8sU,2082
 lfss/src/utils.py,sha256=8VkrtpSmurbMiX7GyK-n7Grvzy3uwSJXHdONEsuLCDI,2272
-lfss-0.6.0.dist-info/METADATA,sha256=dJoh4nlz5gCY-7hVkSIGiiadoqPJLUSKjHA2fD3C8b4,1820
-lfss-0.6.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.6.0.dist-info/entry_points.txt,sha256=d_Ri3GXxUW-S0E6q953A8od0YMmUAnZGlJSKS46OiW8,172
-lfss-0.6.0.dist-info/RECORD,,
+lfss-0.7.1.dist-info/METADATA,sha256=nNjDG5BqDBRpeYP3NNPEdM02wWeIIJNO1VDdKNrgqQ0,1820
+lfss-0.7.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.7.1.dist-info/entry_points.txt,sha256=d_Ri3GXxUW-S0E6q953A8od0YMmUAnZGlJSKS46OiW8,172
+lfss-0.7.1.dist-info/RECORD,,