5ca8851224
user, topic, project, label, milestone, repository, pull_request, release, asset, comment, reaction, review providers Signed-off-by: Earl Warren <contact@earl-warren.org> Preserve file size when creating attachments Introduced inc6f5029708
repoList.LoadAttributes has a ctx argument now Rename `repo.GetOwner` to `repo.LoadOwner`bd66fa586a
upgrade to the latest gof3 (cherry picked from commitc770713656
) [F3] ID remapping logic is in place, remove workaround (cherry picked from commitd0fee30167
) [F3] it is experimental, do not enable by default (cherry picked from commitde325b21d0
) (cherry picked from commit547e7b3c40
) (cherry picked from commit820df3a56b
) (cherry picked from commiteaba87689b
) (cherry picked from commit1b86896b3b
) (cherry picked from commit0046aac1c6
) (cherry picked from commitf14220df8f
) (cherry picked from commit559b731001
) (cherry picked from commit801f7d600d
) (cherry picked from commit6aa76e9bcf
) (cherry picked from commita8757dcb07
) [F3] promote F3 users to matching OAuth2 users on first sign-in (cherry picked from commitbd7fef7496
) (cherry picked from commit07412698e8
) (cherry picked from commitd143e5b2a3
) [F3] upgrade to gof3 50a6e740ac04 Add new methods GetIDString() & SetIDString() & ToFormatInterface() Change the prototype of the fixture function (cherry picked from commitd7b263ff8b
) (cherry picked from commitb3eaf2249d
) (cherry picked from commitd492ddd9bb
) [F3] add GetLocalMatchingRemote with a default implementation (cherry picked from commit0a22015039
) (cherry picked from commitf1310c38fb
) (cherry picked from commitdeb68552f2
) [F3] GetLocalMatchingRemote for user (cherry picked from commite73cb837f5
) (cherry picked from commita24bc0b85e
) (cherry picked from commit846a522ecc
) [F3] GetAdminUser now has a ctx argument (cherry picked from commit37357a92af
) (cherry picked from commit660bc1673c
) (cherry picked from commit72d692a767
) [F3] introduce UserTypeF3 To avoid conflicts should UserTypeRemoteUser be used differently by Gitea (cherry picked from commit6de2701bb3
) [F3] user.Put: idempotency (cherry picked from commit821e38573c
) (cherry picked from commitf7638f5414
) [F3] upgrade to urfave v2 (cherry picked from commitcc3dbdfd1d
) [F3] update gof3 (cherry picked from commit2eee960751
) [F3] move f3 under forgejo-cli * simplify the tests by re-using the forgejo-cli helpers to capture the output * unify CmdF3 to be structured in the same way CmdActions is (cherry picked from commit4c9fe58b74
) [F3] replace f3 with forgejo-cli f3 (cherry picked from commit7ba7ceef1b
) [F3] s/ListOptions/Paginator/ [F3] user: add unit tests [F3] user comparison of F3 managed users is on content [F3] issue: add unit tests [F3] gof3 now has one more argument to Put() [F3] re-use gof3 unit tests for the driver (cherry picked from commitaf7ee6200c
) Conflicts: tests/integration/integration_test.go because of some code removed in forgejo-development, trivial context conflict resolution [F3] more idempotent tests (#1275) Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1275 Co-authored-by: Loïc Dachary <loic@dachary.org> Co-committed-by: Loïc Dachary <loic@dachary.org> [F3] tests: do SQL update if nothing changes [F3] tests comment idempotence [F3] tests milestone idempotence [F3] tests pull_request idempotence [F3] tests release idempotence [F3] tests asset idempotence [F3] tests project idempotence [F3] tests review idempotence (cherry picked from commit91038bb4e8
) (cherry picked from commita7d2a65214
) (cherry picked from commit59a17e5a34
) [F3] sub command of forgejo-cli (cherry picked from commit4d098e9b83
) [F3] implement --quiet, --debug, --verbose (cherry picked from commit82e2e17b45
) [F3] fix off by one error when importing repositories (cherry picked from commit31689b1397
) [F3] upgrade gof3 (cherry picked from commit87b8cfe5a1
) [F3] set the logger for all drivers The logger is set for the local Forgejo driver only. Even when --debug is specified, the other drivers do not display debug information. Use the gof3 context to set the logger for all of them at once. (cherry picked from commit8aa7de8ba0
) [F3] the closed date of an issue may be nil (cherry picked from commit93d3eaf0b5
) [F3] update gof3 to support system users there now is a workaround to hardcode system users when they are not supported by the API (cherry picked from commit915484daa7
) (cherry picked from commitb47ac73b8a
) [F3] upgrade gof3 with a version that can deal with system users When they are missing from what the API returns, it will replace the missing user with the Ghost user instead of leaving it be a null pointer. (cherry picked from commit9eeeab7f8e
) [F3] tests do not need a running Forgejo server (cherry picked from commitb2b9749ac9
) [F3] upgrade gof3 to correctly fetch PRs from forks (cherry picked from commitd2448de302
) [F3] upgrade gof3 to resolve incorrect object ID mappings (cherry picked from commitaf8c9de89f
) [F3] mirroring a repository needs --mirror instead of --bare (cherry picked from commit9941131920
) [F3] PR create the pull/N/head from the original PR head It is incorrect to assume they are identical because: * the IDs of a PR may be remapped and pull/N/head will become pull/M/head * the head of a remote fork is a branch named after the fork (cherry picked from commit9c220bf23e
) [F3] gof3 upgrade with non overlapping PR references (cherry picked from commitf1b2f82e7e
) [F3] refactor issue insertion to preserve the creation date issues_model.NewIssue() is convenient but will override the creation date. Update the database instead. (cherry picked from commit729f4be1e4
) [F3] gof3 upgrade to get performance improvements (cherry picked from commit996ac35d4d
) (cherry picked from commit906e9eb3f5
) (cherry picked from commitc340e22197
) (cherry picked from commitbb0ed72e08
) (cherry picked from commit500e640d6d
) [F3] TestForgeMethods needs to populate the database (cherry picked from commite6da71229f
) (cherry picked from commite3bd088895
) (cherry picked from commit2255136187
) (cherry picked from commit69584b1baf
) (cherry picked from commitbc37771dc3
) (cherry picked from commit90592146c6
) (cherry picked from commit6160eb38d9
) (cherry picked from commit4ed79ea8eb
) (cherry picked from commit8cb9c266ab
) (cherry picked from commit7b346e7bb2
) (cherry picked from commit0345dd562d
) (cherry picked from commit0f8821c1b1
) [F3] resolve (cherry picked from commit2acd211536
) (cherry picked from commit704317c24e
) (cherry picked from commitb127296da6
) (cherry picked from commit000b6f823e
) (cherry picked from commit7bd1b35139
) (cherry picked from commit6ba434bf2f
) (cherry picked from commit5c0826c529
) (cherry picked from commit00f7d12512
) (cherry picked from commit13550cb0b5
) (cherry picked from commit3b16d9e114
) (cherry picked from commit1b0db139d6
) [F3] licenses (cherry picked from commit2bccd8c1ef
) (cherry picked from commita92c48c8c2
)
115 lines
3.8 KiB
Go
115 lines
3.8 KiB
Go
// SPDX-FileCopyrightText: Copyright the Forgejo contributors
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package f3
|
|
|
|
import (
|
|
"context"
|
|
|
|
auth_model "code.gitea.io/gitea/models/auth"
|
|
"code.gitea.io/gitea/models/db"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/log"
|
|
f3_source "code.gitea.io/gitea/services/auth/source/f3"
|
|
"code.gitea.io/gitea/services/auth/source/oauth2"
|
|
)
|
|
|
|
func getUserByLoginName(ctx context.Context, name string) (*user_model.User, error) {
|
|
if len(name) == 0 {
|
|
return nil, user_model.ErrUserNotExist{Name: name}
|
|
}
|
|
u := &user_model.User{LoginName: name, LoginType: auth_model.F3, Type: user_model.UserTypeF3}
|
|
has, err := db.GetEngine(ctx).Get(u)
|
|
if err != nil {
|
|
return nil, err
|
|
} else if !has {
|
|
return nil, user_model.ErrUserNotExist{Name: name}
|
|
}
|
|
return u, nil
|
|
}
|
|
|
|
// The user created by F3 has:
|
|
//
|
|
// Type UserTypeF3
|
|
// LogingType F3
|
|
// LoginName set to the unique identifier of the originating forge
|
|
// LoginSource set to the F3 source that can be matched against a OAuth2 source
|
|
//
|
|
// If the source from which an authentification happens is OAuth2, an existing
|
|
// F3 user will be promoted to an OAuth2 user provided:
|
|
//
|
|
// user.LoginName is the same as goth.UserID (argument loginName)
|
|
// user.LoginSource has a MatchingSource equals to the name of the OAuth2 provider
|
|
//
|
|
// Once promoted, the user will be logged in without further interaction from the
|
|
// user and will own all repositories, issues, etc. associated with it.
|
|
func MaybePromoteF3User(ctx context.Context, source *auth_model.Source, loginName, email string) error {
|
|
user, err := getF3UserToPromote(ctx, source, loginName, email)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if user != nil {
|
|
promote := &user_model.User{
|
|
ID: user.ID,
|
|
Type: user_model.UserTypeIndividual,
|
|
Email: email,
|
|
LoginSource: source.ID,
|
|
LoginType: source.Type,
|
|
}
|
|
log.Debug("promote user %v: LoginName %v => %v, LoginSource %v => %v, LoginType %v => %v, Email %v => %v", user.ID, user.LoginName, promote.LoginName, user.LoginSource, promote.LoginSource, user.LoginType, promote.LoginType, user.Email, promote.Email)
|
|
return user_model.UpdateUser(ctx, promote, true, "type", "email", "login_source", "login_type")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func getF3UserToPromote(ctx context.Context, source *auth_model.Source, loginName, email string) (*user_model.User, error) {
|
|
if !source.IsOAuth2() {
|
|
log.Debug("getF3UserToPromote: source %v is not OAuth2", source)
|
|
return nil, nil
|
|
}
|
|
oauth2Source, ok := source.Cfg.(*oauth2.Source)
|
|
if !ok {
|
|
log.Error("getF3UserToPromote: source claims to be OAuth2 but really is %v", oauth2Source)
|
|
return nil, nil
|
|
}
|
|
|
|
u, err := getUserByLoginName(ctx, loginName)
|
|
if err != nil {
|
|
if user_model.IsErrUserNotExist(err) {
|
|
log.Debug("getF3UserToPromote: no user with LoginType F3 and LoginName '%s'", loginName)
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
if !u.IsF3() {
|
|
log.Debug("getF3UserToPromote: user %v is not a managed by F3", u)
|
|
return nil, nil
|
|
}
|
|
|
|
if u.Email != "" {
|
|
log.Debug("getF3UserToPromote: the user email is already set to '%s'", u.Email)
|
|
return nil, nil
|
|
}
|
|
|
|
userSource, err := auth_model.GetSourceByID(ctx, u.LoginSource)
|
|
if err != nil {
|
|
if auth_model.IsErrSourceNotExist(err) {
|
|
log.Error("getF3UserToPromote: source id = %v for user %v not found %v", u.LoginSource, u.ID, err)
|
|
return nil, nil
|
|
}
|
|
return nil, err
|
|
}
|
|
f3Source, ok := userSource.Cfg.(*f3_source.Source)
|
|
if !ok {
|
|
log.Error("getF3UserToPromote: expected an F3 source but got %T %v", userSource, userSource)
|
|
return nil, nil
|
|
}
|
|
|
|
if oauth2Source.Provider != f3Source.MatchingSource {
|
|
log.Debug("getF3UserToPromote: skip OAuth2 source %s because it is different from %s which is the expected match for the F3 source %s", oauth2Source.Provider, f3Source.MatchingSource, f3Source.URL)
|
|
return nil, nil
|
|
}
|
|
|
|
return u, nil
|
|
}
|