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

stevepartridge · May 4, 2017 · d4a76ff · d4a76ff
1 parent 5daa462
commit d4a76ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/admin_console/saml_settings.jsx b/components/admin_console/saml_settings.jsx
@@ -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}

diff --git a/i18n/en.json b/i18n/en.json
@@ -628,7 +628,7 @@
  "admin.saml.emailAttrTitle": "Email Attribute:",
  "admin.saml.enableDescription": "When true, Mattermost allows login using SAML. Please see <a href='http:https://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...",