Skip to content

Fall back to query-value redaction for non-rtmp stream urls #1714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milos-lk merged 1 commit into from
Aug 14, 2026
Merged

Fall back to query-value redaction for non-rtmp stream urls #1714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion egress/redact_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ func TestRedactStreamOutput(t *testing.T) {
"mux://8e0b1b9c-50a2-d893-ec0a-102056d112ae",
"twitch://live_12345678_abcdefghijklmnop",
"srt://foo.bar.com:9999",
"srt://foo.bar.com:9999?streamid=124939da-5244&passphrase=WnxknzJTUbwYl9SpdqAudX",
},
}

Expand All @@ -118,6 +119,7 @@ func TestRedactStreamOutput(t *testing.T) {
require.Equal(t, "mux://{8e0...2ae}", so.Urls[1])
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])
}

func TestRedactEncodedOutputs(t *testing.T) {
Expand Down Expand Up @@ -183,6 +185,6 @@ func TestRedactDirectOutput(t *testing.T) {

RedactDirectOutputs(websocket)
require.Equal(t,
"wss://foo.bar.com/audio?callId={1...5}&token={7df...2b9}",
"wss://foo.bar.com/audio?callId={...}&token={...}",
websocket.Output.(*livekit.TrackEgressRequest_WebsocketUrl).WebsocketUrl)
}
7 changes: 5 additions & 2 deletions utils/redact.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,17 @@ func RedactStreamKey(url string) (string, bool) {

match := rtmpRegexp.FindStringSubmatch(url)
if len(match) != 6 {
if redacted := RedactUrlQueryValues(url); redacted != url {
return redacted, true
}
return url, false
}

match[4] = RedactIdentifier(match[4])
return strings.Join(match[1:], ""), true
}

// RedactUrlQueryValues redacts every query parameter value in rawUrl, keeping parameter names intact.
// RedactUrlQueryValues fully redacts every query parameter value in rawUrl, keeping parameter names intact.
func RedactUrlQueryValues(rawUrl string) string {
base, query, found := strings.Cut(rawUrl, "?")
if !found || query == "" {
Expand All @@ -50,7 +53,7 @@ func RedactUrlQueryValues(rawUrl string) string {
params := strings.Split(query, "&")
for i, p := range params {
if k, v, ok := strings.Cut(p, "="); ok && v != "" {
params[i] = k + "=" + RedactIdentifier(v)
params[i] = k + "={...}"
}
}
return base + "?" + strings.Join(params, "&")
Expand Down
Loading