diff --git a/api/server.go b/api/server.go index 3273e766c3..a2f5fe552b 100644 --- a/api/server.go +++ b/api/server.go @@ -42,7 +42,7 @@ func StartServer() { var handler http.Handler = Srv.Router - if utils.Cfg.RateLimitSettings.UseRateLimiter { + if utils.Cfg.RateLimitSettings.EnableRateLimiter { l4g.Info("RateLimiter is enabled") vary := throttled.VaryBy{} diff --git a/config/config.json b/config/config.json index f9c49678fb..e1907152b4 100644 --- a/config/config.json +++ b/config/config.json @@ -1,12 +1,4 @@ { - "LogSettings": { - "ConsoleEnable": true, - "ConsoleLevel": "DEBUG", - "FileEnable": true, - "FileLevel": "INFO", - "FileFormat": "", - "FileLocation": "" - }, "ServiceSettings": { "SiteName": "Mattermost", "Mode": "dev", @@ -19,7 +11,18 @@ "ResetSalt": "IPxFzSfnDFsNsRafZxz8NaYqFKhf9y2t", "AnalyticsUrl": "", "AllowedLoginAttempts": 10, - "EnableOAuthServiceProvider": false + "EnableOAuthServiceProvider": false, + "SegmentDeveloperKey": "", + "GoogleDeveloperKey": "" + }, + "TeamSettings": { + "MaxUsersPerTeam": 150, + "AllowPublicLink": true, + "AllowValetDefault": false, + "TourLink": "", + "DefaultThemeColor": "#2389D7", + "DisableTeamCreation": false, + "RestrictCreationToDomains": "" }, "SqlSettings": { "DriverName": "mysql", @@ -32,6 +35,14 @@ "Trace": false, "AtRestEncryptKey": "Ya0xMrybACJ3sZZVWQC7e31h5nSDWZFS" }, + "LogSettings": { + "ConsoleEnable": true, + "ConsoleLevel": "DEBUG", + "FileEnable": true, + "FileLevel": "INFO", + "FileFormat": "", + "FileLocation": "" + }, "ImageSettings": { "DriverName": "local", "Directory": "./data/", @@ -63,7 +74,7 @@ "ApplePushCertPrivate": "" }, "RateLimitSettings": { - "UseRateLimiter": true, + "EnableRateLimiter": true, "PerSec": 10, "MemoryStoreSize": 10000, "VaryByRemoteAddr": true, @@ -71,23 +82,8 @@ }, "PrivacySettings": { "ShowEmailAddress": true, - "ShowPhoneNumber": true, - "ShowSkypeId": true, "ShowFullName": true }, - "ClientSettings": { - "SegmentDeveloperKey": "", - "GoogleDeveloperKey": "" - }, - "TeamSettings": { - "MaxUsersPerTeam": 150, - "AllowPublicLink": true, - "AllowValetDefault": false, - "TourLink": "", - "DefaultThemeColor": "#2389D7", - "DisableTeamCreation": false, - "RestrictCreationToDomains": "" - }, "SSOSettings": { "gitlab": { "Allow": false, diff --git a/model/config.go b/model/config.go index 3c0ada423f..d4eb1e714c 100644 --- a/model/config.go +++ b/model/config.go @@ -30,6 +30,8 @@ type ServiceSettings struct { AnalyticsUrl string AllowedLoginAttempts int EnableOAuthServiceProvider bool + SegmentDeveloperKey string + GoogleDeveloperKey string } type SSOSetting struct { @@ -96,11 +98,11 @@ type EmailSettings struct { } type RateLimitSettings struct { - UseRateLimiter bool - PerSec int - MemoryStoreSize int - VaryByRemoteAddr bool - VaryByHeader string + EnableRateLimiter bool + PerSec int + MemoryStoreSize int + VaryByRemoteAddr bool + VaryByHeader string } type PrivacySettings struct { @@ -108,11 +110,6 @@ type PrivacySettings struct { ShowFullName bool } -type ClientSettings struct { - SegmentDeveloperKey string - GoogleDeveloperKey string -} - type TeamSettings struct { MaxUsersPerTeam int AllowPublicLink bool @@ -124,15 +121,14 @@ type TeamSettings struct { } type Config struct { - LogSettings LogSettings ServiceSettings ServiceSettings + TeamSettings TeamSettings SqlSettings SqlSettings + LogSettings LogSettings ImageSettings ImageSettings EmailSettings EmailSettings RateLimitSettings RateLimitSettings PrivacySettings PrivacySettings - ClientSettings ClientSettings - TeamSettings TeamSettings SSOSettings map[string]SSOSetting } diff --git a/utils/config.go b/utils/config.go index cef99d7d97..5b7cc7c64e 100644 --- a/utils/config.go +++ b/utils/config.go @@ -176,6 +176,8 @@ func getClientProperties(c *model.Config) map[string]string { props["SiteName"] = c.ServiceSettings.SiteName props["AnalyticsUrl"] = c.ServiceSettings.AnalyticsUrl props["EnableOAuthServiceProvider"] = strconv.FormatBool(c.ServiceSettings.EnableOAuthServiceProvider) + props["SegmentDeveloperKey"] = c.ServiceSettings.SegmentDeveloperKey + props["GoogleDeveloperKey"] = c.ServiceSettings.GoogleDeveloperKey props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications) props["AllowSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.AllowSignUpWithEmail) @@ -186,9 +188,6 @@ func getClientProperties(c *model.Config) map[string]string { props["ShowEmailAddress"] = strconv.FormatBool(c.PrivacySettings.ShowEmailAddress) props["AllowPublicLink"] = strconv.FormatBool(c.TeamSettings.AllowPublicLink) - props["SegmentDeveloperKey"] = c.ClientSettings.SegmentDeveloperKey - props["GoogleDeveloperKey"] = c.ClientSettings.GoogleDeveloperKey - props["ProfileHeight"] = fmt.Sprintf("%v", c.ImageSettings.ProfileHeight) props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth) props["ProfileWidth"] = fmt.Sprintf("%v", c.ImageSettings.ProfileWidth) diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 9db1c945e1..0cd3500e55 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -11,6 +11,7 @@ var LogSettingsTab = require('./log_settings.jsx'); var LogsTab = require('./logs.jsx'); var ImageSettingsTab = require('./image_settings.jsx'); var PrivacySettingsTab = require('./privacy_settings.jsx'); +var RateSettingsTab = require('./rate_settings.jsx'); export default class AdminController extends React.Component { constructor(props) { @@ -59,6 +60,8 @@ export default class AdminController extends React.Component { tab = ; } else if (this.state.selected === 'privacy_settings') { tab = ; + } else if (this.state.selected === 'rate_settings') { + tab = ; } } diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx index 5f471ec2cb..f21511cb99 100644 --- a/web/react/components/admin_console/admin_sidebar.jsx +++ b/web/react/components/admin_console/admin_sidebar.jsx @@ -83,6 +83,15 @@ export default class AdminSidebar extends React.Component { {'Privacy Settings'} +
  • + + {'Rate Limit Settings'} + +
    • diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx new file mode 100644 index 0000000000..6c0f070da7 --- /dev/null +++ b/web/react/components/admin_console/rate_settings.jsx @@ -0,0 +1,272 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + +var Client = require('../../utils/client.jsx'); +var AsyncClient = require('../../utils/async_client.jsx'); + +export default class RateSettings extends React.Component { + constructor(props) { + super(props); + + this.handleChange = this.handleChange.bind(this); + this.handleSubmit = this.handleSubmit.bind(this); + + this.state = { + EnableRateLimiter: this.props.config.RateLimitSettings.EnableRateLimiter, + VaryByRemoteAddr: this.props.config.RateLimitSettings.VaryByRemoteAddr, + saveNeeded: false, + serverError: null + }; + } + + handleChange(action) { + var s = {saveNeeded: true, serverError: this.state.serverError}; + + if (action === 'EnableRateLimiterTrue') { + s.EnableRateLimiter = true; + } + + if (action === 'EnableRateLimiterFalse') { + s.EnableRateLimiter = false; + } + + if (action === 'VaryByRemoteAddrTrue') { + s.VaryByRemoteAddr = true; + } + + if (action === 'VaryByRemoteAddrFalse') { + s.VaryByRemoteAddr = false; + } + + this.setState(s); + } + + handleSubmit(e) { + e.preventDefault(); + $('#save-button').button('loading'); + + var config = this.props.config; + config.RateLimitSettings.EnableRateLimiter = React.findDOMNode(this.refs.EnableRateLimiter).checked; + config.RateLimitSettings.VaryByRemoteAddr = React.findDOMNode(this.refs.VaryByRemoteAddr).checked; + config.RateLimitSettings.VaryByHeader = React.findDOMNode(this.refs.VaryByHeader).value.trim(); + + var PerSec = 10; + if (!isNaN(parseInt(React.findDOMNode(this.refs.PerSec).value, 10))) { + PerSec = parseInt(React.findDOMNode(this.refs.PerSec).value, 10); + } + config.RateLimitSettings.PerSec = PerSec; + React.findDOMNode(this.refs.PerSec).value = PerSec; + + var MemoryStoreSize = 10000; + if (!isNaN(parseInt(React.findDOMNode(this.refs.MemoryStoreSize).value, 10))) { + MemoryStoreSize = parseInt(React.findDOMNode(this.refs.MemoryStoreSize).value, 10); + } + config.RateLimitSettings.MemoryStoreSize = MemoryStoreSize; + React.findDOMNode(this.refs.MemoryStoreSize).value = MemoryStoreSize; + + Client.saveConfig( + config, + () => { + AsyncClient.getConfig(); + this.setState({ + serverError: null, + saveNeeded: false + }); + $('#save-button').button('reset'); + }, + (err) => { + this.setState({ + serverError: err.message, + saveNeeded: true + }); + $('#save-button').button('reset'); + } + ); + } + + render() { + var serverError = ''; + if (this.state.serverError) { + serverError =
    ; + } + + var saveClass = 'btn'; + if (this.state.saveNeeded) { + saveClass = 'btn btn-primary'; + } + + return ( +
    + +
    +
    +

    {'Note:'}

    +

    {'Changing properties in this section will require a server restart before taking effect.'}

    +
    +
    + +

    {'Rate Limit Settings'}

    +
    + +
    + +
    + + +

    {'When enabled throttles rate at which APIs respond.'}

    +
    +
    + +
    + +
    + +

    {'Height of profile picture.'}

    +
    +
    + +
    + +
    + +

    {'Maximum number of users sessions connected to the system as determined by VaryByRemoteAddr and VaryByHeader variables.'}

    +
    +
    + +
    + +
    + + +

    {'Rate limit API access by IP address.'}

    +
    +
    + +
    + +
    + +

    {'When filled in, vary rate limiting by http header field specified (e.g. when configuring ngnix set to "X-Real-IP", when configuring AmazonELB set to "X-Forwarded-For").'}

    +
    +
    + +
    +
    + {serverError} + +
    +
    + +
    +
    + ); + } +} + +RateSettings.propTypes = { + config: React.PropTypes.object +};