mirror of
https://github.com/go-gitea/gitea.git
synced 2026-06-30 06:41:26 +00: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>
117 lines
3.0 KiB
Go
117 lines
3.0 KiB
Go
// Copyright 2017 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package user
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"gitea.dev/models/db"
|
|
"gitea.dev/modules/util"
|
|
|
|
"xorm.io/builder"
|
|
)
|
|
|
|
// UserOpenID is the list of all OpenID identities of a user.
|
|
// Since this is a middle table, name it OpenID is not suitable, so we ignore the lint here
|
|
type UserOpenID struct { //revive:disable-line:exported
|
|
ID int64 `xorm:"pk autoincr"`
|
|
UID int64 `xorm:"INDEX NOT NULL"`
|
|
URI string `xorm:"UNIQUE NOT NULL"`
|
|
Show bool `xorm:"DEFAULT false"`
|
|
}
|
|
|
|
func init() {
|
|
db.RegisterModel(new(UserOpenID))
|
|
}
|
|
|
|
// GetUserOpenIDs returns all openid addresses that belongs to given user.
|
|
func GetUserOpenIDs(ctx context.Context, uid int64) ([]*UserOpenID, error) {
|
|
openids := make([]*UserOpenID, 0, 5)
|
|
if err := db.GetEngine(ctx).
|
|
Where("uid=?", uid).
|
|
Asc("id").
|
|
Find(&openids); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return openids, nil
|
|
}
|
|
|
|
// isOpenIDUsed returns true if the openid has been used.
|
|
func isOpenIDUsed(ctx context.Context, uri string) (bool, error) {
|
|
if len(uri) == 0 {
|
|
return true, nil
|
|
}
|
|
|
|
return db.Exist[UserOpenID](ctx, builder.Eq{"uri": uri})
|
|
}
|
|
|
|
// ErrOpenIDAlreadyUsed represents a "OpenIDAlreadyUsed" kind of error.
|
|
type ErrOpenIDAlreadyUsed struct {
|
|
OpenID string
|
|
}
|
|
|
|
// IsErrOpenIDAlreadyUsed checks if an error is a ErrOpenIDAlreadyUsed.
|
|
func IsErrOpenIDAlreadyUsed(err error) bool {
|
|
_, ok := err.(ErrOpenIDAlreadyUsed)
|
|
return ok
|
|
}
|
|
|
|
func (err ErrOpenIDAlreadyUsed) Error() string {
|
|
return fmt.Sprintf("OpenID already in use [oid: %s]", err.OpenID)
|
|
}
|
|
|
|
func (err ErrOpenIDAlreadyUsed) Unwrap() error {
|
|
return util.ErrAlreadyExist
|
|
}
|
|
|
|
// AddUserOpenID adds an pre-verified/normalized OpenID URI to given user.
|
|
// NOTE: make sure openid.URI is normalized already
|
|
func AddUserOpenID(ctx context.Context, openid *UserOpenID) error {
|
|
used, err := isOpenIDUsed(ctx, openid.URI)
|
|
if err != nil {
|
|
return err
|
|
} else if used {
|
|
return ErrOpenIDAlreadyUsed{openid.URI}
|
|
}
|
|
|
|
return db.Insert(ctx, openid)
|
|
}
|
|
|
|
// DeleteUserOpenID deletes an openid address of given user.
|
|
func DeleteUserOpenID(ctx context.Context, openid *UserOpenID) (err error) {
|
|
var deleted int64
|
|
// ask to check UID
|
|
address := UserOpenID{
|
|
UID: openid.UID,
|
|
}
|
|
if openid.ID > 0 {
|
|
deleted, err = db.GetEngine(ctx).ID(openid.ID).Delete(&address)
|
|
} else {
|
|
deleted, err = db.GetEngine(ctx).
|
|
Where("openid=?", openid.URI).
|
|
Delete(&address)
|
|
}
|
|
|
|
if err != nil {
|
|
return err
|
|
} else if deleted != 1 {
|
|
return util.NewNotExistErrorf("OpenID is unknown")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ToggleUserOpenIDVisibility toggles visibility of an openid address of given user.
|
|
func ToggleUserOpenIDVisibility(ctx context.Context, id int64, user *User) error {
|
|
affected, err := db.GetEngine(ctx).Exec("update `user_open_id` set `show` = not `show` where `id` = ? AND uid = ?", id, user.ID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if n, _ := affected.RowsAffected(); n != 1 {
|
|
return util.NewNotExistErrorf("OpenID is unknown")
|
|
}
|
|
return nil
|
|
}
|