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/stream-destination-id.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@livekit/protocol": patch
---

`StreamDestination` (`id`, `url`) on `StreamOutput.destinations` and `UpdateStreamRequest.add_destinations`, echoed as `StreamInfo.id`, so a client can tell its streams apart; `RedactStreamKeys` redacts destination URLs
5 changes: 5 additions & 0 deletions egress/redact.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,9 @@ func RedactStreamKeys(stream *livekit.StreamOutput) {
stream.Urls[i] = redacted
}
}
for _, d := range stream.Destinations {
if redacted, ok := utils.RedactStreamKey(d.Url); ok {
d.Url = redacted
}
}
}
12 changes: 12 additions & 0 deletions egress/redact_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ func TestRedactStreamOutput(t *testing.T) {
"srt://foo.bar.com:9999",
"srt://foo.bar.com:9999?streamid=124939da-5244&passphrase=WnxknzJTUbwYl9SpdqAudX",
},
Destinations: []*livekit.StreamDestination{
{Id: "a", Url: "rtmps://foo.bar.com/app/secret_stream_key"},
{Id: "b", Url: "srt://foo.bar.com:9999?streamid=124939da-5244&passphrase=WnxknzJTUbwYl9SpdqAudX"},
{Id: "c", Url: "srt://foo.bar.com:9999"},
},
}

RedactStreamKeys(so)
Expand All @@ -120,6 +125,13 @@ func TestRedactStreamOutput(t *testing.T) {
require.Equal(t, "twitch://{liv...nop}", so.Urls[2])
require.Equal(t, "srt://foo.bar.com:9999", so.Urls[3])
require.Equal(t, "srt://foo.bar.com:9999?streamid={...}&passphrase={...}", so.Urls[4])

require.Equal(t, "rtmps://foo.bar.com/app/{sec...key}", so.Destinations[0].Url)
require.Equal(t, "srt://foo.bar.com:9999?streamid={...}&passphrase={...}", so.Destinations[1].Url)
require.Equal(t, "srt://foo.bar.com:9999", so.Destinations[2].Url)
require.Equal(t, "a", so.Destinations[0].Id)
require.Equal(t, "b", so.Destinations[1].Id)
require.Equal(t, "c", so.Destinations[2].Id)
}

func TestRedactEncodedOutputs(t *testing.T) {
Expand Down
Loading
Loading