mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-08-04 13:47:37 +02:00
Small tweaks (#17168)
* Clean up repeated code in auth * Ensure review status is migrated for anonymous users
This commit is contained in:
parent
19342c8768
commit
d87268acfe
@ -253,12 +253,12 @@ def auth(request: Request):
|
|||||||
# pass the user header value from the upstream proxy if a mapping is specified
|
# pass the user header value from the upstream proxy if a mapping is specified
|
||||||
# or use anonymous if none are specified
|
# or use anonymous if none are specified
|
||||||
user_header = proxy_config.header_map.user
|
user_header = proxy_config.header_map.user
|
||||||
role_header = proxy_config.header_map.role
|
|
||||||
success_response.headers["remote-user"] = (
|
success_response.headers["remote-user"] = (
|
||||||
request.headers.get(user_header, default="anonymous")
|
request.headers.get(user_header, default="anonymous")
|
||||||
if user_header
|
if user_header
|
||||||
else "anonymous"
|
else "anonymous"
|
||||||
)
|
)
|
||||||
|
|
||||||
role_header = proxy_config.header_map.role
|
role_header = proxy_config.header_map.role
|
||||||
role = (
|
role = (
|
||||||
request.headers.get(role_header, default="viewer")
|
request.headers.get(role_header, default="viewer")
|
||||||
|
@ -62,11 +62,13 @@ def migrate(migrator, database, fake=False, **kwargs):
|
|||||||
'SELECT "id" FROM "reviewsegment" WHERE "has_been_reviewed" = 1'
|
'SELECT "id" FROM "reviewsegment" WHERE "has_been_reviewed" = 1'
|
||||||
)
|
)
|
||||||
reviewed_segment_ids = [row[0] for row in cursor.fetchall()]
|
reviewed_segment_ids = [row[0] for row in cursor.fetchall()]
|
||||||
|
# also migrate for anonymous (unauthenticated users)
|
||||||
|
usernames = [user.username for user in all_users] + ["anonymous"]
|
||||||
|
|
||||||
for segment_id in reviewed_segment_ids:
|
for segment_id in reviewed_segment_ids:
|
||||||
for user in all_users:
|
for username in usernames:
|
||||||
UserReviewStatus.create(
|
UserReviewStatus.create(
|
||||||
user_id=user.username,
|
user_id=username,
|
||||||
review_segment=segment_id,
|
review_segment=segment_id,
|
||||||
has_been_reviewed=True,
|
has_been_reviewed=True,
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user