diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-10-01 07:27:32 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-10-01 07:27:32 -0400 |
| commit | be300b7e7db41658576604c0594f368427b5de2b (patch) | |
| tree | 2eb52260127696c8d9271c918e4273d3268f8041 /web/react/components | |
| parent | 9ce826863bdb279b5b19e16c30cd02b8bbae1ff4 (diff) | |
| parent | a15115d2c0f4fa9cd26c00059e39ae803126717e (diff) | |
| download | chat-be300b7e7db41658576604c0594f368427b5de2b.tar.gz chat-be300b7e7db41658576604c0594f368427b5de2b.tar.bz2 chat-be300b7e7db41658576604c0594f368427b5de2b.zip | |
Merge pull request #859 from mattermost/PLT-409
PLT-409 add warning to at rest salt gen
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/admin_console/sql_settings.jsx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/web/react/components/admin_console/sql_settings.jsx b/web/react/components/admin_console/sql_settings.jsx index 430a7453b..0e0ceb9af 100644 --- a/web/react/components/admin_console/sql_settings.jsx +++ b/web/react/components/admin_console/sql_settings.jsx @@ -73,6 +73,12 @@ export default class SqlSettings extends React.Component { handleGenerate(e) { e.preventDefault(); + + var cfm = global.window.confirm('Warning: re-generating this salt may cause some columns in the database to return empty results.'); + if (cfm === false) { + return; + } + React.findDOMNode(this.refs.AtRestEncryptKey).value = crypto.randomBytes(256).toString('base64').substring(0, 32); var s = {saveNeeded: true, serverError: this.state.serverError}; this.setState(s); |