mirror of
https://github.com/livekit/livekit.git
synced 2026-07-10 12:12:57 +00:00
b882ccc86d
* service: enforce metadata size limit in CreateRoom, bump default to 512 KiB CreateRoom previously accepted any metadata size; only UpdateRoomMetadata rejected oversized payloads. Mirror the same CheckMetadataSize check at the CreateRoom API boundary so both entrypoints are bounded. Default MaxMetadataSize moves from 64000 to 512 * 1024 to match the practical needs of customers using room metadata for richer state. The limit remains configurable via the existing limits.max_metadata_size knob. * service: split room vs. participant metadata limit, enforce on join + agent dispatch LimitConfig.MaxMetadataSize was shared between room metadata and participant metadata. Last commit's bump to 512 KiB lifted both ceilings; this restores the participant ceiling to 64 KB and introduces a separate MaxRoomMetadataSize (default 512 KiB) for room metadata. Additional enforcement: - RoomManager.StartSession rejects joins whose JWT-grants metadata or attributes exceed the participant/attributes limits. The check was missing entirely from this path. - AgentDispatchService.CreateDispatch and the embedded CreateRoomRequest.Agents path now validate metadata and attributes against the common 64 KB ceilings (previously unbounded). NewAgentDispatchService gains a LimitConfig parameter; the two wire_gen callsites are updated. * service: collapse metadata size limit to single 512 KiB knob Reverts the LimitConfig split introduced in the previous commit: MaxRoomMetadataSize, CheckRoomMetadataSize, and the max_room_metadata_size yaml key are removed. MaxMetadataSize moves back to 512 * 1024 and gates all metadata uniformly — room (CreateRoom, UpdateRoomMetadata), participant (UpdateParticipant, signal UpdateMetadata, JWT grants on join), and agent dispatch (CreateDispatch + embedded RoomAgentDispatch). MaxAttributesSize stays at 64 KB and continues to gate participant and agent-dispatch attributes separately. Test cases consolidated under the single knob. * kb -> kib
132 lines
4.3 KiB
Go
132 lines
4.3 KiB
Go
// Copyright 2023 LiveKit, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package service
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/livekit/livekit-server/pkg/config"
|
|
"github.com/livekit/livekit-server/pkg/routing"
|
|
"github.com/livekit/protocol/agent"
|
|
"github.com/livekit/protocol/livekit"
|
|
"github.com/livekit/protocol/logger"
|
|
"github.com/livekit/protocol/rpc"
|
|
"github.com/livekit/protocol/utils"
|
|
"github.com/livekit/protocol/utils/guid"
|
|
"github.com/livekit/psrpc"
|
|
)
|
|
|
|
type AgentDispatchService struct {
|
|
limitConf config.LimitConfig
|
|
agentDispatchClient rpc.TypedAgentDispatchInternalClient
|
|
topicFormatter rpc.TopicFormatter
|
|
roomAllocator RoomAllocator
|
|
router routing.MessageRouter
|
|
}
|
|
|
|
func NewAgentDispatchService(
|
|
limitConf config.LimitConfig,
|
|
agentDispatchClient rpc.TypedAgentDispatchInternalClient,
|
|
topicFormatter rpc.TopicFormatter,
|
|
roomAllocator RoomAllocator,
|
|
router routing.MessageRouter,
|
|
) *AgentDispatchService {
|
|
return &AgentDispatchService{
|
|
limitConf: limitConf,
|
|
agentDispatchClient: agentDispatchClient,
|
|
topicFormatter: topicFormatter,
|
|
roomAllocator: roomAllocator,
|
|
router: router,
|
|
}
|
|
}
|
|
|
|
func (ag *AgentDispatchService) CreateDispatch(ctx context.Context, req *livekit.CreateAgentDispatchRequest) (*livekit.AgentDispatch, error) {
|
|
AppendLogFields(ctx, "room", req.Room, "request", logger.Proto(redactCreateAgentDispatchRequest(req)))
|
|
err := EnsureAdminPermission(ctx, livekit.RoomName(req.Room))
|
|
if err != nil {
|
|
return nil, twirpAuthError(err)
|
|
}
|
|
|
|
if err := agent.ValidateDeployment(req.GetDeployment()); err != nil {
|
|
return nil, psrpc.NewError(psrpc.InvalidArgument, err)
|
|
}
|
|
|
|
if !ag.limitConf.CheckMetadataSize(req.Metadata) {
|
|
return nil, ErrMetadataExceedsLimits
|
|
}
|
|
if !ag.limitConf.CheckAttributesSize(req.Attributes) {
|
|
return nil, ErrAttributeExceedsLimits
|
|
}
|
|
|
|
if ag.roomAllocator.AutoCreateEnabled(ctx) {
|
|
err := ag.roomAllocator.SelectRoomNode(ctx, livekit.RoomName(req.Room), "")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
_, err = ag.router.CreateRoom(ctx, &livekit.CreateRoomRequest{Name: req.Room})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
dispatch := &livekit.AgentDispatch{
|
|
Id: guid.New(guid.AgentDispatchPrefix),
|
|
AgentName: req.AgentName,
|
|
Room: req.Room,
|
|
Metadata: req.Metadata,
|
|
RestartPolicy: req.RestartPolicy,
|
|
Deployment: req.Deployment,
|
|
Attributes: req.Attributes,
|
|
}
|
|
return ag.agentDispatchClient.CreateDispatch(ctx, ag.topicFormatter.RoomTopic(ctx, livekit.RoomName(req.Room)), dispatch)
|
|
}
|
|
|
|
func (ag *AgentDispatchService) DeleteDispatch(ctx context.Context, req *livekit.DeleteAgentDispatchRequest) (*livekit.AgentDispatch, error) {
|
|
AppendLogFields(ctx, "room", req.Room, "request", logger.Proto(req))
|
|
err := EnsureAdminPermission(ctx, livekit.RoomName(req.Room))
|
|
if err != nil {
|
|
return nil, twirpAuthError(err)
|
|
}
|
|
|
|
return ag.agentDispatchClient.DeleteDispatch(ctx, ag.topicFormatter.RoomTopic(ctx, livekit.RoomName(req.Room)), req)
|
|
}
|
|
|
|
func (ag *AgentDispatchService) ListDispatch(ctx context.Context, req *livekit.ListAgentDispatchRequest) (*livekit.ListAgentDispatchResponse, error) {
|
|
AppendLogFields(ctx, "room", req.Room, "request", logger.Proto(req))
|
|
err := EnsureAdminPermission(ctx, livekit.RoomName(req.Room))
|
|
if err != nil {
|
|
return nil, twirpAuthError(err)
|
|
}
|
|
|
|
return ag.agentDispatchClient.ListDispatch(ctx, ag.topicFormatter.RoomTopic(ctx, livekit.RoomName(req.Room)), req)
|
|
}
|
|
|
|
func redactCreateAgentDispatchRequest(req *livekit.CreateAgentDispatchRequest) *livekit.CreateAgentDispatchRequest {
|
|
if req.Metadata == "" {
|
|
return req
|
|
}
|
|
|
|
clone := utils.CloneProto(req)
|
|
|
|
// replace with size of metadata to provide visibility on request size
|
|
if clone.Metadata != "" {
|
|
clone.Metadata = fmt.Sprintf("__size: %d", len(clone.Metadata))
|
|
}
|
|
|
|
return clone
|
|
}
|