lfss 0.3.2__py3-none-any.whl → 0.4.0__py3-none-any.whl

lfss/src/database.py

@@ -69,7 +69,7 @@ class UserRecord:
     permission: 'FileReadPermission'
 
     def __str__(self):
-        return f"User {self.username} (id={self.id}, admin={self.is_admin}, created at {self.create_time}, last active at {self.last_active}), storage={self.max_storage}, permission={self.permission}"
+        return f"User {self.username} (id={self.id}, admin={self.is_admin}, created at {self.create_time}, last active at {self.last_active}, storage={self.max_storage}, permission={self.permission})"
 
 DECOY_USER = UserRecord(0, 'decoy', 'decoy', False, '2021-01-01 00:00:00', '2021-01-01 00:00:00', 0, FileReadPermission.PRIVATE)
 class UserConn(DBConnBase):
@@ -421,7 +421,7 @@ class FileConn(DBConnBase):
         new_exists = await self.get_file_record(new_url)
         if new_exists is not None:
             raise FileExistsError(f"File {new_url} already exists")
-        async with self.conn.execute("UPDATE fmeta SET url = ? WHERE url = ?", (new_url, old_url)):
+        async with self.conn.execute("UPDATE fmeta SET url = ?, create_time = CURRENT_TIMESTAMP WHERE url = ?", (new_url, old_url)):
             self.logger.info(f"Moved file {old_url} to {new_url}")
     
     async def log_access(self, url: str):
@@ -481,8 +481,9 @@ class FileConn(DBConnBase):
         await self.conn.execute("DELETE FROM fdata WHERE file_id IN ({})".format(','.join(['?'] * len(file_ids))), file_ids)
 
 def validate_url(url: str, is_file = True):
-    ret = not url.startswith('/') and not ('..' in url) and ('/' in url) and not ('//' in url) \
-        and not ' ' in url and not url.startswith('\\') and not url.startswith('_') and not url.startswith('.')
+    prohibited_chars = ['..', ';', "'", '"', '\\', '\0', '\n', '\r', '\t', '\x0b', '\x0c']
+    ret = not url.startswith('/') and not url.startswith('_') and not url.startswith('.')
+    ret = ret and not any([c in url for c in prohibited_chars])
 
     if not ret:
         raise InvalidPathError(f"Invalid URL: {url}")

lfss/src/server.py

@@ -15,7 +15,7 @@ from .error import *
 from .log import get_logger
 from .stat import RequestDB
 from .config import MAX_BUNDLE_BYTES, MAX_FILE_BYTES
-from .utils import ensure_uri_compnents
+from .utils import ensure_uri_compnents, format_last_modified, now_stamp
 from .database import Database, UserRecord, DECOY_USER, FileRecord, check_user_permission, FileReadPermission
 
 logger = get_logger("server", term_level="DEBUG")
