gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove on the fly stream creation for security reason

Browse Source
This commit is contained in:
Alexey Khit
2023-06-29 22:52:59 +03:00
parent 37abe2ce0d
commit fa8d4e4807
6 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/hls/hls.go
+1 -1
View File
@@ -63,7 +63,7 @@ func handlerStream(w http.ResponseWriter, r *http.Request) {
} }
src := r.URL.Query().Get("src") src := r.URL.Query().Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
http.Error(w, api.StreamNotFound, http.StatusNotFound) http.Error(w, api.StreamNotFound, http.StatusNotFound)
return return
internal/mjpeg/init.go
+3 -3
View File
@@ -26,7 +26,7 @@ func Init() {
func handlerKeyframe(w http.ResponseWriter, r *http.Request) { func handlerKeyframe(w http.ResponseWriter, r *http.Request) {
src := r.URL.Query().Get("src") src := r.URL.Query().Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
http.Error(w, api.StreamNotFound, http.StatusNotFound) http.Error(w, api.StreamNotFound, http.StatusNotFound)
return return
@@ -91,7 +91,7 @@ func handlerStream(w http.ResponseWriter, r *http.Request) {
func outputMjpeg(w http.ResponseWriter, r *http.Request) { func outputMjpeg(w http.ResponseWriter, r *http.Request) {
src := r.URL.Query().Get("src") src := r.URL.Query().Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
http.Error(w, api.StreamNotFound, http.StatusNotFound) http.Error(w, api.StreamNotFound, http.StatusNotFound)
return return
@@ -159,7 +159,7 @@ func inputMjpeg(w http.ResponseWriter, r *http.Request) {
func handlerWS(tr *ws.Transport, _ *ws.Message) error { func handlerWS(tr *ws.Transport, _ *ws.Message) error {
src := tr.Request.URL.Query().Get("src") src := tr.Request.URL.Query().Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
return errors.New(api.StreamNotFound) return errors.New(api.StreamNotFound)
} }
internal/mp4/mp4.go
+2 -2
View File
@@ -40,7 +40,7 @@ func handlerKeyframe(w http.ResponseWriter, r *http.Request) {
query := r.URL.Query() query := r.URL.Query()
src := query.Get("src") src := query.Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
http.Error(w, api.StreamNotFound, http.StatusNotFound) http.Error(w, api.StreamNotFound, http.StatusNotFound)
return return
@@ -101,7 +101,7 @@ func handlerMP4(w http.ResponseWriter, r *http.Request) {
} }
src := query.Get("src") src := query.Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
http.Error(w, api.StreamNotFound, http.StatusNotFound) http.Error(w, api.StreamNotFound, http.StatusNotFound)
return return
internal/mp4/ws.go
+2 -2
View File
@@ -13,7 +13,7 @@ import (
func handlerWSMSE(tr *ws.Transport, msg *ws.Message) error { func handlerWSMSE(tr *ws.Transport, msg *ws.Message) error {
src := tr.Request.URL.Query().Get("src") src := tr.Request.URL.Query().Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
return errors.New(api.StreamNotFound) return errors.New(api.StreamNotFound)
} }
@@ -60,7 +60,7 @@ func handlerWSMSE(tr *ws.Transport, msg *ws.Message) error {
func handlerWSMP4(tr *ws.Transport, msg *ws.Message) error { func handlerWSMP4(tr *ws.Transport, msg *ws.Message) error {
src := tr.Request.URL.Query().Get("src") src := tr.Request.URL.Query().Get("src")
stream := streams.GetOrNew(src) stream := streams.Get(src)
if stream == nil { if stream == nil {
return errors.New(api.StreamNotFound) return errors.New(api.StreamNotFound)
} }
internal/streams/init.go
-14
View File
@@ -53,20 +53,6 @@ func NewTemplate(name string, source any) *Stream {
return New(name, "{input}") return New(name, "{input}")
} }
func GetOrNew(src string) *Stream {
if stream, ok := streams[src]; ok {
return stream
}
if !HasProducer(src) {
return nil
}
log.Info().Str("url", src).Msg("[streams] create new stream")
return New(src, src)
}
func GetAll() (names []string) { func GetAll() (names []string) {
for name := range streams { for name := range streams {
names = append(names, name) names = append(names, name)
internal/webrtc/init.go
+1 -1
View File
@@ -91,7 +91,7 @@ func asyncHandler(tr *ws.Transport, msg *ws.Message) error {
query := tr.Request.URL.Query() query := tr.Request.URL.Query()
if name := query.Get("src"); name != "" { if name := query.Get("src"); name != "" {
stream = streams.GetOrNew(name) stream = streams.Get(name)
mode = core.ModePassiveConsumer mode = core.ModePassiveConsumer
log.Debug().Str("src", name).Msg("[webrtc] new consumer") log.Debug().Str("src", name).Msg("[webrtc] new consumer")
} else if name = query.Get("dst"); name != "" { } else if name = query.Get("dst"); name != "" {