luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auth: Delete user sessions after a permission level change #3512

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-07-18 16:38:10 +02:00
parent 44603857fa
commit 7b9b2ae0c6
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/api/users_update.go
View file

@ -78,11 +78,13 @@ func UpdateUser(router *gin.RouterGroup) {
// Log event. // Log event.
event.AuditInfo([]string{ClientIP(c), "session %s", "users", m.UserName, "updated"}, s.RefID) event.AuditInfo([]string{ClientIP(c), "session %s", "users", m.UserName, "updated"}, s.RefID)
// Delete sessions after privilege level change. // Delete user sessions after a permission level change.
if s.User().UserUID != m.UID() && isPrivileged {
// see https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html#renew-the-session-id-after-any-privilege-level-change // see https://cheatsheetseries.owasp.org/cheatsheets/Session_Management_Cheat_Sheet.html#renew-the-session-id-after-any-privilege-level-change
if isPrivileged {
// Prevent the current session from being deleted.
deleted := m.DeleteSessions([]string{s.ID})
event.AuditInfo([]string{ClientIP(c), "session %s", "users", m.UserName, "invalidated %s"}, s.RefID, event.AuditInfo([]string{ClientIP(c), "session %s", "users", m.UserName, "invalidated %s"}, s.RefID,
english.Plural(m.DeleteSessions(nil), "session", "sessions")) english.Plural(deleted, "session", "sessions"))
} }
// Clear the session cache. // Clear the session cache.

10
internal/entity/auth_user.go
View file

@ -740,8 +740,16 @@ func (m *User) DeleteSessions(omit []string) (deleted int) {
return 0 return 0
} }
// Compose update statement.
stmt := Db()
// Find all user sessions except the session ids passed as argument. // Find all user sessions except the session ids passed as argument.
stmt := Db().Where("user_uid = ? AND id NOT IN (?)", m.UserUID, omit) if len(omit) == 0 {
stmt = stmt.Where("user_uid = ?", m.UserUID)
} else {
stmt = stmt.Where("user_uid = ? AND id NOT IN (?)", m.UserUID, omit)
}
sess := Sessions{} sess := Sessions{}
if err := stmt.Find(&sess).Error; err != nil { if err := stmt.Find(&sess).Error; err != nil {