R3944Realms/srs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge df7a5addb8 into 8df9410880

Browse Source
This commit is contained in:
sevico 2026-05-21 11:31:43 +08:00 committed by GitHub
commit 1d1206503e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/utils/utils.go
View File

@ -69,11 +69,12 @@ func ApiCORS(ctx context.Context, w http.ResponseWriter, r *http.Request) bool {
// ParseBody read the body from r, and unmarshal JSON to v. // ParseBody read the body from r, and unmarshal JSON to v.
func ParseBody(r io.ReadCloser, v interface{}) error { func ParseBody(r io.ReadCloser, v interface{}) error {
defer r.Close()
b, err := io.ReadAll(r) b, err := io.ReadAll(r)
if err != nil { if err != nil {
return errors.Wrapf(err, "read body") return errors.Wrapf(err, "read body")
} }
defer r.Close()
if len(b) == 0 { if len(b) == 0 {
return nil return nil
@ -97,7 +98,7 @@ func BuildStreamURL(r string) (string, error) {
defaultVhost := !strings.Contains(u.Hostname(), ".") defaultVhost := !strings.Contains(u.Hostname(), ".")
// If hostname is actually an IP address, it's __defaultVhost__. // If hostname is actually an IP address, it's __defaultVhost__.
if ip := net.ParseIP(u.Hostname()); ip.To4() != nil { if ip := net.ParseIP(u.Hostname()); ip != nil && ip.To4() != nil {
defaultVhost = true defaultVhost = true
} }

22
internal/utils/utils_test.go
View File

@ -121,6 +121,19 @@ func TestParseBody_ReadError(t *testing.T) {
} }
} }
// TestParseBody_CloseCalledOnReadError verifies that r.Close() is called even
// when ReadAll fails - this prevents the resource leak fixed by moving defer
// to the top of the function.
func TestParseBody_CloseCalledOnReadError(t *testing.T) {
rc := &errReadCloser{}
if err := ParseBody(rc, &struct{}{}); err == nil {
t.Fatal("want error")
}
if !rc.closed {
t.Fatal("Close() was not called on read error - resource leak")
}
}
func TestParseBody_UnmarshalError(t *testing.T) { func TestParseBody_UnmarshalError(t *testing.T) {
var v struct{ Name string } var v struct{ Name string }
err := ParseBody(io.NopCloser(strings.NewReader("not json")), &v) err := ParseBody(io.NopCloser(strings.NewReader("not json")), &v)
@ -136,11 +149,20 @@ func TestBuildStreamURL(t *testing.T) {
cases := []struct { cases := []struct {
in, want string in, want string
}{ }{
// Domain names with dots use hostname as vhost.
// This case would panic with nil pointer dereference before the fix
// because net.ParseIP("example.com") returns nil and nil.To4() panics.
{"rtmp://example.com/live/stream", "example.com/live/stream"}, {"rtmp://example.com/live/stream", "example.com/live/stream"},
{"rtmp://example.com:1935/live/stream", "example.com/live/stream"}, {"rtmp://example.com:1935/live/stream", "example.com/live/stream"},
// IPv4 addresses use defaultVhost.
{"rtmp://127.0.0.1/live/stream", "__defaultVhost__/live/stream"}, {"rtmp://127.0.0.1/live/stream", "__defaultVhost__/live/stream"},
// Hostnames without dots use defaultVhost.
{"rtmp://localhost/live/stream", "__defaultVhost__/live/stream"}, {"rtmp://localhost/live/stream", "__defaultVhost__/live/stream"},
{"rtmp://localhost:1935/live/stream", "__defaultVhost__/live/stream"}, {"rtmp://localhost:1935/live/stream", "__defaultVhost__/live/stream"},
// IPv6 addresses: net.ParseIP returns non-nil but To4() returns nil,
// but they still get defaultVhost because they contain no dots.
{"rtmp://[::1]/live/stream", "__defaultVhost__/live/stream"},
{"rtmp://[2001:db8::1]:1935/live/stream", "__defaultVhost__/live/stream"},
} }
for _, c := range cases { for _, c := range cases {
got, err := BuildStreamURL(c.in) got, err := BuildStreamURL(c.in)