lfss 0.11.5__tar.gz → 0.11.6__tar.gz

{lfss-0.11.5 → lfss-0.11.6}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: lfss
-Version: 0.11.5
-Summary: Lightweight file storage service
+Version: 0.11.6
+Summary: Lite file storage service
 Home-page: https://github.com/MenxLi/lfss
 Author: Li, Mengxun
 Author-email: mengxunli@whu.edu.cn

{lfss-0.11.5 → lfss-0.11.6}/docs/Client.md

@@ -10,6 +10,9 @@ pip install lfss --no-deps
 Then set the `LFSS_ENDPOINT`, `LFSS_TOKEN` environment variables, 
 then you can use the following commands:
 ```sh
+# Check current user information
+lfss whoami
+
 # Query a path
 lfss query remote/file[/or_dir/]
 

{lfss-0.11.5 → lfss-0.11.6}/docs/changelog.md

@@ -1,5 +1,10 @@
 ## 0.11
 
+### 0.11.6
+- Hint copy and move success for frontend.
+- Add query user info and list peers api.
+- Add user with random password if not specified.
+
 ### 0.11.5
 - Script entry default to client CLI. 
 - Fix single file download name deduce with decoding.

{lfss-0.11.5 → lfss-0.11.6}/frontend/api.js

@@ -249,6 +249,7 @@ export default class Connector {
     /**
      * @param {string} path - the path to the file directory, should ends with '/'
      * @returns {Promise<PathListResponse>} - the promise of the request
+     * NOTE: will deprecated in future
      */
     async listPath(path){
         path = this._sanitizeDirPath(path);

{lfss-0.11.5 → lfss-0.11.6}/frontend/scripts.js

@@ -347,6 +347,7 @@ async function refreshFileList(){
                             console.log("Moving", dirurl, "to", dstPath);
                             conn.move(dirurl, dstPath)
                                 .then(() => {
+                                    showPopup('Successfully moved path.', {level: 'success', timeout: 3000});
                                     refreshFileList();
                                 }, 
                                 (err) => {
@@ -371,6 +372,7 @@ async function refreshFileList(){
                             console.log("Copying", dirurl, "to", dstPath);
                             conn.copy(dirurl, dstPath)
                                 .then(() => {
+                                    showPopup('Successfully copied path.', {level: 'success', timeout: 3000});
                                     refreshFileList();
                                 }, 
                                 (err) => {

{lfss-0.11.5 → lfss-0.11.6}/lfss/api/connector.py

@@ -8,7 +8,7 @@ import urllib.parse
 from tempfile import SpooledTemporaryFile
 from lfss.eng.error import PathNotFoundError
 from lfss.eng.datatype import (
-    FileReadPermission, FileRecord, DirectoryRecord, UserRecord, PathContents, 
+    FileReadPermission, FileRecord, DirectoryRecord, UserRecord, PathContents, AccessLevel, 
     FileSortKey, DirSortKey
     )
 from lfss.eng.utils import ensure_uri_components
@@ -316,4 +316,10 @@ class Connector:
     def whoami(self) -> UserRecord:
         """Gets information about the current user."""
         response = self._fetch_factory('GET', '_api/whoami')()
-        return UserRecord(**response.json())
+        return UserRecord(**response.json())
+
+    def list_peers(self, level: AccessLevel = AccessLevel.READ, incoming: bool = False) -> list[UserRecord]:
+        """List all users that have at least the given access level to the current user."""
+        response = self._fetch_factory('GET', '_api/list-peers', {'level': int(level), 'incoming': incoming})()
+        users = [UserRecord(**u) for u in response.json()]
+        return users

{lfss-0.11.5 → lfss-0.11.6}/lfss/cli/cli.py

@@ -1,8 +1,8 @@
 from pathlib import Path
 import argparse, typing, sys
 from lfss.api import Connector, upload_directory, upload_file, download_file, download_directory
-from lfss.eng.datatype import FileReadPermission, FileSortKey, DirSortKey
-from lfss.eng.utils import decode_uri_components
+from lfss.eng.datatype import FileReadPermission, FileSortKey, DirSortKey, AccessLevel
+from lfss.eng.utils import decode_uri_components, fmt_storage_size
 from . import catch_request_error, line_sep
 
 def parse_permission(s: str) -> FileReadPermission:
@@ -10,14 +10,27 @@ def parse_permission(s: str) -> FileReadPermission:
         if p.name.lower() == s.lower():
             return p
     raise ValueError(f"Invalid permission {s}")
+def parse_access_level(s: str) -> AccessLevel:
+    for p in AccessLevel:
+        if p.name.lower() == s.lower():
+            return p
+    raise ValueError(f"Invalid access level {s}")
 
 def parse_arguments():
     parser = argparse.ArgumentParser(description="Client-side command line interface, set LFSS_ENDPOINT and LFSS_TOKEN environment variables for authentication.")
 
     sp = parser.add_subparsers(dest="command", required=True)
 
+    # whoami
+    sp_whoami = sp.add_parser("whoami", help="Show current user information")
+
+    # list peers
+    sp_peers = sp.add_parser("peers", help="Query users that you have access to or users that have access to you")
+    sp_peers.add_argument('-l', "--level", type=parse_access_level, default=AccessLevel.READ, help="Access level filter")
+    sp_peers.add_argument('-i', '--incoming', action='store_true', help="List users that have access to you (rather than you have access to them")
+
     # upload
-    sp_upload = sp.add_parser("upload", help="Upload files")
+    sp_upload = sp.add_parser("upload", help="Upload file(s)")
     sp_upload.add_argument("src", help="Source file or directory", type=str)
     sp_upload.add_argument("dst", help="Destination url path", type=str)
     sp_upload.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
@@ -28,7 +41,7 @@ def parse_arguments():
     sp_upload.add_argument("--retries", type=int, default=0, help="Number of retries")
 
     # download
-    sp_download = sp.add_parser("download", help="Download files")
+    sp_download = sp.add_parser("download", help="Download file(s)")
     sp_download.add_argument("src", help="Source url path", type=str)
     sp_download.add_argument("dst", help="Destination file or directory", type=str)
     sp_download.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
@@ -38,7 +51,7 @@ def parse_arguments():
     sp_download.add_argument("--retries", type=int, default=0, help="Number of retries")
 
     # query
-    sp_query = sp.add_parser("query", help="Query files or directories metadata from the server")
+    sp_query = sp.add_parser("query", help="Query file or directories metadata from the server")
     sp_query.add_argument("path", help="Path to query", nargs="*", type=str)
 
     # list directories
@@ -65,7 +78,28 @@ def parse_arguments():
 def main():
     args = parse_arguments()
     connector = Connector()
-    if args.command == "upload":
+    if args.command == "whoami":
+        with catch_request_error():
+            user = connector.whoami()
+            print("Username:", user.username)
+            print("User ID:", user.id)
+            print("Is Admin:", bool(user.is_admin))
+            print("Max Storage:", fmt_storage_size(user.max_storage))
+            print("Default Permission:", user.permission.name)
+            print("Created At:", user.create_time)
+            print("Last Active:", user.last_active)
+    
+    elif args.command == "peers":
+        with catch_request_error():
+            users = connector.list_peers(level=args.level, incoming=args.incoming)
+            if not args.incoming:
+                print(f"Peers that you have {args.level.name} access to:")
+            else:
+                print(f"Peers that have {args.level.name} access to you:")
+            for i, u in enumerate(line_sep(users)):
+                print(f"[{i+1}] {u.username} (id={u.id})")
+
+    elif args.command == "upload":
         src_path = Path(args.src)
         if src_path.is_dir():
             failed_upload = upload_directory(

{lfss-0.11.5 → lfss-0.11.6}/lfss/cli/user.py

@@ -1,4 +1,4 @@
-import argparse, asyncio, os
+import argparse, asyncio, os, secrets
 from contextlib import asynccontextmanager
 from .cli import parse_permission, FileReadPermission
 from ..eng.utils import parse_storage_size, fmt_storage_size
@@ -18,10 +18,10 @@ async def _main():
     sp = parser.add_subparsers(dest='subparser_name', required=True)
     sp_add = sp.add_parser('add')
     sp_add.add_argument('username', type=str)
-    sp_add.add_argument('password', type=str)
+    sp_add.add_argument('password', nargs='?', type=str, default=None)
     sp_add.add_argument('--admin', action='store_true', help='Set user as admin')
     sp_add.add_argument("--permission", type=parse_permission, default=FileReadPermission.UNSET, help="File permission, can be public, protected, private, or unset")
-    sp_add.add_argument('--max-storage', type=parse_storage_size, default="1G", help="Maximum storage size, e.g. 1G, 100M, 10K")
+    sp_add.add_argument('--max-storage', type=parse_storage_size, default="10G", help="Maximum storage size, e.g. 1G, 100M, 10K, default is 10G")
     
     sp_delete = sp.add_parser('delete')
     sp_delete.add_argument('username', type=str)
@@ -58,6 +58,9 @@ async def _main():
     
     if args.subparser_name == 'add':
         async with get_uconn() as uconn:
+            if args.password is None:
+                passwd = secrets.token_urlsafe(16)
+                args.password = passwd
             await uconn.create_user(args.username, args.password, args.admin, max_storage=args.max_storage, permission=args.permission)
             user = await uconn.get_user(args.username)
             assert user is not None

{lfss-0.11.5 → lfss-0.11.6}/lfss/eng/database.py

@@ -163,25 +163,31 @@ class UserConn(DBObjectBase):
             return AccessLevel.NONE
         return AccessLevel(res[0])
     
-    async def list_peer_users(self, src_user: int | str, level: AccessLevel) -> list[UserRecord]:
+    async def list_peer_users(self, user: int | str, level: AccessLevel, incoming = False) -> list[UserRecord]:
         """
-        List all users that src_user can do [AliasLevel] to, with level >= level, 
-        Note: the returned list does not include src_user and is not apporiate for admin (who has all permissions for all users)
+        if not incoming:
+            List all users that user can do [AliasLevel] to, with level >= level, 
+        else:
+            List all users that can do [AliasLevel] to user, with level >= level
+        Note: the returned list does not include user and is not apporiate for admin (who has all permissions for all users)
         """
         assert int(level) > AccessLevel.NONE, f"Invalid level, {level}"
-        match src_user:
+        aim_field = 'src_user_id' if incoming else 'dst_user_id'
+        query_field = 'dst_user_id' if incoming else 'src_user_id'
+    
+        match user:
             case int():
-                await self.cur.execute("""
+                await self.cur.execute(f"""
                     SELECT * FROM user WHERE id IN (
-                        SELECT dst_user_id FROM upeer WHERE src_user_id = ? AND access_level >= ?
+                        SELECT {aim_field} FROM upeer WHERE {query_field} = ? AND access_level >= ?
                     )
-                """, (src_user, int(level)))
+                """, (user, int(level)))
             case str():
-                await self.cur.execute("""
+                await self.cur.execute(f"""
                     SELECT * FROM user WHERE id IN (
-                        SELECT dst_user_id FROM upeer WHERE src_user_id = (SELECT id FROM user WHERE username = ?) AND access_level >= ?
+                        SELECT {aim_field} FROM upeer WHERE {query_field} = (SELECT id FROM user WHERE username = ?) AND access_level >= ?
                     )
-                """, (src_user, int(level)))
+                """, (user, int(level)))
             case _:
                 raise ValueError("Invalid arguments")
         res = await self.cur.fetchall()

{lfss-0.11.5 → lfss-0.11.6}/lfss/svc/app_native.py

@@ -8,7 +8,7 @@ from fastapi.exceptions import HTTPException
 from ..eng.utils import ensure_uri_components
 from ..eng.config import MAX_MEM_FILE_BYTES
 from ..eng.connection_pool import unique_cursor
-from ..eng.database import check_file_read_permission, check_path_permission, FileConn, delayed_log_access
+from ..eng.database import check_file_read_permission, check_path_permission, FileConn, delayed_log_access, UserConn
 from ..eng.datatype import (
     FileReadPermission, UserRecord, AccessLevel, 
     FileSortKey, DirSortKey
@@ -185,6 +185,16 @@ async def copy_file(
     ):
     return await copy_impl(src_path = src, dst_path = dst, op_user = user)
 
+@router_api.get("/list-peers")
+@handle_exception
+async def list_peers(user: UserRecord = Depends(registered_user), level: AccessLevel = AccessLevel.READ, incoming: bool = False):
+    async with unique_cursor() as conn:
+        uconn = UserConn(conn)
+        peer_users = await uconn.list_peer_users(user.id, level, incoming=incoming)
+    for u in peer_users:
+        u.credential = "__HIDDEN__"
+    return peer_users
+
 async def validate_path_read_permission(path: str, user: UserRecord):
     if not path.endswith("/"):
         raise HTTPException(status_code=400, detail="Path must end with /")

{lfss-0.11.5 → lfss-0.11.6}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "lfss"
-version = "0.11.5"
-description = "Lightweight file storage service"
+version = "0.11.6"
+description = "Lite file storage service"
 authors = ["Li, Mengxun <mengxunli@whu.edu.cn>"]
 readme = "Readme.md"
 homepage = "https://github.com/MenxLi/lfss"