mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Allowing salts longer than 32 chars

Просмотр исходного кода
Этот коммит содержится в:
=Corey Hulen
2015-10-19 11:23:44 -07:00
родитель e0d2ee3cce
Коммит f7e51b14d7
1 изменённых файлов: 8 добавлений и 8 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
model/config.go
Просмотреть файл

@@ -184,8 +184,8 @@ func (o *Config) IsValid() *AppError {
return NewAppError("Config.IsValid", "Invalid maximum users per team for team settings. Must be a positive number.", "") return NewAppError("Config.IsValid", "Invalid maximum users per team for team settings. Must be a positive number.", "")
} }
if len(o.SqlSettings.AtRestEncryptKey) != 32 { if len(o.SqlSettings.AtRestEncryptKey) < 32 {
return NewAppError("Config.IsValid", "Invalid at rest encrypt key for SQL settings. Must be 32 chars.", "") return NewAppError("Config.IsValid", "Invalid at rest encrypt key for SQL settings. Must be 32 chars or more.", "")
} }
if !(o.SqlSettings.DriverName == DATABASE_DRIVER_MYSQL || o.SqlSettings.DriverName == DATABASE_DRIVER_POSTGRES) { if !(o.SqlSettings.DriverName == DATABASE_DRIVER_MYSQL || o.SqlSettings.DriverName == DATABASE_DRIVER_POSTGRES) {
@@ -232,20 +232,20 @@ func (o *Config) IsValid() *AppError {
return NewAppError("Config.IsValid", "Invalid thumbnail width for file settings. Must be a positive number.", "") return NewAppError("Config.IsValid", "Invalid thumbnail width for file settings. Must be a positive number.", "")
} }
if len(o.FileSettings.PublicLinkSalt) != 32 { if len(o.FileSettings.PublicLinkSalt) < 32 {
return NewAppError("Config.IsValid", "Invalid public link salt for file settings. Must be 32 chars.", "") return NewAppError("Config.IsValid", "Invalid public link salt for file settings. Must be 32 chars or more.", "")
} }
if !(o.EmailSettings.ConnectionSecurity == CONN_SECURITY_NONE || o.EmailSettings.ConnectionSecurity == CONN_SECURITY_TLS || o.EmailSettings.ConnectionSecurity == CONN_SECURITY_STARTTLS) { if !(o.EmailSettings.ConnectionSecurity == CONN_SECURITY_NONE || o.EmailSettings.ConnectionSecurity == CONN_SECURITY_TLS || o.EmailSettings.ConnectionSecurity == CONN_SECURITY_STARTTLS) {
return NewAppError("Config.IsValid", "Invalid connection security for email settings. Must be '', 'TLS', or 'STARTTLS'", "") return NewAppError("Config.IsValid", "Invalid connection security for email settings. Must be '', 'TLS', or 'STARTTLS'", "")
} }
if len(o.EmailSettings.InviteSalt) != 32 { if len(o.EmailSettings.InviteSalt) < 32 {
return NewAppError("Config.IsValid", "Invalid invite salt for email settings. Must be 32 chars.", "") return NewAppError("Config.IsValid", "Invalid invite salt for email settings. Must be 32 chars or more.", "")
} }
if len(o.EmailSettings.PasswordResetSalt) != 32 { if len(o.EmailSettings.PasswordResetSalt) < 32 {
return NewAppError("Config.IsValid", "Invalid password reset salt for email settings. Must be 32 chars.", "") return NewAppError("Config.IsValid", "Invalid password reset salt for email settings. Must be 32 chars or more.", "")
} }
if o.RateLimitSettings.MemoryStoreSize <= 0 { if o.RateLimitSettings.MemoryStoreSize <= 0 {