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

Fixing LDAP editing of attributes (#2824)

Просмотр исходного кода
Этот коммит содержится в:
Christopher Speller
2016-05-02 08:07:58 -04:00
родитель 3346a9a63a
Коммит c63e027aec
6 изменённых файлов: 210 добавлений и 139 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -145,7 +145,7 @@ test: start-docker
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=340s ./api || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=12s ./model || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./store || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s ./store || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./utils || exit 1
$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=120s ./web || exit 1
ifeq ($(BUILD_ENTERPRISE_READY),true)

4
i18n/en.json
Просмотреть файл

@@ -3495,6 +3495,10 @@
"id": "store.sql_user.update.app_error",
"translation": "We couldn't update the account"
},
{
"id": "store.sql_user.update.can_not_change_ldap.app_error",
"translation": "Can not change fields set by LDAP"
},
{
"id": "store.sql_user.update.email_taken.app_error",
"translation": "This email is already taken. Please choose another."

12
store/sql_user_store.go
Просмотреть файл

@@ -136,7 +136,17 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
if user.IsOAuthUser() {
user.Email = oldUser.Email
} else if !user.IsLDAPUser() && user.Email != oldUser.Email {
} else if user.IsLDAPUser() {
if user.Username != oldUser.Username ||
user.FirstName != oldUser.FirstName ||
user.LastName != oldUser.LastName ||
user.Email != oldUser.Email {
result.Err = model.NewLocAppError("SqlUserStore.Update", "store.sql_user.update.can_not_change_ldap.app_error", nil, "user_id="+user.Id)
storeChannel <- result
close(storeChannel)
return
}
} else if user.Email != oldUser.Email {
user.EmailVerified = false
}

11
store/sql_user_store_test.go
Просмотреть файл

@@ -77,6 +77,12 @@ func TestUserStoreUpdate(t *testing.T) {
Must(store.User().Save(u1))
Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}))
u2 := &model.User{}
u2.Email = model.NewId()
u2.AuthService = "ldap"
Must(store.User().Save(u2))
Must(store.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}))
time.Sleep(100 * time.Millisecond)
if err := (<-store.User().Update(u1, false)).Err; err != nil {
@@ -92,6 +98,11 @@ func TestUserStoreUpdate(t *testing.T) {
if err := (<-store.User().Update(u1, false)).Err; err == nil {
t.Fatal("Update should have faile because id change")
}
u2.Email = model.NewId()
if err := (<-store.User().Update(u2, false)).Err; err == nil {
t.Fatal("Update should have failed because you can't modify LDAP fields")
}
}
func TestUserStoreUpdateLastPingAt(t *testing.T) {

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

@@ -259,6 +259,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["EnableLdap"] = strconv.FormatBool(*c.LdapSettings.Enable)
props["LdapLoginFieldName"] = *c.LdapSettings.LoginFieldName
props["LdapPasswordFieldName"] = *c.LdapSettings.PasswordFieldName
props["NicknameAttributeSet"] = strconv.FormatBool(*c.LdapSettings.NicknameAttribute != "")
}
if *License.Features.MFA {

57
webapp/components/user_settings/user_settings_general.jsx
Просмотреть файл

@@ -513,6 +513,9 @@ class UserSettingsGeneralTab extends React.Component {
const inputs = [];
if (this.props.activeSection === 'name') {
let extraInfo;
let submit = null;
if (this.props.user.auth_service === '') {
inputs.push(
<div
key='firstNameSetting'
@@ -575,7 +578,7 @@ class UserSettingsGeneralTab extends React.Component {
</a>
);
const extraInfo = (
extraInfo = (
<span>
<FormattedMessage
id='user.settings.general.notificationsExtra'
@@ -587,11 +590,23 @@ class UserSettingsGeneralTab extends React.Component {
</span>
);
submit = this.submitName;
} else {
extraInfo = (
<span>
<FormattedMessage
id='user.settings.general.field_handled_externally'
defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so though your login provider.'
/>
</span>
);
}
nameSection = (
<SettingItemMax
title={formatMessage(holders.fullName)}
inputs={inputs}
submit={this.submitName}
submit={submit}
server_error={serverError}
client_error={clientError}
updateSection={(e) => {
@@ -632,6 +647,18 @@ class UserSettingsGeneralTab extends React.Component {
let nicknameSection;
if (this.props.activeSection === 'nickname') {
let extraInfo;
let submit = null;
if (this.props.user.auth_service === 'ldap' && global.window.mm_config.NicknameAttributeSet) {
extraInfo = (
<span>
<FormattedMessage
id='user.settings.general.field_handled_externally'
defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so though your login provider.'
/>
</span>
);
} else {
let nicknameLabel = (
<FormattedMessage
id='user.settings.general.nickname'
@@ -659,7 +686,7 @@ class UserSettingsGeneralTab extends React.Component {
</div>
);
const extraInfo = (
extraInfo = (
<span>
<FormattedMessage
id='user.settings.general.nicknameExtra'
@@ -668,11 +695,14 @@ class UserSettingsGeneralTab extends React.Component {
</span>
);
submit = this.submitNickname;
}
nicknameSection = (
<SettingItemMax
title={formatMessage(holders.nickname)}
inputs={inputs}
submit={this.submitNickname}
submit={submit}
server_error={serverError}
client_error={clientError}
updateSection={(e) => {
@@ -708,6 +738,9 @@ class UserSettingsGeneralTab extends React.Component {
let usernameSection;
if (this.props.activeSection === 'username') {
let extraInfo;
let submit = null;
if (this.props.user.auth_service === '') {
let usernameLabel = (
<FormattedMessage
id='user.settings.general.username'
@@ -736,7 +769,7 @@ class UserSettingsGeneralTab extends React.Component {
</div>
);
const extraInfo = (
extraInfo = (
<span>
<FormattedMessage
id='user.settings.general.usernameInfo'
@@ -745,11 +778,23 @@ class UserSettingsGeneralTab extends React.Component {
</span>
);
submit = this.submitUsername;
} else {
extraInfo = (
<span>
<FormattedMessage
id='user.settings.general.field_handled_externally'
defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so though your login provider.'
/>
</span>
);
}
usernameSection = (
<SettingItemMax
title={formatMessage(holders.username)}
inputs={inputs}
submit={this.submitUsername}
submit={submit}
server_error={serverError}
client_error={clientError}
updateSection={(e) => {