From d1805733feb8c48a7286eb1affc1f98ed1a044a8 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Thu, 18 Oct 2018 13:49:10 -0400 Subject: MM-12505: remove all things WebRTC (#9700) --- app/diagnostics.go | 7 ---- app/diagnostics_test.go | 1 - app/session.go | 3 -- app/webrtc.go | 97 ------------------------------------------------- 4 files changed, 108 deletions(-) delete mode 100644 app/webrtc.go (limited to 'app') diff --git a/app/diagnostics.go b/app/diagnostics.go index 9f4d0d200..f04e6cd78 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -36,7 +36,6 @@ const ( TRACK_CONFIG_PASSWORD = "config_password" TRACK_CONFIG_CLUSTER = "config_cluster" TRACK_CONFIG_METRICS = "config_metrics" - TRACK_CONFIG_WEBRTC = "config_webrtc" TRACK_CONFIG_SUPPORT = "config_support" TRACK_CONFIG_NATIVEAPP = "config_nativeapp" TRACK_CONFIG_EXPERIMENTAL = "config_experimental" @@ -493,12 +492,6 @@ func (a *App) trackConfig() { "isdefault_iosapp_download_link": isDefault(*cfg.NativeAppSettings.IosAppDownloadLink, model.NATIVEAPP_SETTINGS_DEFAULT_IOS_APP_DOWNLOAD_LINK), }) - a.SendDiagnostic(TRACK_CONFIG_WEBRTC, map[string]interface{}{ - "enable": *cfg.WebrtcSettings.Enable, - "isdefault_stun_uri": isDefault(*cfg.WebrtcSettings.StunURI, model.WEBRTC_SETTINGS_DEFAULT_STUN_URI), - "isdefault_turn_uri": isDefault(*cfg.WebrtcSettings.TurnURI, model.WEBRTC_SETTINGS_DEFAULT_TURN_URI), - }) - a.SendDiagnostic(TRACK_CONFIG_EXPERIMENTAL, map[string]interface{}{ "client_side_cert_enable": *cfg.ExperimentalSettings.ClientSideCertEnable, "isdefault_client_side_cert_check": isDefault(*cfg.ExperimentalSettings.ClientSideCertCheck, model.CLIENT_SIDE_CERT_CHECK_PRIMARY_AUTH), diff --git a/app/diagnostics_test.go b/app/diagnostics_test.go index 8e8c03935..d4b1e9db6 100644 --- a/app/diagnostics_test.go +++ b/app/diagnostics_test.go @@ -132,7 +132,6 @@ func TestDiagnostics(t *testing.T) { TRACK_CONFIG_PASSWORD, TRACK_CONFIG_CLUSTER, TRACK_CONFIG_METRICS, - TRACK_CONFIG_WEBRTC, TRACK_CONFIG_SUPPORT, TRACK_CONFIG_NATIVEAPP, TRACK_CONFIG_ANALYTICS, diff --git a/app/session.go b/app/session.go index afbc4c7df..6d46f3d3a 100644 --- a/app/session.go +++ b/app/session.go @@ -116,8 +116,6 @@ func (a *App) RevokeAllSessions(userId string) *model.AppError { return result.Err } } - - a.RevokeWebrtcToken(session.Id) } a.ClearSessionCacheForUser(userId) @@ -213,7 +211,6 @@ func (a *App) RevokeSession(session *model.Session) *model.AppError { } } - a.RevokeWebrtcToken(session.Id) a.ClearSessionCacheForUser(session.UserId) return nil diff --git a/app/webrtc.go b/app/webrtc.go deleted file mode 100644 index 08601a98c..000000000 --- a/app/webrtc.go +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package app - -import ( - "crypto/hmac" - "crypto/sha1" - "encoding/base64" - "net/http" - "strconv" - "strings" - "time" - - "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" -) - -func (a *App) GetWebrtcInfoForSession(sessionId string) (*model.WebrtcInfoResponse, *model.AppError) { - token, err := a.GetWebrtcToken(sessionId) - if err != nil { - return nil, err - } - - result := &model.WebrtcInfoResponse{ - Token: token, - GatewayUrl: *a.Config().WebrtcSettings.GatewayWebsocketUrl, - } - - if len(*a.Config().WebrtcSettings.StunURI) > 0 { - result.StunUri = *a.Config().WebrtcSettings.StunURI - } - - if len(*a.Config().WebrtcSettings.TurnURI) > 0 { - timestamp := strconv.FormatInt(utils.EndOfDay(time.Now().AddDate(0, 0, 1)).Unix(), 10) - username := timestamp + ":" + *a.Config().WebrtcSettings.TurnUsername - - result.TurnUri = *a.Config().WebrtcSettings.TurnURI - result.TurnPassword = GenerateTurnPassword(username, *a.Config().WebrtcSettings.TurnSharedKey) - result.TurnUsername = username - } - - return result, nil -} - -func (a *App) GetWebrtcToken(sessionId string) (string, *model.AppError) { - if !*a.Config().WebrtcSettings.Enable { - return "", model.NewAppError("WebRTC.getWebrtcToken", "api.webrtc.disabled.app_error", nil, "", http.StatusNotImplemented) - } - - 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"] = *a.Config().WebrtcSettings.GatewayAdminSecret - - rq, _ := http.NewRequest("POST", *a.Config().WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) - rq.Header.Set("Content-Type", "application/json") - - if rp, err := a.HTTPService.MakeClient(true).Do(rq); err != nil { - return "", model.NewAppError("WebRTC.Token", "model.client.connecting.app_error", nil, err.Error(), http.StatusInternalServerError) - } else if rp.StatusCode >= 300 { - defer consumeAndClose(rp) - return "", model.AppErrorFromJson(rp.Body) - } else { - janusResponse := model.GatewayResponseFromJson(rp.Body) - if janusResponse.Status != "success" { - return "", model.NewAppError("getWebrtcToken", "api.webrtc.register_token.app_error", nil, "", http.StatusInternalServerError) - } - } - - 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 (a *App) 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"] = *a.Config().WebrtcSettings.GatewayAdminSecret - - rq, _ := http.NewRequest("POST", *a.Config().WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) - rq.Header.Set("Content-Type", "application/json") - - // we do not care about the response - a.HTTPService.MakeClient(true).Do(rq) -} -- cgit v1.2.3-1-g7c22