Emil_Shanaty/open-webui-ai4me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek
2025-12-29 01:31:27 +04:00
parent 5d1459df16
commit 2453b75ff0
5 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/routers/channels.py
+12 -11
View File
@@ -382,14 +382,14 @@ async def get_channel_by_id(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
)
write_access = has_access(
user.id, type="write", access_control=channel.access_control, strict=False
user.id, type="write", access_control=channel.access_control, strict=False, db=db
)
user_count = len(get_users_with_access("read", channel.access_control))
@@ -762,7 +762,7 @@ async def get_channel_messages(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -830,7 +830,7 @@ async def get_pinned_channel_messages(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1228,7 +1228,7 @@ async def get_channel_message(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1282,7 +1282,7 @@ async def get_channel_message_data(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1336,7 +1336,7 @@ async def pin_channel_message(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1402,7 +1402,7 @@ async def get_channel_thread_messages(
)
else:
if user.role != "admin" and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1476,7 +1476,7 @@ async def update_message_by_id(
user.role != "admin"
and message.user_id != user.id
and not has_access(
user.id, type="read", access_control=channel.access_control
user.id, type="read", access_control=channel.access_control, db=db
)
):
raise HTTPException(
@@ -1543,7 +1543,7 @@ async def add_reaction_to_message(
)
else:
if user.role != "admin" and not has_access(
user.id, type="write", access_control=channel.access_control, strict=False
user.id, type="write", access_control=channel.access_control, strict=False, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1618,7 +1618,7 @@ async def remove_reaction_by_id_and_user_id_and_name(
)
else:
if user.role != "admin" and not has_access(
user.id, type="write", access_control=channel.access_control, strict=False
user.id, type="write", access_control=channel.access_control, strict=False, db=db
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.DEFAULT()
@@ -1713,6 +1713,7 @@ async def delete_message_by_id(
type="write",
access_control=channel.access_control,
strict=False,
db=db,
)
):
raise HTTPException(
backend/open_webui/routers/ollama.py
+2 -2
View File
@@ -421,14 +421,14 @@ async def get_all_models(request: Request, user: UserModel = None):
return models
async def get_filtered_models(models, user):
async def get_filtered_models(models, user, db=None):
# Filter models based on user access control
filtered_models = []
for model in models.get("models", []):
model_info = Models.get_model_by_id(model["model"])
if model_info:
if user.id == model_info.user_id or has_access(
user.id, type="read", access_control=model_info.access_control
user.id, type="read", access_control=model_info.access_control, db=db
):
filtered_models.append(model)
return filtered_models
backend/open_webui/routers/openai.py
+2 -2
View File
@@ -453,14 +453,14 @@ async def get_all_models_responses(request: Request, user: UserModel) -> list:
return responses
async def get_filtered_models(models, user):
async def get_filtered_models(models, user, db=None):
# Filter models based on user access control
filtered_models = []
for model in models.get("data", []):
model_info = Models.get_model_by_id(model["id"])
if model_info:
if user.id == model_info.user_id or has_access(
user.id, type="read", access_control=model_info.access_control
user.id, type="read", access_control=model_info.access_control, db=db
):
filtered_models.append(model)
return filtered_models