PLT-4550 move webrtc to TE (#4440)
* PLT-4550 move webrtc to TE * remove webrtc from makefile enterprise tests
Этот коммит содержится в:
коммит произвёл
Harrison Healey
родитель
6289c72686
Коммит
772b57386f
12
api/user.go
12
api/user.go
@@ -750,9 +750,7 @@ func RevokeSessionById(c *Context, sessionId string) {
|
||||
}
|
||||
}
|
||||
|
||||
if webrtcInterface := einterfaces.GetWebrtcInterface(); webrtcInterface != nil {
|
||||
webrtcInterface.RevokeToken(session.Id)
|
||||
}
|
||||
RevokeWebrtcToken(session.Id)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -776,9 +774,7 @@ func RevokeAllSession(c *Context, userId string) {
|
||||
}
|
||||
}
|
||||
|
||||
if webrtcInterface := einterfaces.GetWebrtcInterface(); webrtcInterface != nil {
|
||||
webrtcInterface.RevokeToken(session.Id)
|
||||
}
|
||||
RevokeWebrtcToken(session.Id)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -801,9 +797,7 @@ func RevokeAllSessionsNoContext(userId string) *model.AppError {
|
||||
}
|
||||
}
|
||||
|
||||
if webrtcInterface := einterfaces.GetWebrtcInterface(); webrtcInterface != nil {
|
||||
webrtcInterface.RevokeToken(session.Id)
|
||||
}
|
||||
RevokeWebrtcToken(session.Id)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
||||
103
api/webrtc.go
103
api/webrtc.go
@@ -4,11 +4,18 @@
|
||||
package api
|
||||
|
||||
import (
|
||||
"crypto/hmac"
|
||||
"crypto/sha1"
|
||||
"crypto/tls"
|
||||
"encoding/base64"
|
||||
l4g "github.com/alecthomas/log4go"
|
||||
"github.com/mattermost/platform/einterfaces"
|
||||
"github.com/mattermost/platform/model"
|
||||
"github.com/mattermost/platform/utils"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
func InitWebrtc() {
|
||||
@@ -20,18 +27,26 @@ func InitWebrtc() {
|
||||
}
|
||||
|
||||
func webrtcToken(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
webrtcInterface := einterfaces.GetWebrtcInterface()
|
||||
|
||||
if webrtcInterface == nil {
|
||||
c.Err = model.NewLocAppError("webrtcToken", "api.webrtc.not_available.app_error", nil, "")
|
||||
c.Err.StatusCode = http.StatusNotImplemented
|
||||
return
|
||||
}
|
||||
|
||||
if result, err := webrtcInterface.Token(c.Session.Id); err != nil {
|
||||
if token, err := getWebrtcToken(c.Session.Id); err != nil {
|
||||
c.Err = err
|
||||
return
|
||||
} else {
|
||||
result := make(map[string]string)
|
||||
result["token"] = token
|
||||
result["gateway_url"] = *utils.Cfg.WebrtcSettings.GatewayWebsocketUrl
|
||||
|
||||
if len(*utils.Cfg.WebrtcSettings.StunURI) > 0 {
|
||||
result["stun_uri"] = *utils.Cfg.WebrtcSettings.StunURI
|
||||
}
|
||||
|
||||
if len(*utils.Cfg.WebrtcSettings.TurnURI) > 0 {
|
||||
timestamp := strconv.FormatInt(utils.EndOfDay(time.Now().AddDate(0, 0, 1)).Unix(), 10)
|
||||
username := timestamp + ":" + *utils.Cfg.WebrtcSettings.TurnUsername
|
||||
|
||||
result["turn_uri"] = *utils.Cfg.WebrtcSettings.TurnURI
|
||||
result["turn_password"] = generateTurnPassword(username, *utils.Cfg.WebrtcSettings.TurnSharedKey)
|
||||
result["turn_username"] = username
|
||||
}
|
||||
w.Write([]byte(model.MapToJson(result)))
|
||||
}
|
||||
}
|
||||
@@ -49,3 +64,71 @@ func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.
|
||||
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func getWebrtcToken(sessionId string) (string, *model.AppError) {
|
||||
if !*utils.Cfg.WebrtcSettings.Enable {
|
||||
return "", model.NewLocAppError("WebRTC.getWebrtcToken", "api.webrtc.disabled.app_error", nil, "")
|
||||
}
|
||||
|
||||
token := base64.StdEncoding.EncodeToString([]byte(sessionId))
|
||||
|
||||
data := make(map[string]string)
|
||||
data["janus"] = "add_token"
|
||||
data["token"] = token
|
||||
data["transaction"] = model.NewId()
|
||||
data["admin_secret"] = *utils.Cfg.WebrtcSettings.GatewayAdminSecret
|
||||
|
||||
rq, _ := http.NewRequest("POST", *utils.Cfg.WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data)))
|
||||
rq.Header.Set("Content-Type", "application/json")
|
||||
|
||||
tr := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: *utils.Cfg.ServiceSettings.EnableInsecureOutgoingConnections},
|
||||
}
|
||||
httpClient := &http.Client{Transport: tr}
|
||||
if rp, err := httpClient.Do(rq); err != nil {
|
||||
return "", model.NewLocAppError("WebRTC.Token", "model.client.connecting.app_error", nil, err.Error())
|
||||
} else if rp.StatusCode >= 300 {
|
||||
defer closeBody(rp)
|
||||
return "", model.AppErrorFromJson(rp.Body)
|
||||
} else {
|
||||
janusResponse := model.GatewayResponseFromJson(rp.Body)
|
||||
if janusResponse.Status != "success" {
|
||||
return "", model.NewLocAppError("getWebrtcToken", "api.webrtc.register_token.app_error", nil, "")
|
||||
}
|
||||
}
|
||||
|
||||
return token, nil
|
||||
}
|
||||
|
||||
func generateTurnPassword(username string, secret string) string {
|
||||
key := []byte(secret)
|
||||
h := hmac.New(sha1.New, key)
|
||||
h.Write([]byte(username))
|
||||
return base64.StdEncoding.EncodeToString(h.Sum(nil))
|
||||
}
|
||||
|
||||
func closeBody(r *http.Response) {
|
||||
if r.Body != nil {
|
||||
ioutil.ReadAll(r.Body)
|
||||
r.Body.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func RevokeWebrtcToken(sessionId string) {
|
||||
token := base64.StdEncoding.EncodeToString([]byte(sessionId))
|
||||
data := make(map[string]string)
|
||||
data["janus"] = "remove_token"
|
||||
data["token"] = token
|
||||
data["transaction"] = model.NewId()
|
||||
data["admin_secret"] = *utils.Cfg.WebrtcSettings.GatewayAdminSecret
|
||||
|
||||
rq, _ := http.NewRequest("POST", *utils.Cfg.WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data)))
|
||||
rq.Header.Set("Content-Type", "application/json")
|
||||
|
||||
// we do not care about the response
|
||||
tr := &http.Transport{
|
||||
TLSClientConfig: &tls.Config{InsecureSkipVerify: *utils.Cfg.ServiceSettings.EnableInsecureOutgoingConnections},
|
||||
}
|
||||
httpClient := &http.Client{Transport: tr}
|
||||
httpClient.Do(rq)
|
||||
}
|
||||
|
||||
@@ -3,16 +3,41 @@
|
||||
|
||||
package api
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/mattermost/platform/model"
|
||||
"github.com/mattermost/platform/utils"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestWebrtcToken(t *testing.T) {
|
||||
th := Setup().InitBasic()
|
||||
|
||||
if _, err := th.BasicClient.GetWebrtcToken(); err != nil {
|
||||
if err.Id != "api.webrtc.not_available.app_error" {
|
||||
t.Fatal("Should have fail, webrtc not availble")
|
||||
}
|
||||
} else {
|
||||
t.Fatal("Should have fail, webrtc not availble")
|
||||
*utils.Cfg.WebrtcSettings.Enable = false
|
||||
if _, err := th.BasicClient.GetWebrtcToken(); err == nil {
|
||||
t.Fatal("should have failed")
|
||||
}
|
||||
|
||||
*utils.Cfg.WebrtcSettings.Enable = true
|
||||
*utils.Cfg.WebrtcSettings.GatewayAdminUrl = "https://dockerhost:7089/admin"
|
||||
*utils.Cfg.WebrtcSettings.GatewayWebsocketUrl = "wss://dockerhost:8189"
|
||||
*utils.Cfg.WebrtcSettings.GatewayAdminSecret = "janusoverlord"
|
||||
*utils.Cfg.WebrtcSettings.StunURI = "stun:dockerhost:5349"
|
||||
*utils.Cfg.WebrtcSettings.TurnURI = "turn:dockerhost:5349"
|
||||
*utils.Cfg.WebrtcSettings.TurnUsername = "test"
|
||||
*utils.Cfg.WebrtcSettings.TurnSharedKey = "mattermost"
|
||||
*utils.Cfg.ServiceSettings.EnableInsecureOutgoingConnections = true
|
||||
sessionId := model.NewId()
|
||||
if result, err := th.BasicClient.GetWebrtcToken(); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
fmt.Println("Token", result["token"])
|
||||
fmt.Println("Gateway Websocket", result["gateway_url"])
|
||||
fmt.Println("Stun URI", result["stun_uri"])
|
||||
fmt.Println("Turn URI", result["turn_uri"])
|
||||
fmt.Println("Turn Username", result["turn_username"])
|
||||
fmt.Println("Turn Password", result["turn_password"])
|
||||
}
|
||||
|
||||
RevokeWebrtcToken(sessionId)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user