apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-12-24 13:07:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow SRT v4 handshake clients

Browse Source
This commit is contained in:
Ingo Oppermann
2024-02-12 14:42:49 +01:00
parent 4410804a3b
commit 2514feec23
1 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
srt/srt.go
View File

@@ -6,6 +6,7 @@ import (
"fmt"
"net"
"path/filepath"
"strconv"
"strings"
"sync"
"time"
@@ -281,19 +282,46 @@ func (s *server) handleConnect(req srt.ConnRequest) srt.ConnType {
client := req.RemoteAddr()
streamId := req.StreamId()
if req.Version() != 5 {
s.log("", "CONNECT", "INVALID", streamId, "unsupported version", client)
return srt.REJECT
}
var si url.StreamInfo
var err error
si, err := url.ParseStreamId(streamId)
if err != nil {
s.log("", "CONNECT", "INVALID", streamId, err.Error(), client)
return srt.REJECT
}
if req.Version() == 4 {
si.Mode = "publish"
si.Resource = client.String()
if len(si.Resource) == 0 {
s.log("", "CONNECT", "INVALID", streamId, "stream resource not provided", client)
if len(s.passphrase) != 0 {
req.SetPassphrase(s.passphrase)
}
} else if req.Version() == 5 {
si, err := url.ParseStreamId(streamId)
if err != nil {
s.log("", "CONNECT", "INVALID", streamId, err.Error(), client)
return srt.REJECT
}
if len(si.Resource) == 0 {
s.log("", "CONNECT", "INVALID", streamId, "stream resource not provided", client)
return srt.REJECT
}
if len(s.passphrase) != 0 {
if !req.IsEncrypted() {
s.log("", "CONNECT", "FORBIDDEN", si.Resource, "connection has to be encrypted", client)
return srt.REJECT
}
if err := req.SetPassphrase(s.passphrase); err != nil {
s.log("", "CONNECT", "FORBIDDEN", si.Resource, err.Error(), client)
return srt.REJECT
}
} else {
if req.IsEncrypted() {
s.log("", "CONNECT", "INVALID", si.Resource, "connection must not be encrypted", client)
return srt.REJECT
}
}
} else {
s.log("", "CONNECT", "INVALID", streamId, "unsupported handshake version: "+strconv.FormatUint(uint64(req.Version()), 10), client)
return srt.REJECT
}
@@ -302,27 +330,10 @@ func (s *server) handleConnect(req srt.ConnRequest) srt.ConnType {
} else if si.Mode == "request" {
mode = srt.SUBSCRIBE
} else {
s.log("", "CONNECT", "INVALID", si.Resource, "invalid connection mode", client)
s.log("", "CONNECT", "INVALID", si.Resource, "invalid connection mode: "+si.Mode, client)
return srt.REJECT
}
if len(s.passphrase) != 0 {
if !req.IsEncrypted() {
s.log("", "CONNECT", "FORBIDDEN", si.Resource, "connection has to be encrypted", client)
return srt.REJECT
}
if err := req.SetPassphrase(s.passphrase); err != nil {
s.log("", "CONNECT", "FORBIDDEN", si.Resource, err.Error(), client)
return srt.REJECT
}
} else {
if req.IsEncrypted() {
s.log("", "CONNECT", "INVALID", si.Resource, "connection must not be encrypted", client)
return srt.REJECT
}
}
identity, err := s.findIdentityFromToken(si.Token)
if err != nil {
s.logger.Debug().WithError(err).Log("invalid token")