@@ -81,6 +81,7 @@ app.add_middleware(
 @app.middleware("http")
 async def log_requests(request: Request, call_next):
 
+    request_time_stamp = now_stamp()
     start_time = time.perf_counter()
     response: Response = await call_next(request)
     end_time = time.perf_counter()
@@ -91,6 +92,7 @@ async def log_requests(request: Request, call_next):
         logger_failed_request.error(f"{request.method} {request.url.path} {response.status_code}")
         
     await req_conn.log_request(
+        request_time_stamp, 
         request.method, request.url.path, response.status_code, response_time,
         headers = dict(request.headers), 
         query = dict(request.query_params), 
@@ -148,7 +150,8 @@ async def get_file(path: str, download = False, user: UserRecord = Depends(get_c
         return Response(
             content=fblob, media_type=media_type, headers={
                 "Content-Disposition": f"{disposition}; filename={fname}", 
-                "Content-Length": str(len(fblob))
+                "Content-Length": str(len(fblob)), 
+                "Last-Modified": format_last_modified(file_record.create_time)
             }
         )
     

lfss/src/stat.py

@@ -13,7 +13,7 @@ class RequestDB:
         await self.conn.execute('''
             CREATE TABLE IF NOT EXISTS requests (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
-                time TIMESTAMP DEFAULT CURRENT_TIMESTAMP, 
+                time FLOAT DEFAULT (strftime('%s', 'now')),
                 method TEXT,
                 path TEXT,
                 headers TEXT,
@@ -43,7 +43,8 @@ class RequestDB:
         await self.commit()
     
     async def log_request(
-        self, method: str, path: str, 
+        self, time: float, 
+        method: str, path: str, 
         status: int, duration: float,
         headers: Optional[Any] = None, 
         query: Optional[Any] = None, 
@@ -57,9 +58,9 @@ class RequestDB:
         client = str(client)
         async with self.conn.execute('''
             INSERT INTO requests (
-                method, path, headers, query, client, duration, request_size, response_size, status
-            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ''', (method, path, headers, query, client, duration, request_size, response_size, status)) as cursor:
+                time, method, path, headers, query, client, duration, request_size, response_size, status
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ''', (time, method, path, headers, query, client, duration, request_size, response_size, status)) as cursor:
             assert cursor.lastrowid is not None
             return cursor.lastrowid
         

lfss/src/utils.py

@@ -1,4 +1,4 @@
-from typing import Callable
+import datetime
 import urllib.parse
 import asyncio
 import functools
@@ -49,4 +49,20 @@ def debounce_async(delay: float = 0):
             except asyncio.CancelledError:
                 pass
         return wrapper
-    return debounce_wrap
+    return debounce_wrap
+
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Last-Modified
+def format_last_modified(last_modified_gmt: str):
+    """
+    Format the last modified time to the HTTP standard format
+    - last_modified_gmt: The last modified time in SQLite ISO 8601 GMT format: e.g. '2021-09-01 12:00:00'
+    """
+    assert len(last_modified_gmt) == 19
+    dt = datetime.datetime.strptime(last_modified_gmt, '%Y-%m-%d %H:%M:%S')
+    return dt.strftime('%a, %d %b %Y %H:%M:%S GMT')
+
+def now_stamp() -> float:
+    return datetime.datetime.now().timestamp()
+
+def stamp_to_str(stamp: float) -> str:
+    return datetime.datetime.fromtimestamp(stamp).strftime('%Y-%m-%d %H:%M:%S')

{lfss-0.3.2.dist-info → lfss-0.4.0.dist-info}/METADATA

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

{lfss-0.3.2.dist-info → lfss-0.4.0.dist-info}/RECORD

@@ -15,13 +15,13 @@ lfss/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lfss/client/api.py,sha256=VBiU-JxGaN6S-fXYD_KvzG7FsGBIUzZ5IisJJSMooDk,3443
 lfss/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lfss/src/config.py,sha256=mc8QoiWoPgiZ5JnSvKBH8jWbp5uLSyG3l5boDiQPXS0,325
-lfss/src/database.py,sha256=jsDcDrc5r4mnuFiY10YEMwIRMvx6c4PY4LN9C9BinDA,27854
+lfss/src/database.py,sha256=wNDsvjvr7Jq1gDeUd_26tETcfeiplAmywIwXLK1TD80,27923
 lfss/src/error.py,sha256=S5ui3tJ0uKX4EZnt2Db-KbDmJXlECI_OY95cNMkuegc,218
 lfss/src/log.py,sha256=qNE04sHoZ2rMbQ5dR2zT7Xaz1KVAfYp5hKpWJX42S9g,5244
-lfss/src/server.py,sha256=6sXOXGPF3s1h38zNS6mP4N9qEXZ8biEAx-wSdpCNlwg,13010
-lfss/src/stat.py,sha256=Y28h-TNhQJzsAlCP4E7mnJmgISXGIECvCCRPq_73ZN0,2043
-lfss/src/utils.py,sha256=qCXFTIcfnVsdg6zvoEDhZniLTU-WiG23SILXzUG1XBw,1613
-lfss-0.3.2.dist-info/METADATA,sha256=qHYqmRzikIGgohOabShmfj1T9lQHa6iIPAF2BV2wSVo,1787
-lfss-0.3.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lfss-0.3.2.dist-info/entry_points.txt,sha256=nUIJhenyZbcymvPVhrzV7SAtRhd7O52DflbRrpQUC04,110
-lfss-0.3.2.dist-info/RECORD,,
+lfss/src/server.py,sha256=P4GpsIJ869fi6lzHk2IVMyJooGWIvqh0cykkDerJ74k,13190
+lfss/src/stat.py,sha256=_4OaSvBm7D6mPgifwxnhGIEk1_q3SxfJr3lizaEoV_w,2081
+lfss/src/utils.py,sha256=8VkrtpSmurbMiX7GyK-n7Grvzy3uwSJXHdONEsuLCDI,2272
+lfss-0.4.0.dist-info/METADATA,sha256=X0qXQ4gkl_sJ5VNEGLJ0XG0JSqmNnOPixHVn6ZQ7pj0,1787
+lfss-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+lfss-0.4.0.dist-info/entry_points.txt,sha256=nUIJhenyZbcymvPVhrzV7SAtRhd7O52DflbRrpQUC04,110
+lfss-0.4.0.dist-info/RECORD,,