Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Fix for bug #1236 (#1244)

Browse source
This commit is contained in:
John Murphy 2017-02-17 01:02:49 +08:00 committed by GitHub
parent fdb3c55562
commit 146ee18c62
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/service/service_errors.go
View file

@ -96,6 +96,17 @@ type permissionError struct {
badArgs []invalidArgument
}
func newPermissionError(name, reason string) permissionError {
return permissionError{
badArgs: []invalidArgument{
invalidArgument{
name: name,
reason: reason,
},
},
}
}
func (e permissionError) Error() string {
switch len(e.badArgs) {
case 0:

2
server/service/service_users.go
View file

@ -125,7 +125,7 @@ func (svc service) modifyEmailAddress(ctx context.Context, user *kolide.User, em
if password != nil {
err := user.ValidatePassword(*password)
if err != nil {
return permissionError{message: "incorrect password"}
return newPermissionError("password", "incorrect password")
}
}
random, err := kolide.RandomText(svc.config.App.TokenKeySize)