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

PLT-6444 switching SAML props to default true (#6330)

Browse Source
This commit is contained in:
Corey Hulen
2017-05-04 11:11:28 -07:00
committed by Christopher Speller
parent 152bc14fcb
commit 4f074fed0d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.json
View File

@@ -221,8 +221,8 @@
},
"SamlSettings": {
"Enable": false,
"Verify": false,
"Encrypt": false,
"Verify": true,
"Encrypt": true,
"IdpUrl": "",
"IdpDescriptorUrl": "",
"AssertionConsumerServiceURL": "",

4
model/config.go
View File

@@ -1002,12 +1002,12 @@ func (o *Config) SetDefaults() {
if o.SamlSettings.Verify == nil {
o.SamlSettings.Verify = new(bool)
*o.SamlSettings.Verify = false
*o.SamlSettings.Verify = true
}
if o.SamlSettings.Encrypt == nil {
o.SamlSettings.Encrypt = new(bool)
*o.SamlSettings.Encrypt = false
*o.SamlSettings.Encrypt = true
}
if o.SamlSettings.IdpUrl == nil {

4
webapp/components/admin_console/saml_settings.jsx
View File

@@ -368,7 +368,7 @@ export default class SamlSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.saml.verifyDescription'
defaultMessage='When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL'
defaultMessage='When false, Mattermost will not verify that the signature sent from a SAML Response matches the Service Provider Login URL. Not recommended for production environments. For testing only.'
/>
}
value={this.state.verify}
@@ -405,7 +405,7 @@ export default class SamlSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.saml.encryptDescription'
defaultMessage='When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.'
defaultMessage='When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.'
/>
}
value={this.state.encrypt}

4
webapp/i18n/en.json
View File

@@ -628,7 +628,7 @@
"admin.saml.emailAttrTitle": "Email Attribute:",
"admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http://docs.mattermost.com/deployment/sso-saml.html' target='_blank'>documentation</a> to learn more about configuring SAML for Mattermost.",
"admin.saml.enableTitle": "Enable Login With SAML:",
"admin.saml.encryptDescription": "When true, Mattermost will decrypt SAML Assertions encrypted with your Service Provider Public Certificate.",
"admin.saml.encryptDescription": "When false, Mattermost will not decrypt SAML Assertions encrypted with your Service Provider Public Certificate. Not recommended for production environments. For testing only.",
"admin.saml.encryptTitle": "Enable Encryption:",
"admin.saml.firstnameAttrDesc": "(Optional) The attribute in the SAML Assertion that will be used to populate the first name of users in Mattermost.",
"admin.saml.firstnameAttrEx": "E.g.: \"FirstName\"",
@@ -673,7 +673,7 @@
"admin.saml.usernameAttrDesc": "The attribute in the SAML Assertion that will be used to populate the username field in Mattermost.",
"admin.saml.usernameAttrEx": "E.g.: \"Username\"",
"admin.saml.usernameAttrTitle": "Username Attribute:",
"admin.saml.verifyDescription": "When true, Mattermost verifies that the signature sent from the SAML Response matches the Service Provider Login URL",
"admin.saml.verifyDescription": "When false, Mattermost will not verify that the signature sent from a SAML Response matches the Service Provider Login URL. Not recommended for production environments. For testing only.",
"admin.saml.verifyTitle": "Verify Signature:",
"admin.save": "Save",
"admin.saving": "Saving Config...",