Adding ability to serve TLS directly from Mattermost server (#4119)
Этот коммит содержится в:
Christopher Speller
коммит произвёл
GitHub
GitHub
родитель
5f8e5c401b
Коммит
8f91c77755
@@ -11,6 +11,8 @@ import SettingsGroup from './settings_group.jsx';
|
||||
import TextSetting from './text_setting.jsx';
|
||||
import ReloadConfigButton from './reload_config.jsx';
|
||||
import WebserverModeDropdownSetting from './webserver_mode_dropdown_setting.jsx';
|
||||
import {ConnectionSecurityDropdownSettingWebserver} from './connection_security_dropdown_setting.jsx';
|
||||
import BooleanSetting from './boolean_setting.jsx';
|
||||
|
||||
export default class ConfigurationSettings extends AdminSettings {
|
||||
constructor(props) {
|
||||
@@ -31,6 +33,14 @@ export default class ConfigurationSettings extends AdminSettings {
|
||||
config.ServiceSettings.SiteURL = this.state.siteURL;
|
||||
config.ServiceSettings.ListenAddress = this.state.listenAddress;
|
||||
config.ServiceSettings.WebserverMode = this.state.webserverMode;
|
||||
config.ServiceSettings.ConnectionSecurity = this.state.connectionSecurity;
|
||||
config.ServiceSettings.TLSCertFile = this.state.TLSCertFile;
|
||||
config.ServiceSettings.TLSKeyFile = this.state.TLSKeyFile;
|
||||
config.ServiceSettings.UseLetsEncrypt = this.state.useLetsEncrypt;
|
||||
config.ServiceSettings.LetsEncryptCertificateCacheFile = this.state.letsEncryptCertificateCacheFile;
|
||||
config.ServiceSettings.Forward80To443 = this.state.forward80To443;
|
||||
config.ServiceSettings.ReadTimeout = this.parseIntNonZero(this.state.readTimeout);
|
||||
config.ServiceSettings.WriteTimeout = this.parseIntNonZero(this.state.writeTimeout);
|
||||
|
||||
return config;
|
||||
}
|
||||
@@ -39,7 +49,15 @@ export default class ConfigurationSettings extends AdminSettings {
|
||||
return {
|
||||
siteURL: config.ServiceSettings.SiteURL,
|
||||
listenAddress: config.ServiceSettings.ListenAddress,
|
||||
webserverMode: config.ServiceSettings.WebserverMode
|
||||
webserverMode: config.ServiceSettings.WebserverMode,
|
||||
connectionSecurity: config.ServiceSettings.ConnectionSecurity,
|
||||
TLSCertFile: config.ServiceSettings.TLSCertFile,
|
||||
TLSKeyFile: config.ServiceSettings.TLSKeyFile,
|
||||
useLetsEncrypt: config.ServiceSettings.UseLetsEncrypt,
|
||||
letsEncryptCertificateCacheFile: config.ServiceSettings.LetsEncryptCertificateCacheFile,
|
||||
forward80To443: config.ServiceSettings.Forward80To443,
|
||||
readTimeout: config.ServiceSettings.ReadTimeout,
|
||||
writeTimeout: config.ServiceSettings.WriteTimeout
|
||||
};
|
||||
}
|
||||
|
||||
@@ -57,6 +75,14 @@ export default class ConfigurationSettings extends AdminSettings {
|
||||
renderSettings() {
|
||||
return (
|
||||
<SettingsGroup>
|
||||
<div className='banner'>
|
||||
<div className='banner__content'>
|
||||
<FormattedMessage
|
||||
id='admin.rate.noteDescription'
|
||||
defaultMessage='Changing properties in this section will require a server restart before taking effect.'
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<TextSetting
|
||||
id='siteURL'
|
||||
label={
|
||||
@@ -87,12 +113,139 @@ export default class ConfigurationSettings extends AdminSettings {
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.listenDescription'
|
||||
defaultMessage='The address to which to bind and listen. Entering ":8065" will bind to all interfaces or you can choose one like "127.0.0.1:8065". Changing this will require a server restart before taking effect.'
|
||||
defaultMessage='The address to which to bind and listen. Entering ":8065" will bind to all interfaces or you can choose one like "127.0.0.1:8065". If you choose a low number port, you must have permissions to bind to that port. On Linux you can use: "sudo setcap cap_net_bind_service=+ep ./bin/platform" to allow Mattermost to bind to low ports.'
|
||||
/>
|
||||
}
|
||||
value={this.state.listenAddress}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<ConnectionSecurityDropdownSettingWebserver
|
||||
value={this.state.connectionSecurity}
|
||||
onChange={this.handleChange}
|
||||
disabled={false}
|
||||
/>
|
||||
<TextSetting
|
||||
id='TLSCertFile'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.tlsCertFile'
|
||||
defaultMessage='TLS Certificate File:'
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.tlsCertFileDescription'
|
||||
defaultMessage='The certificate file to use.'
|
||||
/>
|
||||
}
|
||||
disabled={this.state.useLetsEncrypt}
|
||||
value={this.state.TLSCertFile}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<TextSetting
|
||||
id='TLSKeyFile'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.tlsKeyFile'
|
||||
defaultMessage='TLS Key File:'
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.tlsKeyFileDescription'
|
||||
defaultMessage='The private key file to use.'
|
||||
/>
|
||||
}
|
||||
disabled={this.state.useLetsEncrypt}
|
||||
value={this.state.TLSKeyFile}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<BooleanSetting
|
||||
id='useLetsEncrypt'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.useLetsEncrypt'
|
||||
defaultMessage="Use Let's Encrypt:"
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.useLetsEncryptDescription'
|
||||
defaultMessage="Enable the automatic retreval of certificates from the Let's Encrypt. The certificate will be retrieved when a client attempts to connect from a new domain. This will work with multiple domains."
|
||||
/>
|
||||
}
|
||||
value={this.state.useLetsEncrypt}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<TextSetting
|
||||
id='letsEncryptCertificateCacheFile'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.letsEncryptCertificateCacheFile'
|
||||
defaultMessage="Let's Encrypt Certificate Cache File:"
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.letsEncryptCertificateCacheFileDescription'
|
||||
defaultMessage="Certificates retrieved and other data about the Let's Encrypt service will be stored in this file."
|
||||
/>
|
||||
}
|
||||
disabled={!this.state.useLetsEncrypt}
|
||||
value={this.state.letsEncryptCertificateCacheFile}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<BooleanSetting
|
||||
id='forward80To443'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.forward80To443'
|
||||
defaultMessage='Forward port 80 to 443:'
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.forward80To443Description'
|
||||
defaultMessage='Forwards all insecure traffic from port 80 to secure port 443'
|
||||
/>
|
||||
}
|
||||
value={this.state.forward80To443}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<TextSetting
|
||||
id='readTimeout'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.readTimeout'
|
||||
defaultMessage='Read Timeout:'
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.readTimeoutDescription'
|
||||
defaultMessage='Maximum time allowed from when the connection is accepted to when the request body is fully read.'
|
||||
/>
|
||||
}
|
||||
value={this.state.readTimeout}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<TextSetting
|
||||
id='writeTimeout'
|
||||
label={
|
||||
<FormattedMessage
|
||||
id='admin.service.writeTimeout'
|
||||
defaultMessage='Write Timeout:'
|
||||
/>
|
||||
}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
id='admin.service.writeTimeoutDescription'
|
||||
defaultMessage='If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.'
|
||||
/>
|
||||
}
|
||||
value={this.state.writeTimeout}
|
||||
onChange={this.handleChange}
|
||||
/>
|
||||
<WebserverModeDropdownSetting
|
||||
value={this.state.webserverMode}
|
||||
onChange={this.handleChange}
|
||||
|
||||
Ссылка в новой задаче
Block a user