Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 23:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

IDP account check: preserve user profile

Browse Source 
Fixes #1712

Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2024-08-02 19:24:14 +02:00
parent 00155eaaf6
commit ce189e5065
4 changed files with 87 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
internal/common/eventmanager.go
View File

@@ -2503,19 +2503,54 @@ func executeAdminCheckAction(c *dataprovider.EventActionIDPAccountCheck, params
if err != nil {
return nil, err
}
if newAdmin.Password == "" {
newAdmin.Password = util.GenerateUniqueID()
}
if exists {
eventManagerLog(logger.LevelDebug, "updating admin %q after IDP login", params.Name)
// Not sure if this makes sense, but it shouldn't hurt.
if newAdmin.Password == "" {
newAdmin.Password = admin.Password
}
newAdmin.Filters.TOTPConfig = admin.Filters.TOTPConfig
newAdmin.Filters.RecoveryCodes = admin.Filters.RecoveryCodes
err = dataprovider.UpdateAdmin(&newAdmin, dataprovider.ActionExecutorSystem, "", "")
} else {
eventManagerLog(logger.LevelDebug, "creating admin %q after IDP login", params.Name)
if newAdmin.Password == "" {
newAdmin.Password = util.GenerateUniqueID()
}
err = dataprovider.AddAdmin(&newAdmin, dataprovider.ActionExecutorSystem, "", "")
}
return &newAdmin, err
}
func preserveUserProfile(user, newUser *dataprovider.User) {
if newUser.CanChangePassword() && user.Password != "" {
newUser.Password = user.Password
}
if newUser.CanManagePublicKeys() && len(user.PublicKeys) > 0 {
newUser.PublicKeys = user.PublicKeys
}
if newUser.CanManageTLSCerts() {
if len(user.Filters.TLSCerts) > 0 {
newUser.Filters.TLSCerts = user.Filters.TLSCerts
}
}
if newUser.CanChangeInfo() {
if user.Description != "" {
newUser.Description = user.Description
}
if user.Email != "" {
newUser.Email = user.Email
}
}
if newUser.CanChangeAPIKeyAuth() {
newUser.Filters.AllowAPIKeyAuth = user.Filters.AllowAPIKeyAuth
}
newUser.Filters.RecoveryCodes = user.Filters.RecoveryCodes
newUser.Filters.TOTPConfig = user.Filters.TOTPConfig
newUser.LastPasswordChange = user.LastPasswordChange
newUser.SetEmptySecretsIfNil()
}
func executeUserCheckAction(c *dataprovider.EventActionIDPAccountCheck, params *EventParams) (*dataprovider.User, error) {
user, err := dataprovider.UserExists(params.Name, "")
exists := err == nil
@@ -2537,6 +2572,7 @@ func executeUserCheckAction(c *dataprovider.EventActionIDPAccountCheck, params *
}
if exists {
eventManagerLog(logger.LevelDebug, "updating user %q after IDP login", params.Name)
preserveUserProfile(&user, &newUser)
err = dataprovider.UpdateUser(&newUser, dataprovider.ActionExecutorSystem, "", "")
} else {
eventManagerLog(logger.LevelDebug, "creating user %q after IDP login", params.Name)