Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/smart-countries-deny.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"livekit-client": patch
---

Reject publishing with insufficient permissions present
10 changes: 10 additions & 0 deletions src/room/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@ export class PublishDataError extends LivekitError {
}
}

export class PublishTrackError extends LivekitError {
status: number;

constructor(message: string, status: number) {
super(15, message);
this.name = 'PublishTrackError';
this.status = status;
}
}

export type RequestErrorReason =
| Exclude<RequestResponse_Reason, RequestResponse_Reason.OK>
| 'TimeoutError';
Expand Down
24 changes: 24 additions & 0 deletions src/room/participant/LocalParticipant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import { defaultVideoCodec } from '../defaults';
import {
DeviceUnsupportedError,
LivekitError,
PublishTrackError,
SignalRequestError,
TrackInvalidError,
UnexpectedConnectionState,
Expand Down Expand Up @@ -64,6 +65,7 @@ import {
constraintsForOptions,
extractProcessorsFromOptions,
getLogContextFromTrack,
getTrackSourceFromProto,
mergeDefaultOptions,
mimeTypeToVideoCodecString,
screenCaptureToDisplayMediaStreamOptions,
Expand Down Expand Up @@ -871,7 +873,29 @@ export default class LocalParticipant extends Participant {
}
}

private hasPermissionsToPublish(track: LocalTrack): boolean {
if (!this.permissions) {
return false;
}
const { canPublish, canPublishSources } = this.permissions;
if (
!canPublish ||
(canPublishSources &&
!canPublishSources.map((source) => getTrackSourceFromProto(source)).includes(track.source))
) {
this.log.error('insufficient permissions to publish', {
...this.logContext,
...getLogContextFromTrack(track),
});
return false;
}
return true;
}

private async publish(track: LocalTrack, opts: TrackPublishOptions, isStereo: boolean) {
if (!this.hasPermissionsToPublish(track)) {
throw new PublishTrackError('failed to publish track, insufficient permissions', 403);
}
const existingTrackOfSource = Array.from(this.trackPublications.values()).find(
(publishedTrack) => isLocalTrack(track) && publishedTrack.source === track.source,
);
Expand Down
17 changes: 16 additions & 1 deletion src/room/track/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TrackPublishedResponse } from '@livekit/protocol';
import { TrackPublishedResponse, TrackSource } from '@livekit/protocol';
import type { AudioProcessorOptions, TrackProcessor, VideoProcessorOptions } from '../..';
import { cloneDeep } from '../../utils/cloneDeep';
import { isSafari, sleep } from '../utils';
Expand Down Expand Up @@ -294,3 +294,18 @@ export function extractProcessorsFromOptions(options: CreateLocalTracksOptions)

return { audioProcessor, videoProcessor, optionsWithoutProcessor: newOptions };
}

export function getTrackSourceFromProto(source: TrackSource): Track.Source {
switch (source) {
case TrackSource.CAMERA:
return Track.Source.Camera;
case TrackSource.MICROPHONE:
return Track.Source.Microphone;
case TrackSource.SCREEN_SHARE:
return Track.Source.ScreenShare;
case TrackSource.SCREEN_SHARE_AUDIO:
return Track.Source.ScreenShareAudio;
default:
return Track.Source.Unknown;
}
}
Loading