fleet/server/service/logging_users.go
Zachary Wasserman 60428e01c4 Fix required password reset flow (#833)
Permissions errors were preventing users from completing this flow

- Add separate endpoint for performing required password reset
- Rewrite frontend reset to use this endpoint

Fixes #792
2017-01-09 21:42:50 -07:00

285 lines
5.6 KiB
Go

package service
import (
"time"
"github.com/kolide/kolide-ose/server/contexts/viewer"
"github.com/kolide/kolide-ose/server/kolide"
"golang.org/x/net/context"
)
func (mw loggingMiddleware) NewAdminCreatedUser(ctx context.Context, p kolide.UserPayload) (*kolide.User, error) {
var (
user *kolide.User
err error
username = "none"
loggedInUser = "unauthenticated"
)
vc, ok := viewer.FromContext(ctx)
if ok {
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "NewAdminCreatedUser",
"user", username,
"created_by", loggedInUser,
"err", err,
"took", time.Since(begin),
)
}(time.Now())
user, err = mw.Service.NewAdminCreatedUser(ctx, p)
if user != nil {
username = user.Username
}
return user, err
}
func (mw loggingMiddleware) ListUsers(ctx context.Context, opt kolide.ListOptions) ([]*kolide.User, error) {
var (
users []*kolide.User
err error
username = "none"
)
vc, ok := viewer.FromContext(ctx)
if ok {
username = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "ListUsers",
"user", username,
"err", err,
"took", time.Since(begin),
)
}(time.Now())
users, err = mw.Service.ListUsers(ctx, opt)
return users, err
}
func (mw loggingMiddleware) RequirePasswordReset(ctx context.Context, uid uint, require bool) (*kolide.User, error) {
var (
user *kolide.User
err error
username = "none"
)
vc, ok := viewer.FromContext(ctx)
if ok {
username = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "RequirePasswordReset",
"user", username,
"err", err,
"took", time.Since(begin),
)
}(time.Now())
user, err = mw.Service.RequirePasswordReset(ctx, uid, require)
return user, err
}
func (mw loggingMiddleware) NewUser(ctx context.Context, p kolide.UserPayload) (*kolide.User, error) {
var (
user *kolide.User
err error
username = "none"
loggedInUser = "unauthenticated"
)
vc, ok := viewer.FromContext(ctx)
if ok {
loggedInUser = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "NewUser",
"user", username,
"created_by", loggedInUser,
"err", err,
"took", time.Since(begin),
)
}(time.Now())
user, err = mw.Service.NewUser(ctx, p)
if user != nil {
username = user.Username
}
return user, err
}
func (mw loggingMiddleware) ModifyUser(ctx context.Context, userID uint, p kolide.UserPayload) (*kolide.User, error) {
var (
user *kolide.User
err error
username = "none"
)
vc, ok := viewer.FromContext(ctx)
if !ok {
return nil, errNoContext
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "ModifyUser",
"user", username,
"modified_by", vc.Username(),
"err", err,
"took", time.Since(begin),
)
}(time.Now())
user, err = mw.Service.ModifyUser(ctx, userID, p)
if user != nil {
username = user.Username
}
return user, err
}
func (mw loggingMiddleware) User(ctx context.Context, id uint) (*kolide.User, error) {
var (
user *kolide.User
err error
username = "none"
)
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "User",
"user", username,
"err", err,
"took", time.Since(begin),
)
}(time.Now())
user, err = mw.Service.User(ctx, id)
if user != nil {
username = user.Username
}
return user, err
}
func (mw loggingMiddleware) AuthenticatedUser(ctx context.Context) (*kolide.User, error) {
var (
user *kolide.User
err error
username = "none"
)
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "User",
"user", username,
"err", err,
"took", time.Since(begin),
)
}(time.Now())
user, err = mw.Service.AuthenticatedUser(ctx)
if user != nil {
username = user.Username
}
return user, err
}
func (mw loggingMiddleware) ChangePassword(ctx context.Context, oldPass, newPass string) error {
var (
requestedBy = "unauthenticated"
err error
)
vc, ok := viewer.FromContext(ctx)
if ok {
requestedBy = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "ChangePassword",
"err", err,
"requested_by", requestedBy,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.ChangePassword(ctx, oldPass, newPass)
return err
}
func (mw loggingMiddleware) ResetPassword(ctx context.Context, token, password string) error {
var err error
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "ResetPassword",
"err", err,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.ResetPassword(ctx, token, password)
return err
}
func (mw loggingMiddleware) RequestPasswordReset(ctx context.Context, email string) error {
var (
requestedBy = "unauthenticated"
err error
)
vc, ok := viewer.FromContext(ctx)
if ok {
requestedBy = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "RequestPasswordReset",
"email", email,
"err", err,
"requested_by", requestedBy,
"took", time.Since(begin),
)
}(time.Now())
err = mw.Service.RequestPasswordReset(ctx, email)
return err
}
func (mw loggingMiddleware) PerformRequiredPasswordReset(ctx context.Context, password string) (*kolide.User, error) {
var (
resetBy = "unauthenticated"
err error
)
vc, ok := viewer.FromContext(ctx)
if ok {
resetBy = vc.Username()
}
defer func(begin time.Time) {
_ = mw.logger.Log(
"method", "PerformRequiredPasswordReset",
"err", err,
"reset_by", resetBy,
"took", time.Since(begin),
)
}(time.Now())
user, err := mw.Service.PerformRequiredPasswordReset(ctx, password)
return user, err
}