IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1924 from loafoe/master

Browse Source 
[#1923] Make Websocket ports configurable
This commit is contained in:
Christopher Speller
2016-01-21 10:01:15 -05:00
parent 868eece987 ff8df5bf7d
commit c7faefbedc
5 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/install/Configuration-Settings.md
View File

@@ -41,6 +41,13 @@ Set the number of days before SSO sessions expire.
```"SessionCacheInMinutes" : 10```
Set the number of minutes to cache a session in memory.
```"WebsocketSecurePort": 443```
The port to use for secure websocket connections being initiated from the client. By default wss:// uses port 443. Some server configurations (e.g. Cloudfoundry) support wss on a different port.
```"WebsocketPort": 80```
The port to use for websocket connections being initiated from the client. By default ws:// uses port 80.
#### Webhooks
```"EnableIncomingWebhooks": true```

10
model/config.go
View File

@@ -40,6 +40,8 @@ type ServiceSettings struct {
SessionLengthMobileInDays *int
SessionLengthSSOInDays *int
SessionCacheInMinutes *int
WebsocketSecurePort *int
WebsocketPort *int
}
type SSOSettings struct {
@@ -330,6 +332,14 @@ func (o *Config) SetDefaults() {
o.ServiceSettings.SessionCacheInMinutes = new(int)
*o.ServiceSettings.SessionCacheInMinutes = 10
}
if o.ServiceSettings.WebsocketPort == nil {
o.ServiceSettings.WebsocketPort = new(int)
*o.ServiceSettings.WebsocketPort = 80
}
if o.ServiceSettings.WebsocketSecurePort == nil {
o.ServiceSettings.WebsocketSecurePort = new(int)
*o.ServiceSettings.WebsocketSecurePort = 443
}
}
func (o *Config) IsValid() *AppError {

3
utils/config.go
View File

@@ -223,5 +223,8 @@ func getClientConfig(c *model.Config) map[string]string {
props["EnableLdap"] = strconv.FormatBool(*c.LdapSettings.Enable)
props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort)
props["WebsocketSecurePort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketSecurePort)
return props
}

2
web/react/stores/socket_store.jsx
View File

@@ -49,7 +49,7 @@ class SocketStoreClass extends EventEmitter {
protocol = 'wss://';
}
var connUrl = protocol + location.host + '/api/v1/websocket?' + Utils.getSessionIndex();
var connUrl = protocol + location.host + ((/:\d+/).test(location.host) ? '' : Utils.getWebsocketPort(protocol)) + '/api/v1/websocket?' + Utils.getSessionIndex();
if (this.failCount === 0) {
console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console

11
web/react/utils/utils.jsx
View File

@@ -1101,6 +1101,17 @@ export function getFileName(path) {
return split[split.length - 1];
}
// Gets the websocket port to use. Configurable on the server.
export function getWebsocketPort(protocol) {
if ((/^wss:/).test(protocol)) { // wss://
return ':' + global.window.mm_config.WebsocketSecurePort;
}
if ((/^ws:/).test(protocol)) {
return ':' + global.window.mm_config.WebsocketPort;
}
return '';
}
export function getSessionIndex() {
if (global.window.mm_session_token_index >= 0) {
return 'session_token_index=' + global.window.mm_session_token_index;