Kaynağa Gözat

Reliable selection of admin user (#22509)

When importing a repository via `gitea restore-repo`, external users
will get remapped to an admin user. This admin user is obtained via
`users.GetAdminUser()`, which unfortunately picks a more-or-less random
admin to return.

This makes it hard to predict which admin user will get assigned. This
patch orders the admin by ascending ID before choosing the first one,
i.e. it picks the admin with the lowest ID.

Even though it would be nicer to have full control over which user is
chosen, this at least gives us a predictable result.
tags/v1.19.0-rc0
Sybren 1 yıl önce
ebeveyn
işleme
326d29dce0
No account linked to committer's email address
1 değiştirilmiş dosya ile 4 ekleme ve 1 silme
  1. 4
    1
      models/user/user.go

+ 4
- 1
models/user/user.go Dosyayı Görüntüle

@@ -1233,7 +1233,10 @@ func GetUserByOpenID(uri string) (*User, error) {
// GetAdminUser returns the first administrator
func GetAdminUser() (*User, error) {
var admin User
has, err := db.GetEngine(db.DefaultContext).Where("is_admin=?", true).Get(&admin)
has, err := db.GetEngine(db.DefaultContext).
Where("is_admin=?", true).
Asc("id"). // Reliably get the admin with the lowest ID.
Get(&admin)
if err != nil {
return nil, err
} else if !has {

Loading…
İptal
Kaydet