[MM-37755] Idiomatic naming (SMTP, TLS, TCP, XML, CSS, HTML, HTTP) (#18103)
Этот коммит содержится в:
Ben Schumacher
коммит произвёл
GitHub
GitHub
родитель
bd65e8daf9
Коммит
fd853e74a6
@@ -27,7 +27,7 @@ import (
|
||||
const (
|
||||
ConnSecurityNone = ""
|
||||
ConnSecurityPlain = "PLAIN"
|
||||
ConnSecurityTls = "TLS"
|
||||
ConnSecurityTLS = "TLS"
|
||||
ConnSecurityStarttls = "STARTTLS"
|
||||
|
||||
ImageDriverLocal = "local"
|
||||
@@ -100,8 +100,8 @@ const (
|
||||
SitenameMaxLength = 30
|
||||
|
||||
ServiceSettingsDefaultSiteUrl = "http://localhost:8065"
|
||||
ServiceSettingsDefaultTlsCertFile = ""
|
||||
ServiceSettingsDefaultTlsKeyFile = ""
|
||||
ServiceSettingsDefaultTLSCertFile = ""
|
||||
ServiceSettingsDefaultTLSKeyFile = ""
|
||||
ServiceSettingsDefaultReadTimeout = 300
|
||||
ServiceSettingsDefaultWriteTimeout = 300
|
||||
ServiceSettingsDefaultIdleTimeout = 60
|
||||
@@ -483,11 +483,11 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
|
||||
}
|
||||
|
||||
if s.TLSKeyFile == nil {
|
||||
s.TLSKeyFile = NewString(ServiceSettingsDefaultTlsKeyFile)
|
||||
s.TLSKeyFile = NewString(ServiceSettingsDefaultTLSKeyFile)
|
||||
}
|
||||
|
||||
if s.TLSCertFile == nil {
|
||||
s.TLSCertFile = NewString(ServiceSettingsDefaultTlsCertFile)
|
||||
s.TLSCertFile = NewString(ServiceSettingsDefaultTLSCertFile)
|
||||
}
|
||||
|
||||
if s.TLSMinVer == nil {
|
||||
@@ -2870,8 +2870,8 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
|
||||
|
||||
type GlobalRelayMessageExportSettings struct {
|
||||
CustomerType *string `access:"compliance_compliance_export"` // must be either A9 or A10, dictates SMTP server url
|
||||
SmtpUsername *string `access:"compliance_compliance_export"`
|
||||
SmtpPassword *string `access:"compliance_compliance_export"`
|
||||
SMTPUsername *string `access:"compliance_compliance_export"`
|
||||
SMTPPassword *string `access:"compliance_compliance_export"`
|
||||
EmailAddress *string `access:"compliance_compliance_export"` // the address to send messages to
|
||||
SMTPServerTimeout *int `access:"compliance_compliance_export"`
|
||||
}
|
||||
@@ -2880,11 +2880,11 @@ func (s *GlobalRelayMessageExportSettings) SetDefaults() {
|
||||
if s.CustomerType == nil {
|
||||
s.CustomerType = NewString(GlobalrelayCustomerTypeA9)
|
||||
}
|
||||
if s.SmtpUsername == nil {
|
||||
s.SmtpUsername = NewString("")
|
||||
if s.SMTPUsername == nil {
|
||||
s.SMTPUsername = NewString("")
|
||||
}
|
||||
if s.SmtpPassword == nil {
|
||||
s.SmtpPassword = NewString("")
|
||||
if s.SMTPPassword == nil {
|
||||
s.SMTPPassword = NewString("")
|
||||
}
|
||||
if s.EmailAddress == nil {
|
||||
s.EmailAddress = NewString("")
|
||||
@@ -3445,7 +3445,7 @@ func (s *FileSettings) isValid() *AppError {
|
||||
}
|
||||
|
||||
func (s *EmailSettings) isValid() *AppError {
|
||||
if !(*s.ConnectionSecurity == ConnSecurityNone || *s.ConnectionSecurity == ConnSecurityTls || *s.ConnectionSecurity == ConnSecurityStarttls || *s.ConnectionSecurity == ConnSecurityPlain) {
|
||||
if !(*s.ConnectionSecurity == ConnSecurityNone || *s.ConnectionSecurity == ConnSecurityTLS || *s.ConnectionSecurity == ConnSecurityStarttls || *s.ConnectionSecurity == ConnSecurityPlain) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.email_security.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
@@ -3481,7 +3481,7 @@ func (s *RateLimitSettings) isValid() *AppError {
|
||||
}
|
||||
|
||||
func (s *LdapSettings) isValid() *AppError {
|
||||
if !(*s.ConnectionSecurity == ConnSecurityNone || *s.ConnectionSecurity == ConnSecurityTls || *s.ConnectionSecurity == ConnSecurityStarttls) {
|
||||
if !(*s.ConnectionSecurity == ConnSecurityNone || *s.ConnectionSecurity == ConnSecurityTLS || *s.ConnectionSecurity == ConnSecurityStarttls) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.ldap_security.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
@@ -3542,11 +3542,11 @@ func (s *LdapSettings) isValid() *AppError {
|
||||
|
||||
func (s *SamlSettings) isValid() *AppError {
|
||||
if *s.Enable {
|
||||
if *s.IdpUrl == "" || !IsValidHttpUrl(*s.IdpUrl) {
|
||||
if *s.IdpUrl == "" || !IsValidHTTPUrl(*s.IdpUrl) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.saml_idp_url.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.IdpDescriptorUrl == "" || !IsValidHttpUrl(*s.IdpDescriptorUrl) {
|
||||
if *s.IdpDescriptorUrl == "" || !IsValidHTTPUrl(*s.IdpDescriptorUrl) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.saml_idp_descriptor_url.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
@@ -3567,7 +3567,7 @@ func (s *SamlSettings) isValid() *AppError {
|
||||
}
|
||||
|
||||
if *s.Verify {
|
||||
if *s.AssertionConsumerServiceURL == "" || !IsValidHttpUrl(*s.AssertionConsumerServiceURL) {
|
||||
if *s.AssertionConsumerServiceURL == "" || !IsValidHTTPUrl(*s.AssertionConsumerServiceURL) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.saml_assertion_consumer_service_url.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
}
|
||||
@@ -3616,11 +3616,11 @@ func (s *SamlSettings) isValid() *AppError {
|
||||
}
|
||||
|
||||
func (s *ServiceSettings) isValid() *AppError {
|
||||
if !(*s.ConnectionSecurity == ConnSecurityNone || *s.ConnectionSecurity == ConnSecurityTls) {
|
||||
if !(*s.ConnectionSecurity == ConnSecurityNone || *s.ConnectionSecurity == ConnSecurityTLS) {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.webserver_security.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.ConnectionSecurity == ConnSecurityTls && !*s.UseLetsEncrypt {
|
||||
if *s.ConnectionSecurity == ConnSecurityTLS && !*s.UseLetsEncrypt {
|
||||
appErr := NewAppError("Config.IsValid", "model.config.is_valid.tls_cert_file_missing.app_error", nil, "", http.StatusBadRequest)
|
||||
|
||||
if *s.TLSCertFile == "" {
|
||||
@@ -3811,9 +3811,9 @@ func (s *MessageExportSettings) isValid() *AppError {
|
||||
// validating email addresses is hard - just make sure it contains an '@' sign
|
||||
// see https://stackoverflow.com/questions/201323/using-a-regular-expression-to-validate-an-email-address
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.email_address.app_error", nil, "", http.StatusBadRequest)
|
||||
} else if s.GlobalRelaySettings.SmtpUsername == nil || *s.GlobalRelaySettings.SmtpUsername == "" {
|
||||
} else if s.GlobalRelaySettings.SMTPUsername == nil || *s.GlobalRelaySettings.SMTPUsername == "" {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.smtp_username.app_error", nil, "", http.StatusBadRequest)
|
||||
} else if s.GlobalRelaySettings.SmtpPassword == nil || *s.GlobalRelaySettings.SmtpPassword == "" {
|
||||
} else if s.GlobalRelaySettings.SMTPPassword == nil || *s.GlobalRelaySettings.SMTPPassword == "" {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.message_export.global_relay.smtp_password.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
}
|
||||
@@ -3914,8 +3914,8 @@ func (o *Config) Sanitize() {
|
||||
o.SqlSettings.DataSourceSearchReplicas[i] = FakeSetting
|
||||
}
|
||||
|
||||
if o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != nil && *o.MessageExportSettings.GlobalRelaySettings.SmtpPassword != "" {
|
||||
*o.MessageExportSettings.GlobalRelaySettings.SmtpPassword = FakeSetting
|
||||
if o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != nil && *o.MessageExportSettings.GlobalRelaySettings.SMTPPassword != "" {
|
||||
*o.MessageExportSettings.GlobalRelaySettings.SMTPPassword = FakeSetting
|
||||
}
|
||||
|
||||
if o.ServiceSettings.GfycatApiSecret != nil && *o.ServiceSettings.GfycatApiSecret != "" {
|
||||
@@ -4041,7 +4041,7 @@ func isDomainName(s string) bool {
|
||||
|
||||
func isSafeLink(link *string) bool {
|
||||
if link != nil {
|
||||
if IsValidHttpUrl(*link) {
|
||||
if IsValidHTTPUrl(*link) {
|
||||
return true
|
||||
} else if strings.HasPrefix(*link, "/") {
|
||||
return true
|
||||
|
||||
Ссылка в новой задаче
Block a user