Commit b180bb46 authored by enahum's avatar enahum Committed by Christopher Speller

PLT-3412 WebRTC Server side & System Console (#3706)

* WebRTC Server side

* WebRTC System Console

* Consistency on variable names

* Add turn and stun uri validation
parent 3b4c9d75
......@@ -96,6 +96,14 @@ start-docker:
sleep 10; \
fi
@if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 0 ]; then \
echo starting mattermost-webrtc; \
docker run --name mattermost-webrtc -p 7088:7088 -p 7089:7089 -p 8188:8188 -p 8189:8189 -d mattermost/webrtc:latest > /dev/null; \
elif [ $(shell docker ps | grep -ci mattermost-webrtc) -eq 0 ]; then \
echo restarting mattermost-webrtc; \
docker start mattermost-webrtc > /dev/null; \
fi
stop-docker:
@echo Stopping docker containers
......@@ -114,6 +122,11 @@ stop-docker:
docker stop mattermost-openldap > /dev/null; \
fi
@if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 1 ]; then \
echo stopping mattermost-webrtc; \
docker stop mattermost-webrtc > /dev/null; \
fi
clean-docker:
@echo Removing docker containers
......@@ -135,6 +148,12 @@ clean-docker:
docker rm -v mattermost-openldap > /dev/null; \
fi
@if [ $(shell docker ps -a | grep -ci mattermost-webrtc) -eq 1 ]; then \
echo removing mattermost-webrtc; \
docker stop mattermost-webrtc > /dev/null; \
docker rm -v mattermost-webrtc > /dev/null; \
fi
check-client-style:
@echo Checking client style
......@@ -184,6 +203,7 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/saml && ./saml.test -test.v -test.timeout=60s -test.coverprofile=csaml.out || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/cluster && ./cluster.test -test.v -test.timeout=60s -test.coverprofile=ccluster.out || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/account_migration && ./account_migration.test -test.v -test.timeout=60s -test.coverprofile=caccount_migration.out || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -covermode=count -c ./enterprise/webrtc && ./webrtc.test -test.v -test.timeout=60s -test.coverprofile=cwebrtc.out || exit 1
tail -n +2 cldap.out >> ecover.out
tail -n +2 ccompliance.out >> ecover.out
......@@ -191,14 +211,15 @@ ifeq ($(BUILD_ENTERPRISE_READY),true)
tail -n +2 csaml.out >> ecover.out
tail -n +2 ccluster.out >> ecover.out
tail -n +2 caccount_migration.out >> ecover.out
rm -f cldap.out ccompliance.out cemoji.out csaml.out ccluster.out caccount_migration.out
tail -n +2 cwebrtc.out >> ecover.out
rm -f cldap.out ccompliance.out cemoji.out csaml.out ccluster.out caccount_migration.out cwebrtc.out
rm -r ldap.test
rm -r compliance.test
rm -r emoji.test
rm -r saml.test
rm -r cluster.test
rm -r account_migration.test
rm -r webrtc.test
rm -f config/*.crt
rm -f config/*.key
endif
......
......@@ -49,6 +49,8 @@ type Routes struct {
Emoji *mux.Router // 'api/v3/emoji'
Webrtc *mux.Router // 'api/v3/webrtc'
WebSocket *WebSocketRouter // websocket api
}
......@@ -77,6 +79,7 @@ func InitApi() {
BaseRoutes.License = BaseRoutes.ApiRoot.PathPrefix("/license").Subrouter()
BaseRoutes.Public = BaseRoutes.ApiRoot.PathPrefix("/public").Subrouter()
BaseRoutes.Emoji = BaseRoutes.ApiRoot.PathPrefix("/emoji").Subrouter()
BaseRoutes.Webrtc = BaseRoutes.ApiRoot.PathPrefix("/webrtc").Subrouter()
BaseRoutes.WebSocket = NewWebSocketRouter()
......@@ -95,6 +98,7 @@ func InitApi() {
InitLicense()
InitEmoji()
InitStatus()
InitWebrtc()
// 404 on any api route before web.go has a chance to serve it
Srv.Router.Handle("/api/{anything:.*}", http.HandlerFunc(Handle404))
......
......@@ -735,6 +735,10 @@ func RevokeSessionById(c *Context, sessionId string) {
c.Err = result.Err
}
}
if webrtcInterface := einterfaces.GetWebrtcInterface(); webrtcInterface != nil {
webrtcInterface.RevokeToken(session.Id)
}
}
}
......@@ -757,6 +761,10 @@ func RevokeAllSession(c *Context, userId string) {
return
}
}
if webrtcInterface := einterfaces.GetWebrtcInterface(); webrtcInterface != nil {
webrtcInterface.RevokeToken(session.Id)
}
}
}
}
......@@ -778,6 +786,10 @@ func RevokeAllSessionsNoContext(userId string) *model.AppError {
return result.Err
}
}
if webrtcInterface := einterfaces.GetWebrtcInterface(); webrtcInterface != nil {
webrtcInterface.RevokeToken(session.Id)
}
}
}
return nil
......
......@@ -169,6 +169,9 @@ func shouldSendEvent(webCon *WebConn, msg *model.WebSocketEvent) bool {
} else if msg.Event == model.WEBSOCKET_EVENT_EPHEMERAL_MESSAGE {
// For now, ephemeral messages are sent directly to individual users
return false
} else if msg.Event == model.WEBSOCKET_EVENT_WEBRTC {
// No need to tell anyone that a webrtc event is going on
return false
}
// Only report events to users who are in the team for the event
......
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package api
import (
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/platform/einterfaces"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
"net/http"
)
func InitWebrtc() {
l4g.Debug(utils.T("api.webrtc.init.debug"))
BaseRoutes.Webrtc.Handle("/token", ApiUserRequired(webrtcToken)).Methods("POST")
BaseRoutes.WebSocket.Handle("webrtc", ApiWebSocketHandler(webrtcMessage))
}
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 {
c.Err = err
return
} else {
w.Write([]byte(model.MapToJson(result)))
}
}
func webrtcMessage(req *model.WebSocketRequest) (map[string]interface{}, *model.AppError) {
var ok bool
var toUserId string
if toUserId, ok = req.Data["to_user_id"].(string); !ok || len(toUserId) != 26 {
return nil, NewInvalidWebSocketParamError(req.Action, "to_user_id")
}
event := model.NewWebSocketEvent("", "", toUserId, model.WEBSOCKET_EVENT_WEBRTC)
event.Data = req.Data
go Publish(event)
return nil, nil
}
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package api
import "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")
}
}
......@@ -220,5 +220,15 @@
"Enable": false,
"InterNodeListenAddress": ":8075",
"InterNodeUrls": []
},
"WebrtcSettings": {
"Enable": false,
"GatewayWebsocketUrl": "",
"GatewayAdminUrl": "",
"GatewayAdminSecret": "",
"StunURI": "",
"TurnURI": "",
"TurnUsername": "",
"TurnSharedKey": ""
}
}
\ No newline at end of file
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.
package einterfaces
import (
"github.com/mattermost/platform/model"
)
type WebrtcInterface interface {
Token(sessionId string) (map[string]string, *model.AppError)
RevokeToken(sessionId string)
}
var theWebrtcInterface WebrtcInterface
func RegisterWebrtcInterface(newInterface WebrtcInterface) {
theWebrtcInterface = newInterface
}
func GetWebrtcInterface() WebrtcInterface {
return theWebrtcInterface
}
......@@ -2391,6 +2391,14 @@
"id": "api.webhook.regen_outgoing_token.permissions.app_error",
"translation": "Inappropriate permissions to regenerate outcoming webhook token"
},
{
"id": "api.webrtc.init.debug",
"translation": "Initializing WebRTC api routes"
},
{
"id": "api.webrtc.not_available.app_error",
"translation": "WebRTC is not available on this server."
},
{
"id": "api.websocket_handler.invalid_param.app_error",
"translation": "Invalid {{.Name}} parameter"
......@@ -2663,6 +2671,18 @@
"id": "ent.saml.update_saml_user.unable_error",
"translation": "Unable to update existing SAML user. Allowing login anyway. err=%v"
},
{
"id": "ent.webrtc.disabled.app_error",
"translation": "WebRTC is not enabled in this server."
},
{
"id": "ent.webrtc.license_disable.app_error",
"translation": "Your license does not support using Mattermost WebRTC"
},
{
"id": "ent.webrtc.register_token.app_error",
"translation": "We encountered an error trying to register the WebRTC Token"
},
{
"id": "error.generic.link_message",
"translation": "Back to Mattermost"
......@@ -3199,6 +3219,34 @@
"id": "model.config.is_valid.sql_max_conn.app_error",
"translation": "Invalid maximum open connection for SQL settings. Must be a positive number."
},
{
"id": "model.config.is_valid.webrtc_gateway_admin_secret.app_error",
"translation": "WebRTC Gateway Admin Secret must be set."
},
{
"id": "model.config.is_valid.webrtc_gateway_admin_url.app_error",
"translation": "WebRTC Gateway Admin Url must be set a valid URL and start with http:// or https://."
},
{
"id": "model.config.is_valid.webrtc_gateway_ws_url.app_error",
"translation": "WebRTC Gateway Websocket Url must be a valid URL and start with ws:// or wss://."
},
{
"id": "model.config.is_valid.webrtc_stun_uri.app_error",
"translation": "WebRTC STUN URI must be a valid URI and start with stun:"
},
{
"id": "model.config.is_valid.webrtc_turn_shared_key.app_error",
"translation": "WebRTC TURN Shared Key cannot be empty if the TURN URI has been set."
},
{
"id": "model.config.is_valid.webrtc_turn_uri.app_error",
"translation": "WebRTC TURN URI must be a valid URI and start with turn:"
},
{
"id": "model.config.is_valid.webrtc_turn_username.app_error",
"translation": "WebRTC TURN Username cannot be empty if the TURN URI has been set."
},
{
"id": "model.emoji.create_at.app_error",
"translation": "Create at must be a valid time"
......
......@@ -1898,3 +1898,14 @@ func (c *Client) SamlCertificateStatus(filename string) (map[string]interface{},
return StringInterfaceFromJson(r.Body), nil
}
}
// GetWebrtcToken if Successful returns a map with a valid token, stun server and turn server with credentials to use with
// the Mattermost WebRTC service, otherwise returns an AppError. Must be authenticated user.
func (c *Client) GetWebrtcToken() (map[string]string, *AppError) {
if r, err := c.DoApiPost("/webrtc/token", ""); err != nil {
return nil, err
} else {
defer closeBody(r)
return MapFromJson(r.Body), nil
}
}
......@@ -292,6 +292,17 @@ type NativeAppSettings struct {
IosAppDownloadLink *string
}
type WebrtcSettings struct {
Enable *bool
GatewayWebsocketUrl *string
GatewayAdminUrl *string
GatewayAdminSecret *string
StunURI *string
TurnURI *string
TurnUsername *string
TurnSharedKey *string
}
type Config struct {
ServiceSettings ServiceSettings
TeamSettings TeamSettings
......@@ -312,6 +323,7 @@ type Config struct {
SamlSettings SamlSettings
NativeAppSettings NativeAppSettings
ClusterSettings ClusterSettings
WebrtcSettings WebrtcSettings
}
func (o *Config) ToJson() string {
......@@ -881,6 +893,8 @@ func (o *Config) SetDefaults() {
o.NativeAppSettings.IosAppDownloadLink = new(string)
*o.NativeAppSettings.IosAppDownloadLink = "https://about.mattermost.com/mattermost-ios-app/"
}
o.defaultWebrtcSettings()
}
func (o *Config) IsValid() *AppError {
......@@ -1083,6 +1097,10 @@ func (o *Config) IsValid() *AppError {
return NewLocAppError("Config.IsValid", "model.config.is_valid.sitename_length.app_error", map[string]interface{}{"MaxLength": SITENAME_MAX_LENGTH}, "")
}
if err := o.isValidWebrtcSettings(); err != nil {
return err
}
return nil
}
......@@ -1121,3 +1139,71 @@ func (o *Config) Sanitize() {
o.SqlSettings.DataSourceReplicas[i] = FAKE_SETTING
}
}
func (o *Config) defaultWebrtcSettings() {
if o.WebrtcSettings.Enable == nil {
o.WebrtcSettings.Enable = new(bool)
*o.WebrtcSettings.Enable = false
}
if o.WebrtcSettings.GatewayWebsocketUrl == nil {
o.WebrtcSettings.GatewayWebsocketUrl = new(string)
*o.WebrtcSettings.GatewayWebsocketUrl = ""
}
if o.WebrtcSettings.GatewayAdminUrl == nil {
o.WebrtcSettings.GatewayAdminUrl = new(string)
*o.WebrtcSettings.GatewayAdminUrl = ""
}
if o.WebrtcSettings.GatewayAdminSecret == nil {
o.WebrtcSettings.GatewayAdminSecret = new(string)
*o.WebrtcSettings.GatewayAdminSecret = ""
}
if o.WebrtcSettings.StunURI == nil {
o.WebrtcSettings.StunURI = new(string)
*o.WebrtcSettings.StunURI = ""
}
if o.WebrtcSettings.TurnURI == nil {
o.WebrtcSettings.TurnURI = new(string)
*o.WebrtcSettings.TurnURI = ""
}
if o.WebrtcSettings.TurnUsername == nil {
o.WebrtcSettings.TurnUsername = new(string)
*o.WebrtcSettings.TurnUsername = ""
}
if o.WebrtcSettings.TurnSharedKey == nil {
o.WebrtcSettings.TurnSharedKey = new(string)
*o.WebrtcSettings.TurnSharedKey = ""
}
}
func (o *Config) isValidWebrtcSettings() *AppError {
if *o.WebrtcSettings.Enable {
if len(*o.WebrtcSettings.GatewayWebsocketUrl) == 0 || !IsValidWebsocketUrl(*o.WebrtcSettings.GatewayWebsocketUrl) {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_gateway_ws_url.app_error", nil, "")
} else if len(*o.WebrtcSettings.GatewayAdminUrl) == 0 || !IsValidHttpUrl(*o.WebrtcSettings.GatewayAdminUrl) {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_gateway_admin_url.app_error", nil, "")
} else if len(*o.WebrtcSettings.GatewayAdminSecret) == 0 {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_gateway_admin_secret.app_error", nil, "")
} else if len(*o.WebrtcSettings.StunURI) != 0 && !IsValidTurnOrStunServer(*o.WebrtcSettings.StunURI) {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_stun_uri.app_error", nil, "")
} else if len(*o.WebrtcSettings.TurnURI) != 0 {
if !IsValidTurnOrStunServer(*o.WebrtcSettings.TurnURI) {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_turn_uri.app_error", nil, "")
}
if len(*o.WebrtcSettings.TurnUsername) == 0 {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_turn_username.app_error", nil, "")
} else if len(*o.WebrtcSettings.TurnSharedKey) == 0 {
return NewLocAppError("Config.IsValid", "model.config.is_valid.webrtc_turn_shared_key.app_error", nil, "")
}
}
}
return nil
}
......@@ -43,7 +43,9 @@ type Features struct {
MHPNS *bool `json:"mhpns"`
SAML *bool `json:"saml"`
PasswordRequirements *bool `json:"password_requirements"`
FutureFeatures *bool `json:"future_features"`
// after we enabled more features for web rtc we'll need to control them with this
Webrtc *bool `json:"webrtc"`
FutureFeatures *bool `json:"future_features"`
}
func (f *Features) ToMap() map[string]interface{} {
......@@ -122,6 +124,11 @@ func (f *Features) SetDefaults() {
f.PasswordRequirements = new(bool)
*f.PasswordRequirements = *f.FutureFeatures
}
if f.Webrtc == nil {
f.Webrtc = new(bool)
*f.Webrtc = *f.FutureFeatures
}
}
func (l *License) IsExpired() bool {
......
......@@ -413,6 +413,18 @@ func IsValidHttpsUrl(rawUrl string) bool {
return true
}
func IsValidTurnOrStunServer(rawUri string) bool {
if strings.Index(rawUri, "turn:") != 0 && strings.Index(rawUri, "stun:") != 0 {
return false
}
if _, err := url.ParseRequestURI(rawUri); err != nil {
return false
}
return true
}
func IsSafeLink(link *string) bool {
if link != nil {
if IsValidHttpUrl(*link) {
......@@ -426,3 +438,15 @@ func IsSafeLink(link *string) bool {
return true
}
func IsValidWebsocketUrl(rawUrl string) bool {
if strings.Index(rawUrl, "ws://") != 0 && strings.Index(rawUrl, "wss://") != 0 {
return false
}
if _, err := url.ParseRequestURI(rawUrl); err != nil {
return false
}
return true
}
......@@ -25,6 +25,7 @@ const (
WEBSOCKET_EVENT_EPHEMERAL_MESSAGE = "ephemeral_message"
WEBSOCKET_EVENT_STATUS_CHANGE = "status_change"
WEBSOCKET_EVENT_HELLO = "hello"
WEBSOCKET_EVENT_WEBRTC = "webrtc"
)
type WebSocketMessage interface {
......
......@@ -337,6 +337,10 @@ func getClientConfig(c *model.Config) map[string]string {
props["PasswordRequireNumber"] = strconv.FormatBool(*c.PasswordSettings.Number)
props["PasswordRequireSymbol"] = strconv.FormatBool(*c.PasswordSettings.Symbol)
}
if *License.Features.Webrtc {
props["EnableWebrtc"] = strconv.FormatBool(*c.WebrtcSettings.Enable)
}
}
return props
......
......@@ -125,6 +125,7 @@ func getClientLicense(l *model.License) map[string]string {
props["Cluster"] = strconv.FormatBool(*l.Features.Cluster)
props["GoogleOAuth"] = strconv.FormatBool(*l.Features.GoogleOAuth)
props["Office365OAuth"] = strconv.FormatBool(*l.Features.Office365OAuth)
props["Webrtc"] = strconv.FormatBool(*l.Features.Webrtc)
props["Compliance"] = strconv.FormatBool(*l.Features.Compliance)
props["CustomBrand"] = strconv.FormatBool(*l.Features.CustomBrand)
props["MHPNS"] = strconv.FormatBool(*l.Features.MHPNS)
......
......@@ -180,6 +180,7 @@ export default class AdminSidebar extends React.Component {
let samlSettings = null;
let clusterSettings = null;
let complianceSettings = null;
let webrtcSettings = null;
let license = null;
let audits = null;
......@@ -256,6 +257,20 @@ export default class AdminSidebar extends React.Component {
);
}
if (global.window.mm_license.Webrtc === 'true') {
webrtcSettings = (
<AdminSidebarSection
name='webrtc'
title={
<FormattedMessage
id='admin.sidebar.webrtc'
defaultMessage='WebRTC'
/>
}
/>
);
}
oauthSettings = (
<AdminSidebarSection
name='oauth'
......@@ -572,6 +587,7 @@ export default class AdminSidebar extends React.Component {
/>
}
/>
{webrtcSettings}
<AdminSidebarSection
name='external'
title={
......
This diff is collapsed.
......@@ -392,6 +392,7 @@
"admin.image.thumbWidthTitle": "Attachment Thumbnail Width:",
"admin.integrations.custom": "Custom Integrations",
"admin.integrations.external": "External Services",
"admin.integrations.webrtc": "Mattermost WebRTC",
"admin.ldap.baseDesc": "The Base DN is the Distinguished Name of the location where Mattermost should start its search for users in the AD/LDAP tree.",
"admin.ldap.baseEx": "Ex \"ou=Unit Name,dc=corp,dc=example,dc=com\"",
"admin.ldap.baseTitle": "BaseDN:",
......@@ -823,6 +824,29 @@
"admin.user_item.switchToEmail": "Switch to Email/Password",
"admin.user_item.sysAdmin": "System Admin",
"admin.user_item.teamAdmin": "Team Admin",
"admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one on one</strong> video calls.",
"admin.webrtc.enableTitle": "Enable Mattermost WebRTC: ",
"admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
"admin.webrtc.gatewayAdminSecretExample": "Ex \"PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy\"",
"admin.webrtc.gatewayAdminSecretTitle": "Gateway Admin Secret:",
"admin.webrtc.gatewayAdminUrlDescription": "Enter https://<mattermost-webrtc-gateway-url>:<port>. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. Mattermost WebRTC uses this URL to obtain valid tokens for each peer to establish the connection.",
"admin.webrtc.gatewayAdminUrlExample": "Ex \"https://webrtc.mattermost.com:7089/admin\"",
"admin.webrtc.gatewayAdminUrlTitle": "Gateway Admin URL:",
"admin.webrtc.gatewayWebsocketUrlDescription": "Enter wss://<mattermost-webrtc-gateway-url>:<port>. Make sure you use WS or WSS in your URL depending on your server configuration. This is the websocket used to signal and establish communication between the peers.",
"admin.webrtc.gatewayWebsocketUrlExample": "Ex \"wss://webrtc.mattermost.com:8189\"",
"admin.webrtc.gatewayWebsocketUrlTitle": "Gateway Websocket URL:",
"admin.webrtc.stunUriDescription": "Enter your STUN URI as stun:<your-stun-url>:<port>. STUN is a standardized network protocol to allow an end host to assist devices to access its public IP address if it is located behind a NAT.",
"admin.webrtc.stunUriExample": "Ex \"stun:webrtc.mattermost.com:5349\"",
"admin.webrtc.stunUriTitle": "STUN URI",
"admin.webrtc.turnSharedKeyDescription": "Enter your TURN Server Shared Key. This is used to created dynamic passwords to establish the connection. Each password is valid for a short period of time.",
"admin.webrtc.turnSharedKeyExample": "Ex \"bXdkOWQxc3d0Ynk3emY5ZmsxZ3NtazRjaWg=\"",
"admin.webrtc.turnSharedKeyTitle": "TURN Shared Key:",
"admin.webrtc.turnUriDescription": "Enter your TURN URI as turn:<your-turn-url>:<port>. TURN is a standardized network protocol to allow an end host to assist devices to establish a connection by using a relay public IP address if it is located behind a symmetric NAT.",
"admin.webrtc.turnUriExample": "Ex \"turn:webrtc.mattermost.com:5349\"",
"admin.webrtc.turnUriTitle": "TURN URI",
"admin.webrtc.turnUsernameDescription": "Enter your TURN Server Username.",
"admin.webrtc.turnUsernameExample": "Ex \"myusername\"",
"admin.webrtc.turnUsernameTitle": "TURN Username:",
"admin.webserverModeDisabled": "Disabled",
"admin.webserverModeDisabledDescription": "The Mattermost server will not serve static files.",
"admin.webserverModeGzip": "gzip",
......
......@@ -27,6 +27,7 @@ import EmailSettings from 'components/admin_console/email_settings.jsx';
import PushSettings from 'components/admin_console/push_settings.jsx';
import CustomIntegrationsSettings from 'components/admin_console/custom_integrations_settings.jsx';
import ExternalServiceSettings from 'components/admin_console/external_service_settings.jsx';
import WebrtcSettings from 'components/admin_console/webrtc_settings.jsx';
import DatabaseSettings from 'components/admin_console/database_settings.jsx';
import StorageSettings from 'components/admin_console/storage_settings.jsx';
import ImageSettings from 'components/admin_console/image_settings.jsx';
......@@ -147,6 +148,10 @@ export default (
path='external'
component={ExternalServiceSettings}
/>
<Route
path='webrtc'
component={WebrtcSettings}
/>
</Route>
<Route path='files'>
<IndexRedirect to='storage'/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment