Этот коммит содержится в:
Ben Schumacher
2021-07-12 20:05:36 +02:00
коммит произвёл Claudio Costa
родитель 953eebdef4
Коммит 97ccf0bdf6
472 изменённых файлов: 9126 добавлений и 9132 удалений

Просмотреть файл

@@ -76,7 +76,7 @@ func setupTestHelper(s store.Store, includeCacheLayer bool, tb testing.TB) *Test
buffer := &bytes.Buffer{}
provider := cache.NewProvider()
cache, err := provider.NewCache(&cache.CacheOptions{
Size: model.SESSION_CACHE_SIZE,
Size: model.SessionCacheSize,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
})

Просмотреть файл

@@ -52,12 +52,12 @@ func IsPasswordValidWithSettings(password string, settings *model.PasswordSettin
id := "model.user.is_valid.pwd"
isError := false
if len(password) < *settings.MinimumLength || len(password) > model.PASSWORD_MAXIMUM_LENGTH {
if len(password) < *settings.MinimumLength || len(password) > model.PasswordMaximumLength {
isError = true
}
if *settings.Lowercase {
if !strings.ContainsAny(password, model.LOWERCASE_LETTERS) {
if !strings.ContainsAny(password, model.LowercaseLetters) {
isError = true
}
@@ -65,7 +65,7 @@ func IsPasswordValidWithSettings(password string, settings *model.PasswordSettin
}
if *settings.Uppercase {
if !strings.ContainsAny(password, model.UPPERCASE_LETTERS) {
if !strings.ContainsAny(password, model.UppercaseLetters) {
isError = true
}

Просмотреть файл

@@ -37,7 +37,7 @@ func TestIsPasswordValidWithSettings(t *testing.T) {
},
},
"Long": {
Password: strings.Repeat("x", model.PASSWORD_MAXIMUM_LENGTH),
Password: strings.Repeat("x", model.PasswordMaximumLength),
Settings: &model.PasswordSettings{
Lowercase: model.NewBool(false),
Uppercase: model.NewBool(false),
@@ -57,7 +57,7 @@ func TestIsPasswordValidWithSettings(t *testing.T) {
ExpectedError: "model.user.is_valid.pwd.app_error",
},
"TooLong": {
Password: strings.Repeat("x", model.PASSWORD_MAXIMUM_LENGTH+1),
Password: strings.Repeat("x", model.PasswordMaximumLength+1),
Settings: &model.PasswordSettings{
Lowercase: model.NewBool(false),
Uppercase: model.NewBool(false),

Просмотреть файл

@@ -51,7 +51,7 @@ func New(c ServiceConfig) (*UserService, error) {
}
sessionCache, err := cacheProvider.NewCache(&cache.CacheOptions{
Size: model.SESSION_CACHE_SIZE,
Size: model.SessionCacheSize,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
})

Просмотреть файл

@@ -97,8 +97,8 @@ func (us *UserService) ClearUserSessionCache(userID string) {
if us.cluster != nil {
msg := &model.ClusterMessage{
Event: model.CLUSTER_EVENT_CLEAR_SESSION_CACHE_FOR_USER,
SendType: model.CLUSTER_SEND_RELIABLE,
Event: model.ClusterEventClearSessionCacheForUser,
SendType: model.ClusterSendReliable,
Data: userID,
}
us.cluster.SendClusterMessage(msg)
@@ -110,8 +110,8 @@ func (us *UserService) ClearAllUsersSessionCache() {
if us.cluster != nil {
msg := &model.ClusterMessage{
Event: model.CLUSTER_EVENT_CLEAR_SESSION_CACHE_FOR_ALL_USERS,
SendType: model.CLUSTER_SEND_RELIABLE,
Event: model.ClusterEventClearSessionCacheForAllUsers,
SendType: model.ClusterSendReliable,
}
us.cluster.SendClusterMessage(msg)
}
@@ -217,7 +217,7 @@ func (us *UserService) UpdateSessionsIsGuest(userID string, isGuest bool) error
}
for _, session := range sessions {
session.AddProp(model.SESSION_PROP_IS_GUEST, fmt.Sprintf("%t", isGuest))
session.AddProp(model.SessionPropIsGuest, fmt.Sprintf("%t", isGuest))
err := us.sessionStore.UpdateProps(session)
if err != nil {
mlog.Warn("Unable to update isGuest session", mlog.Err(err))

Просмотреть файл

@@ -111,7 +111,7 @@ func TestOAuthRevokeAccessToken(t *testing.T) {
session.CreateAt = model.GetMillis()
session.UserId = model.NewId()
session.Token = model.NewId()
session.Roles = model.SYSTEM_USER_ROLE_ID
session.Roles = model.SystemUserRoleId
th.service.SetSessionExpireInDays(session, 1)
session, _ = th.service.CreateSession(session)

Просмотреть файл

@@ -26,9 +26,9 @@ func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*mo
return us.createUser(user)
}
user.Roles = model.SYSTEM_USER_ROLE_ID
user.Roles = model.SystemUserRoleId
if opts.Guest {
user.Roles = model.SYSTEM_GUEST_ROLE_ID
user.Roles = model.SystemGuestRoleId
}
if !user.IsLDAPUser() && !user.IsSAMLUser() && !user.IsGuest() && !CheckUserDomain(user, *us.config().TeamSettings.RestrictCreationToDomains) {
@@ -46,7 +46,7 @@ func (us *UserService) CreateUser(user *model.User, opts UserCreateOptions) (*mo
return nil, UserCountError
}
if count <= 0 {
user.Roles = model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID
user.Roles = model.SystemAdminRoleId + " " + model.SystemUserRoleId
}
if _, ok := i18n.GetSupportedLocales()[user.Locale]; !ok {
@@ -214,8 +214,8 @@ func (us *UserService) InvalidateCacheForUser(userID string) {
if us.cluster != nil {
msg := &model.ClusterMessage{
Event: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_USER,
SendType: model.CLUSTER_SEND_BEST_EFFORT,
Event: model.ClusterEventInvalidateCacheForUser,
SendType: model.ClusterSendBestEffort,
Data: userID,
}
us.cluster.SendClusterMessage(msg)