diff --git a/README_CN.md b/README_CN.md index 3c37f64ea..f2433b248 100644 --- a/README_CN.md +++ b/README_CN.md @@ -4,14 +4,14 @@ # Frigate NVR™ - 一个具有实时目标检测的本地 NVR -[English](https://github.com/blakeblackshear/frigate) | \[简体中文\] - -[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) - 翻译状态 +[English](https://github.com/blakeblackshear/frigate) | \[简体中文\] + +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) + 一个完整的本地网络视频录像机（NVR），专为[Home Assistant](https://www.home-assistant.io)设计，具备 AI 目标/物体检测功能。使用 OpenCV 和 TensorFlow 在本地为 IP 摄像头执行实时物体检测。 强烈推荐使用 GPU 或者 AI 加速器（例如[Google Coral 加速器](https://coral.ai/products/) 或者 [Hailo](https://hailo.ai/)等）。它们的运行效率远远高于现在的顶级 CPU，并且功耗也极低。 @@ -38,6 +38,7 @@ ## 协议 本项目采用 **MIT 许可证**授权。 + **代码部分**：本代码库中的源代码、配置文件和文档均遵循 [MIT 许可证](LICENSE)。您可以自由使用、修改和分发这些代码，但必须保留原始版权声明。 **商标部分**：“Frigate”名称、“Frigate NVR”品牌以及 Frigate 的 Logo 为 **Frigate LLC 的商标**，**不在** MIT 许可证覆盖范围内。 diff --git a/frigate/api/auth.py b/frigate/api/auth.py index d3b50067c..c6b0cef23 100644 --- a/frigate/api/auth.py +++ b/frigate/api/auth.py @@ -143,17 +143,6 @@ def require_admin_by_default(): return admin_checker -def _is_authenticated(request: Request) -> bool: - """ - Helper to determine if a request is from an authenticated user. - - Returns True if the request has a valid authenticated user (not anonymous). - Port 5000 internal requests are considered anonymous despite having admin role. - """ - username = request.headers.get("remote-user") - return username is not None and username != "anonymous" - - def allow_public(): """ Override dependency to allow unauthenticated access to an endpoint. @@ -173,27 +162,24 @@ def allow_public(): def allow_any_authenticated(): """ - Override dependency to allow any authenticated user (bypass admin requirement). + Override dependency to allow any request that passed through the /auth endpoint. Allows: - - Port 5000 internal requests (have admin role despite anonymous user) - - Any authenticated user with a real username (not "anonymous") + - Port 5000 internal requests (remote-user: "anonymous", remote-role: "admin") + - Authenticated users with JWT tokens (remote-user: username) + - Unauthenticated requests when auth is disabled (remote-user: "anonymous") Rejects: - - Port 8971 requests with anonymous user (auth disabled, no proxy auth) + - Requests with no remote-user header (did not pass through /auth endpoint) Example: @router.get("/authenticated-endpoint", dependencies=[Depends(allow_any_authenticated())]) """ async def auth_checker(request: Request): - # Port 5000 requests have admin role and should be allowed - role = request.headers.get("remote-role") - if role == "admin": - return - - # Otherwise require a real authenticated user (not anonymous) - if not _is_authenticated(request): + # Ensure a remote-user has been set by the /auth endpoint + username = request.headers.get("remote-user") + if username is None: raise HTTPException(status_code=401, detail="Authentication required") return diff --git a/web/public/locales/en/views/classificationModel.json b/web/public/locales/en/views/classificationModel.json index 714540f1a..96bf0284b 100644 --- a/web/public/locales/en/views/classificationModel.json +++ b/web/public/locales/en/views/classificationModel.json @@ -1,7 +1,9 @@ { "documentTitle": "Classification Models - Frigate", "details": { - "scoreInfo": "Score represents the average classification confidence across all detections of this object." + "scoreInfo": "Score represents the average classification confidence across all detections of this object.", + "none": "None", + "unknown": "Unknown" }, "button": { "deleteClassificationAttempts": "Delete Classification Images", @@ -83,7 +85,6 @@ "aria": "Select Recent Classifications" }, "categories": "Classes", - "none": "None", "createCategory": { "new": "Create New Class" }, diff --git a/web/src/components/card/ClassificationCard.tsx b/web/src/components/card/ClassificationCard.tsx index a006b1b13..be348db05 100644 --- a/web/src/components/card/ClassificationCard.tsx +++ b/web/src/components/card/ClassificationCard.tsx @@ -161,7 +161,11 @@ export const ClassificationCard = forwardRef< )} >
- {data.name == "unknown" ? t("details.unknown") : data.name} + {data.name == "unknown" + ? t("details.unknown") + : data.name == "none" + ? t("details.none") + : data.name}
{data.score != undefined && (
onCategorizeImage(category)} > {category === "none" - ? t("none") + ? t("details.none") : category.replaceAll("_", " ")} ))} diff --git a/web/src/components/overlay/dialog/TrainFilterDialog.tsx b/web/src/components/overlay/dialog/TrainFilterDialog.tsx index 46d802a19..b44b766fb 100644 --- a/web/src/components/overlay/dialog/TrainFilterDialog.tsx +++ b/web/src/components/overlay/dialog/TrainFilterDialog.tsx @@ -170,7 +170,9 @@ export function ClassFilterContent({ { diff --git a/web/src/views/classification/ModelTrainingView.tsx b/web/src/views/classification/ModelTrainingView.tsx index ea9facd08..f3b555af2 100644 --- a/web/src/views/classification/ModelTrainingView.tsx +++ b/web/src/views/classification/ModelTrainingView.tsx @@ -707,7 +707,7 @@ function LibrarySelector({ className="flex-grow cursor-pointer capitalize" onClick={() => setPageToggle(id)} > - {id === "none" ? t("none") : id.replaceAll("_", " ")} + {id === "none" ? t("details.none") : id.replaceAll("_", " ")} ({dataset?.[id].length})