This commit is contained in:
Timothy Jaeryang Baek committed 2026-04-19 22:37:10 +09:00
1 parent 42694c7c0c
commit 5afc258c5b
6 files changed
+48 -19

No files matched your search

+5
View File
@@ -1524,6 +1524,10 @@ USER_PERMISSIONS_FEATURES_AUTOMATIONS = (
os.environ.get('USER_PERMISSIONS_FEATURES_AUTOMATIONS', 'False').lower() == 'true' os.environ.get('USER_PERMISSIONS_FEATURES_AUTOMATIONS', 'False').lower() == 'true'
) )
USER_PERMISSIONS_FEATURES_CALENDAR = (
os.environ.get('USER_PERMISSIONS_FEATURES_CALENDAR', 'True').lower() == 'true'
)
USER_PERMISSIONS_SETTINGS_INTERFACE = os.environ.get('USER_PERMISSIONS_SETTINGS_INTERFACE', 'True').lower() == 'true' USER_PERMISSIONS_SETTINGS_INTERFACE = os.environ.get('USER_PERMISSIONS_SETTINGS_INTERFACE', 'True').lower() == 'true'
@@ -1594,6 +1598,7 @@ DEFAULT_USER_PERMISSIONS = {
'code_interpreter': USER_PERMISSIONS_FEATURES_CODE_INTERPRETER, 'code_interpreter': USER_PERMISSIONS_FEATURES_CODE_INTERPRETER,
'memories': USER_PERMISSIONS_FEATURES_MEMORIES, 'memories': USER_PERMISSIONS_FEATURES_MEMORIES,
'automations': USER_PERMISSIONS_FEATURES_AUTOMATIONS, 'automations': USER_PERMISSIONS_FEATURES_AUTOMATIONS,
'calendar': USER_PERMISSIONS_FEATURES_CALENDAR,
}, },
'settings': { 'settings': {
'interface': USER_PERMISSIONS_SETTINGS_INTERFACE, 'interface': USER_PERMISSIONS_SETTINGS_INTERFACE,
+26 -19
View File
@@ -2,8 +2,7 @@ import logging
import time import time
from typing import Optional from typing import Optional
from fastapi import APIRouter, Depends, HTTPException, Request from fastapi import APIRouter, Depends, HTTPException, Request, status
from pydantic import BaseModel
from open_webui.models.calendar import ( from open_webui.models.calendar import (
Calendars, Calendars,
@@ -23,6 +22,7 @@ from open_webui.models.access_grants import AccessGrants
from open_webui.models.groups import Groups from open_webui.models.groups import Groups
from open_webui.models.users import UserModel from open_webui.models.users import UserModel
from open_webui.utils.auth import get_verified_user from open_webui.utils.auth import get_verified_user
from open_webui.utils.access_control import has_permission
from open_webui.utils.calendar import expand_recurring_event from open_webui.utils.calendar import expand_recurring_event
from open_webui.constants import ERROR_MESSAGES from open_webui.constants import ERROR_MESSAGES
@@ -31,12 +31,19 @@ log = logging.getLogger(__name__)
router = APIRouter() router = APIRouter()
async def check_calendar_enabled(request: Request): async def check_calendar_permission(request: Request, user):
"""Dependency to ensure calendar feature is globally enabled.""" """Check global feature flag AND per-user permission for calendar access."""
if not request.app.state.config.ENABLE_CALENDAR: if not request.app.state.config.ENABLE_CALENDAR:
raise HTTPException( raise HTTPException(
status_code=403, status_code=status.HTTP_403_FORBIDDEN,
detail=ERROR_MESSAGES.FEATURE_DISABLED('Calendar'), detail=ERROR_MESSAGES.UNAUTHORIZED,
)
if user.role != 'admin' and not await has_permission(
user.id, 'features.calendar', request.app.state.config.USER_PERMISSIONS
):
raise HTTPException(
status_code=status.HTTP_403_FORBIDDEN,
detail=ERROR_MESSAGES.UNAUTHORIZED,
) )
@@ -70,14 +77,14 @@ async def _check_calendar_access(
@router.get('/', response_model=list[CalendarModel]) @router.get('/', response_model=list[CalendarModel])
async def get_calendars(request: Request, user: UserModel = Depends(get_verified_user)): async def get_calendars(request: Request, user: UserModel = Depends(get_verified_user)):
"""List user's calendars (owned + shared). Auto-creates defaults on first call.""" """List user's calendars (owned + shared). Auto-creates defaults on first call."""
await check_calendar_enabled(request) await check_calendar_permission(request, user)
return await Calendars.get_calendars_by_user(user.id) return await Calendars.get_calendars_by_user(user.id)
@router.post('/create', response_model=CalendarModel) @router.post('/create', response_model=CalendarModel)
async def create_calendar(request: Request, form_data: CalendarForm, user: UserModel = Depends(get_verified_user)): async def create_calendar(request: Request, form_data: CalendarForm, user: UserModel = Depends(get_verified_user)):
"""Create a new user calendar.""" """Create a new user calendar."""
await check_calendar_enabled(request) await check_calendar_permission(request, user)
return await Calendars.insert_new_calendar(user.id, form_data) return await Calendars.insert_new_calendar(user.id, form_data)
@@ -105,7 +112,7 @@ async def get_events(
- Stored events from the database - Stored events from the database
- Virtual events computed from active automation RRULEs (Scheduled Tasks calendar) - Virtual events computed from active automation RRULEs (Scheduled Tasks calendar)
""" """
await check_calendar_enabled(request) await check_calendar_permission(request, user)
from datetime import datetime from datetime import datetime
try: try:
@@ -218,7 +225,7 @@ async def get_events(
@router.post('/events/create', response_model=CalendarEventModel) @router.post('/events/create', response_model=CalendarEventModel)
async def create_event(request: Request, form_data: CalendarEventForm, user: UserModel = Depends(get_verified_user)): async def create_event(request: Request, form_data: CalendarEventForm, user: UserModel = Depends(get_verified_user)):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
await _check_calendar_access(form_data.calendar_id, user, 'write') await _check_calendar_access(form_data.calendar_id, user, 'write')
return await CalendarEvents.insert_new_event(user.id, form_data) return await CalendarEvents.insert_new_event(user.id, form_data)
@@ -231,7 +238,7 @@ async def search_events(
limit: int = 30, limit: int = 30,
user: UserModel = Depends(get_verified_user), user: UserModel = Depends(get_verified_user),
): ):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
return await CalendarEvents.search_events( return await CalendarEvents.search_events(
user_id=user.id, query=query, skip=skip, limit=limit user_id=user.id, query=query, skip=skip, limit=limit
) )
@@ -239,7 +246,7 @@ async def search_events(
@router.get('/events/{event_id}', response_model=CalendarEventModel) @router.get('/events/{event_id}', response_model=CalendarEventModel)
async def get_event(request: Request, event_id: str, user: UserModel = Depends(get_verified_user)): async def get_event(request: Request, event_id: str, user: UserModel = Depends(get_verified_user)):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
event = await CalendarEvents.get_event_by_id(event_id) event = await CalendarEvents.get_event_by_id(event_id)
if not event: if not event:
raise HTTPException(status_code=404, detail='Event not found') raise HTTPException(status_code=404, detail='Event not found')
@@ -253,7 +260,7 @@ async def get_event(request: Request, event_id: str, user: UserModel = Depends(g
async def update_event( async def update_event(
request: Request, event_id: str, form_data: CalendarEventUpdateForm, user: UserModel = Depends(get_verified_user) request: Request, event_id: str, form_data: CalendarEventUpdateForm, user: UserModel = Depends(get_verified_user)
): ):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
event = await CalendarEvents.get_event_by_id(event_id) event = await CalendarEvents.get_event_by_id(event_id)
if not event: if not event:
raise HTTPException(status_code=404, detail='Event not found') raise HTTPException(status_code=404, detail='Event not found')
@@ -268,7 +275,7 @@ async def update_event(
@router.delete('/events/{event_id}/delete') @router.delete('/events/{event_id}/delete')
async def delete_event(request: Request, event_id: str, user: UserModel = Depends(get_verified_user)): async def delete_event(request: Request, event_id: str, user: UserModel = Depends(get_verified_user)):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
event = await CalendarEvents.get_event_by_id(event_id) event = await CalendarEvents.get_event_by_id(event_id)
if not event: if not event:
raise HTTPException(status_code=404, detail='Event not found') raise HTTPException(status_code=404, detail='Event not found')
@@ -286,7 +293,7 @@ async def rsvp_event(
request: Request, event_id: str, form_data: RSVPForm, user: UserModel = Depends(get_verified_user) request: Request, event_id: str, form_data: RSVPForm, user: UserModel = Depends(get_verified_user)
): ):
"""Update own RSVP status for an event.""" """Update own RSVP status for an event."""
await check_calendar_enabled(request) await check_calendar_permission(request, user)
if form_data.status not in ('accepted', 'declined', 'tentative', 'pending'): if form_data.status not in ('accepted', 'declined', 'tentative', 'pending'):
raise HTTPException(status_code=400, detail='Invalid status') raise HTTPException(status_code=400, detail='Invalid status')
@@ -303,7 +310,7 @@ async def rsvp_event(
@router.get('/{calendar_id}', response_model=CalendarModel) @router.get('/{calendar_id}', response_model=CalendarModel)
async def get_calendar_by_id(request: Request, calendar_id: str, user: UserModel = Depends(get_verified_user)): async def get_calendar_by_id(request: Request, calendar_id: str, user: UserModel = Depends(get_verified_user)):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
cal = await _check_calendar_access(calendar_id, user, 'read') cal = await _check_calendar_access(calendar_id, user, 'read')
return cal return cal
@@ -312,7 +319,7 @@ async def get_calendar_by_id(request: Request, calendar_id: str, user: UserModel
async def update_calendar( async def update_calendar(
request: Request, calendar_id: str, form_data: CalendarUpdateForm, user: UserModel = Depends(get_verified_user) request: Request, calendar_id: str, form_data: CalendarUpdateForm, user: UserModel = Depends(get_verified_user)
): ):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
cal = await _check_calendar_access(calendar_id, user, 'write') cal = await _check_calendar_access(calendar_id, user, 'write')
# Only owner/admin can change access grants # Only owner/admin can change access grants
@@ -327,7 +334,7 @@ async def update_calendar(
@router.delete('/{calendar_id}/delete') @router.delete('/{calendar_id}/delete')
async def delete_calendar(request: Request, calendar_id: str, user: UserModel = Depends(get_verified_user)): async def delete_calendar(request: Request, calendar_id: str, user: UserModel = Depends(get_verified_user)):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
cal = await _check_calendar_access(calendar_id, user, 'write') cal = await _check_calendar_access(calendar_id, user, 'write')
# Only owner/admin can delete # Only owner/admin can delete
@@ -343,7 +350,7 @@ async def delete_calendar(request: Request, calendar_id: str, user: UserModel =
@router.post('/{calendar_id}/default') @router.post('/{calendar_id}/default')
async def set_default_calendar(request: Request, calendar_id: str, user: UserModel = Depends(get_verified_user)): async def set_default_calendar(request: Request, calendar_id: str, user: UserModel = Depends(get_verified_user)):
await check_calendar_enabled(request) await check_calendar_permission(request, user)
cal = await Calendars.set_default_calendar(user.id, calendar_id) cal = await Calendars.set_default_calendar(user.id, calendar_id)
if not cal: if not cal:
raise HTTPException(status_code=404, detail='Calendar not found') raise HTTPException(status_code=404, detail='Calendar not found')
+1
View File
@@ -564,6 +564,7 @@ async def get_builtin_tools(
if ( if (
is_builtin_tool_enabled('calendar') is_builtin_tool_enabled('calendar')
and getattr(request.app.state.config, 'ENABLE_CALENDAR', False) and getattr(request.app.state.config, 'ENABLE_CALENDAR', False)
and await has_user_permission('calendar')
): ):
builtin_functions.extend( builtin_functions.extend(
[search_calendar_events, create_calendar_event, update_calendar_event, delete_calendar_event] [search_calendar_events, create_calendar_event, update_calendar_event, delete_calendar_event]
@@ -916,6 +916,22 @@
</div> </div>
{/if} {/if}
</div> </div>
<div class="flex flex-col w-full">
<div class="flex w-full justify-between my-1">
<div class=" self-center text-xs font-medium">
{$i18n.t('Calendar')}
</div>
<Switch bind:state={permissions.features.calendar} />
</div>
{#if defaultPermissions?.features?.calendar && !permissions.features.calendar}
<div>
<div class="text-xs text-gray-500">
{$i18n.t('This is a default user permission and will remain enabled.')}
</div>
</div>
{/if}
</div>
</div> </div>
<hr class=" border-gray-100/30 dark:border-gray-850/30" /> <hr class=" border-gray-100/30 dark:border-gray-850/30" />
Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 21 KiB