From 74ffb6f98f7ee8b4e61743919ab20460c57ad4da Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Sun, 16 Apr 2017 21:14:31 -0400 Subject: Implement GET /webrtc/token endpoint for APIv4 (#6046) --- api/webrtc.go | 72 ++++------------------------------------------------------- 1 file changed, 4 insertions(+), 68 deletions(-) (limited to 'api') diff --git a/api/webrtc.go b/api/webrtc.go index ad1da31e4..58e35f2fa 100644 --- a/api/webrtc.go +++ b/api/webrtc.go @@ -4,18 +4,10 @@ package api import ( - "crypto/hmac" - "crypto/sha1" - "crypto/tls" - "encoding/base64" "net/http" - "strconv" - "strings" - "time" l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/app" - "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" ) @@ -26,68 +18,12 @@ func InitWebrtc() { } func webrtcToken(c *Context, w http.ResponseWriter, r *http.Request) { - if token, err := getWebrtcToken(c.Session.Id); err != nil { + result, err := app.GetWebrtcInfoForSession(c.Session.Id) + + if 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))) } -} - -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 app.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)) + w.Write([]byte(result.ToJson())) } -- cgit v1.2.3-1-g7c22