fix: 修复 check_sign 导致进入死循环

Author: tianxiu2b2t

core/cluster.py

@@ -1132,6 +1132,20 @@ async def _(request: aweb.Request):
                 return aweb.FileResponse(
                     Path(storage.get_path(MEASURES_HASH[size]))
                 )
+            elif isinstance(storage, storages.WebDavStorage):
+                file = await storage.get_file(MEASURES_HASH[size])
+                if file.url:
+                    return aweb.HTTPFound(file.url)
+                elif file.size >= 0:
+                    return aweb.Response(
+                        status=200,
+                        headers={
+                            "Content-Length": str(file.size),
+                            "Content-Type": "application/octet-stream",
+                        },
+                        body=file.data
+                    )
+
         if config.const.measure_storage:
             logger.twarning("cluster.warning.measure_storage")
         response = aweb.StreamResponse(
@@ -1153,6 +1167,7 @@ async def _(request: aweb.Request):
             f"https://speedtest1.online.sh.cn:8080/download?size={size * 1024 * 1024}&r=0.7129844570865569"
         )"""
     except:
+        logger.traceback()
         return aweb.Response(status=400)
 
 @routes.get("/download/{hash}")

core/config.py

@@ -134,39 +134,39 @@ def ssl_key(self):
 
     @property
     def check_sign(self):
-        return Config.get("advanced.check_sign", True)
+        return Config.get("advanced.check_sign") or True
 
     @property
     def check_type(self):
-        return Config.get("advanced.check_type", "size")
+        return Config.get("advanced.check_type") or "size"
 
     @property
     def sync_interval(self):
-        return max(Config.get("advanced.sync_interval", 600), 600)
+        return max(Config.get("advanced.sync_interval", 600) or 600, 600)
 
     @property
     def xff(self):
-        return Config.get("web.x_forwarded_for", 0)
+        return Config.get("web.x_forwarded_for") or 0
 
     @property
     def auto_sync_assets(self):
-        return Config.get("advanced.auto_sync_assets", True)
+        return Config.get("advanced.auto_sync_assets") or True
 
     @property
     def github_token(self):
-        return Config.get("advanced.github_token", None) or None
+        return Config.get("advanced.github_token") or None
 
     @property
     def measure_storage(self) -> bool:
-        return Config.get("advanced.measure_storage", False)
+        return Config.get("advanced.measure_storage") or False
 
     @property
     def rank_clusters_url(self):
         return Config.get("advanced.dashboard_rank_clusters_url") or "https://bd.bangbang93.com/openbmclapi/metric/rank"
 
 const = Const()
 
-VERSION = "3.2.6"
+VERSION = "3.2.7"
 API_VERSION = "1.13.1"
 USER_AGENT = f"openbmclapi/{API_VERSION} python-openbmclapi/{VERSION}"
 PYTHON_VERSION = ".".join(map(str, (sys.version_info.major, sys.version_info.minor, sys.version_info.micro)))

core/utils.py

@@ -184,7 +184,7 @@ def to_days(self):
 
 
 def check_sign(hash: str, secret: str, s: str, e: str) -> bool:
-    return check_sign(hash, secret, s, e) and time.time() - 300 < int(e, 36)
+    return check_sign_without_time(hash, secret, s, e) and time.time() - 300 < int(e, 36)
 
 def check_sign_without_time(hash: str, secret: str, s: str, e: str):
     if not s or not e: