iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

iceservers with auth.

Browse Source
This commit is contained in:
Miroslav Šedivý 2021-03-17 15:47:49 +01:00
parent 4abe0a5dba
commit 552223d031
6 changed files with 82 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/config/webrtc.go
View File

@ -10,12 +10,13 @@ import (
"github.com/spf13/viper"
"demodesk/neko/internal/utils"
"demodesk/neko/internal/types"
)
type WebRTC struct {
ICELite bool
ICETrickle bool
ICEServers []string
ICEServers []types.ICEServer
EphemeralMin uint16
EphemeralMax uint16
@ -26,6 +27,7 @@ type WebRTC struct {
const (
defEprMin = 59000
defEprMax = 59100
defStun = "stun:stun.l.google.com:19302"
)
func (WebRTC) Init(cmd *cobra.Command) error {
@ -39,8 +41,8 @@ func (WebRTC) Init(cmd *cobra.Command) error {
return err
}
cmd.PersistentFlags().StringSlice("webrtc.iceserver", []string{"stun:stun.l.google.com:19302"}, "describes a single STUN and TURN server that can be used by the ICEAgent to establish a connection with a peer")
if err := viper.BindPFlag("webrtc.iceserver", cmd.PersistentFlags().Lookup("webrtc.iceserver")); err != nil {
cmd.PersistentFlags().String("webrtc.iceservers", "[]", "STUN and TURN servers in JSON format with `urls`, `username`, `password` keys")
if err := viper.BindPFlag("webrtc.iceservers", cmd.PersistentFlags().Lookup("webrtc.iceservers")); err != nil {
return err
}
@ -65,7 +67,18 @@ func (WebRTC) Init(cmd *cobra.Command) error {
func (s *WebRTC) Set() {
s.ICELite = viper.GetBool("webrtc.icelite")
s.ICETrickle = viper.GetBool("webrtc.icetrickle")
s.ICEServers = viper.GetStringSlice("webrtc.iceserver")
if err := viper.UnmarshalKey("webrtc.iceservers", &s.ICEServers, viper.DecodeHook(
utils.JsonStringAutoDecode(s.ICEServers),
)); err != nil {
log.Warn().Err(err).Msgf("unable to parse ICE servers")
}
if len(s.ICEServers) == 0 {
s.ICEServers = append(s.ICEServers, types.ICEServer{
URLs: []string{defStun},
})
}
s.NAT1To1IPs = viper.GetStringSlice("webrtc.nat1to1")
s.IpRetrievalUrl = viper.GetString("webrtc.ip_retrieval_url")

11
internal/types/message/messages.go
View File

@ -40,12 +40,11 @@ type SystemDisconnect struct {
/////////////////////////////
type SignalProvide struct {
Event string `json:"event,omitempty"`
SDP string `json:"sdp"`
Lite bool `json:"lite"`
ICE []string `json:"ice"`
Videos []string `json:"videos"`
Video string `json:"video"`
Event string `json:"event,omitempty"`
SDP string `json:"sdp"`
ICEServers []types.ICEServer `json:"iceservers"`
Videos []string `json:"videos"`
Video string `json:"video"`
}
type SignalCandidate struct {

9
internal/types/webrtc.go
View File

@ -2,6 +2,12 @@ package types
import "github.com/pion/webrtc/v3"
type ICEServer struct {
URLs []string `mapstructure:"urls" json:"urls"`
Username string `mapstructure:"username" json:"username"`
Credential string `mapstructure:"credential" json:"credential"`
}
type WebRTCPeer interface {
SignalAnswer(sdp string) error
SignalCandidate(candidate webrtc.ICECandidateInit) error
@ -17,8 +23,7 @@ type WebRTCManager interface {
Start()
Shutdown() error
ICELite() bool
ICEServers() []string
ICEServers() []ICEServer
CreatePeer(session Session, videoID string) (*webrtc.SessionDescription, error)
}

21
internal/utils/json.go
View File

@ -1,6 +1,9 @@
package utils
import "encoding/json"
import (
"encoding/json"
"reflect"
)
func Unmarshal(in interface{}, raw []byte, callback func() error) error {
if err := json.Unmarshal(raw, &in); err != nil {
@ -8,3 +11,19 @@ func Unmarshal(in interface{}, raw []byte, callback func() error) error {
}
return callback()
}
func JsonStringAutoDecode(m interface{}) func(rf reflect.Kind, rt reflect.Kind, data interface{}) (interface{}, error) {
return func(rf reflect.Kind, rt reflect.Kind, data interface{}) (interface{}, error) {
if rf != reflect.String || rt == reflect.String {
return data, nil
}
raw := data.(string)
if raw != "" && (raw[0:1] == "{" || raw[0:1] == "[") {
err := json.Unmarshal([]byte(raw), &m)
return m, err
}
return data, nil
}
}

43
internal/webrtc/manager.go
View File

@ -77,12 +77,17 @@ func (manager *WebRTCManagerCtx) Start() {
audio.RemoveListener(&audioListener)
}
var servers []string
for _, server := range manager.config.ICEServers {
servers = append(servers, server.URLs...)
}
manager.logger.Info().
Str("ice_lite", fmt.Sprintf("%t", manager.config.ICELite)).
Str("ice_trickle", fmt.Sprintf("%t", manager.config.ICETrickle)).
Str("ice_servers", strings.Join(manager.config.ICEServers, ",")).
Str("ephemeral_port_range", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)).
Str("nat_ips", strings.Join(manager.config.NAT1To1IPs, ",")).
Str("icelite", fmt.Sprintf("%t", manager.config.ICELite)).
Str("icetrickle", fmt.Sprintf("%t", manager.config.ICETrickle)).
Str("iceservers", strings.Join(servers, ",")).
Str("nat1to1", strings.Join(manager.config.NAT1To1IPs, ",")).
Str("epr", fmt.Sprintf("%d-%d", manager.config.EphemeralMin, manager.config.EphemeralMax)).
Msgf("webrtc starting")
manager.curImage.Start()
@ -98,11 +103,7 @@ func (manager *WebRTCManagerCtx) Shutdown() error {
return nil
}
func (manager *WebRTCManagerCtx) ICELite() bool {
return manager.config.ICELite
}
func (manager *WebRTCManagerCtx) ICEServers() []string {
func (manager *WebRTCManagerCtx) ICEServers() []types.ICEServer {
return manager.config.ICEServers
}
@ -423,12 +424,24 @@ func (manager *WebRTCManagerCtx) apiConfiguration() *webrtc.Configuration {
}
}
ICEServers := []webrtc.ICEServer{}
for _, server := range manager.config.ICEServers {
var credential interface{}
if server.Credential != "" {
credential = server.Credential
} else {
credential = false
}
ICEServers = append(ICEServers, webrtc.ICEServer{
URLs: server.URLs,
Username: server.Username,
Credential: credential,
})
}
return &webrtc.Configuration{
ICEServers: []webrtc.ICEServer{
{
URLs: manager.config.ICEServers,
},
},
ICEServers: ICEServers,
SDPSemantics: webrtc.SDPSemanticsUnifiedPlanWithFallback,
}
}

11
internal/websocket/handler/signal.go
View File

@ -22,12 +22,11 @@ func (h *MessageHandlerCtx) signalRequest(session types.Session) error {
return session.Send(
message.SignalProvide{
Event: event.SIGNAL_PROVIDE,
SDP: offer.SDP,
Lite: h.webrtc.ICELite(),
ICE: h.webrtc.ICEServers(),
Videos: videos,
Video: defaultVideo,
Event: event.SIGNAL_PROVIDE,
SDP: offer.SDP,
ICEServers: h.webrtc.ICEServers(),
Videos: videos,
Video: defaultVideo,
})
}