mirror of
https://github.com/go-gitea/gitea.git
synced 2026-06-30 16:12:13 +02:00
cbe1b703dc
This PR replaces a set of struct-based `Get` lookups with explicit `db.Get` / `db.Exist` conditions in places where zero-value fields can lead to ambiguous matches or incorrect records being returned. The main goal is to make read paths deterministic and avoid accidentally matching the wrong row when only part of a struct is populated. ### What changed - replace many `db.GetEngine(ctx).Get(bean)` calls with explicit `builder.Eq` conditions across models such as actions, admin tasks, issues, pull requests, repositories, users, packages, redirects, watches, stars, and follows - use quoted column names where needed for reserved fields like `index`, `type`, and `name` - add dedicated user lookup helpers for: - primary email - OAuth login source / login name - update sign-in and OAuth-related flows to use explicit individual-user lookups instead of partially populated `User` structs - tighten package property and Terraform lock lookups to avoid ambiguous reads and updates - keep existing fallback behavior where needed, while removing reliance on zero-value struct matching ### User-facing impact These changes primarily affect authentication and account lookup paths: - email/username sign-in now re-fetches users through explicit keys - OAuth2 auto-linking now resolves users by name or primary email explicitly - OAuth2 login/sync now looks up users by login source, login type, and login name explicitly - non-individual accounts are no longer implicitly matched through partial user lookups in these flows This should reduce the risk of incorrect account matches and make query behavior more predictable across the codebase. --------- Co-authored-by: bircni <bircni@icloud.com>
90 lines
2.3 KiB
Go
90 lines
2.3 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"gitea.dev/models/db"
|
|
"gitea.dev/modules/util"
|
|
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
// ErrUserRedirectNotExist represents a "UserRedirectNotExist" kind of error.
|
|
type ErrUserRedirectNotExist struct {
|
|
Name string
|
|
}
|
|
|
|
// IsErrUserRedirectNotExist check if an error is an ErrUserRedirectNotExist.
|
|
func IsErrUserRedirectNotExist(err error) bool {
|
|
_, ok := err.(ErrUserRedirectNotExist)
|
|
return ok
|
|
}
|
|
|
|
func (err ErrUserRedirectNotExist) Error() string {
|
|
return fmt.Sprintf("user redirect does not exist [name: %s]", err.Name)
|
|
}
|
|
|
|
func (err ErrUserRedirectNotExist) Unwrap() error {
|
|
return util.ErrNotExist
|
|
}
|
|
|
|
// Redirect represents that a user name should be redirected to another
|
|
type Redirect struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
|
|
RedirectUserID int64 // userID to redirect to
|
|
}
|
|
|
|
// TableName provides the real table name
|
|
func (Redirect) TableName() string {
|
|
return "user_redirect"
|
|
}
|
|
|
|
func init() {
|
|
db.RegisterModel(new(Redirect))
|
|
}
|
|
|
|
// LookupUserRedirect look up userID if a user has a redirect name
|
|
func LookupUserRedirect(ctx context.Context, userName string) (int64, error) {
|
|
userName = strings.ToLower(userName)
|
|
redirect, has, err := db.Get[Redirect](ctx, builder.Eq{"lower_name": userName})
|
|
if err != nil {
|
|
return 0, err
|
|
} else if !has {
|
|
return 0, ErrUserRedirectNotExist{Name: userName}
|
|
}
|
|
return redirect.RedirectUserID, nil
|
|
}
|
|
|
|
// NewUserRedirect create a new user redirect
|
|
func NewUserRedirect(ctx context.Context, ID int64, oldUserName, newUserName string) error {
|
|
oldUserName = strings.ToLower(oldUserName)
|
|
newUserName = strings.ToLower(newUserName)
|
|
|
|
if err := DeleteUserRedirect(ctx, oldUserName); err != nil {
|
|
return err
|
|
}
|
|
|
|
if err := DeleteUserRedirect(ctx, newUserName); err != nil {
|
|
return err
|
|
}
|
|
|
|
return db.Insert(ctx, &Redirect{
|
|
LowerName: oldUserName,
|
|
RedirectUserID: ID,
|
|
})
|
|
}
|
|
|
|
// DeleteUserRedirect delete any redirect from the specified user name to
|
|
// anything else
|
|
func DeleteUserRedirect(ctx context.Context, userName string) error {
|
|
userName = strings.ToLower(userName)
|
|
_, err := db.GetEngine(ctx).Delete(&Redirect{LowerName: userName})
|
|
return err
|
|
}
|