mirror/kopia
1
0 Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-10-21 13:44:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(general): User_profile_add_set cli changes (#3770)

Browse Source 
* User profile add set cli changes

* Add additional test

* get salt length from key deriver

* Fixes for failing tests

* after shikhars review

* lint fixes
This commit is contained in:
Sirish Bathina authored and GitHub committed 2024-04-10 17:56:13 -07:00
1 parent 123927d573
commit 5fa39fe5eb
10 files changed
+301 -102
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cli/command_user_add_set.go
+10 -10
View File
@@ -13,11 +13,11 @@ import (
)
type commandServerUserAddSet struct {
userAskPassword bool
userSetName string
userSetPassword string
userSetPasswordHashVersion int
userSetPasswordHash string
userAskPassword bool
userSetName string
userSetPassword string
keyDerivationAlgorithm string
userSetPasswordHash string
isNew bool // true == 'add', false == 'update'
out textOutput
@@ -37,7 +37,7 @@ func (c *commandServerUserAddSet) setup(svc appServices, parent commandParent, i
cmd.Flag("ask-password", "Ask for user password").BoolVar(&c.userAskPassword)
cmd.Flag("user-password", "Password").StringVar(&c.userSetPassword)
cmd.Flag("user-password-hash", "Password hash").StringVar(&c.userSetPasswordHash)
cmd.Flag("user-password-hash-version", "Password hash version").Default("1").IntVar(&c.userSetPasswordHashVersion)
cmd.Flag("key-derivation-algorithm", "Key derivation algorithm").Default(crypto.DefaultKeyDerivationAlgorithm).EnumVar(&c.keyDerivationAlgorithm, crypto.AllowedKeyDerivationAlgorithms()...)
cmd.Arg("username", "Username").Required().StringVar(&c.userSetName)
cmd.Action(svc.repositoryWriterAction(c.runServerUserAddSet))
@@ -54,7 +54,8 @@ func (c *commandServerUserAddSet) getExistingOrNewUserProfile(ctx context.Contex
case errors.Is(err, user.ErrUserNotFound):
return &user.Profile{
Username: username,
Username: username,
KeyDerivationAlgorithm: c.keyDerivationAlgorithm,
}, nil
}
}
@@ -75,7 +76,7 @@ func (c *commandServerUserAddSet) runServerUserAddSet(ctx context.Context, rep r
if p := c.userSetPassword; p != "" {
changed = true
if err := up.SetPassword(p, crypto.DefaultKeyDerivationAlgorithm); err != nil {
if err := up.SetPassword(p); err != nil {
return errors.Wrap(err, "error setting password")
}
}
@@ -86,7 +87,6 @@ func (c *commandServerUserAddSet) runServerUserAddSet(ctx context.Context, rep r
return errors.Wrap(err, "invalid password hash, must be valid base64 string")
}
up.PasswordHashVersion = c.userSetPasswordHashVersion
up.PasswordHash = ph
changed = true
}
@@ -108,7 +108,7 @@ func (c *commandServerUserAddSet) runServerUserAddSet(ctx context.Context, rep r
changed = true
if err := up.SetPassword(pwd, crypto.DefaultKeyDerivationAlgorithm); err != nil {
if err := up.SetPassword(pwd); err != nil {
return errors.Wrap(err, "error setting password")
}
}