mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-10-31 20:44:07 +00:00
21fdd28f08
This leverages the existing `sync_external_users` cron job to synchronize the `IsActive` flag on users who use an OAuth2 provider set to synchronize. This synchronization is done by checking for expired access tokens, and using the stored refresh token to request a new access token. If the response back from the OAuth2 provider is the `invalid_grant` error code, the user is marked as inactive. However, the user is able to reactivate their account by logging in the web browser through their OAuth2 flow. Also changed to support this is that a linked `ExternalLoginUser` is always created upon a login or signup via OAuth2. Ideally, we would also refresh permissions from the configured OAuth provider (e.g., admin, restricted and group mappings) to match the implementation of LDAP. However, the OAuth library used for this `goth`, doesn't seem to support issuing a session via refresh tokens. The interface provides a [`RefreshToken` method](https://github.com/markbates/goth/blob/master/provider.go#L20), but the returned `oauth.Token` doesn't implement the `goth.Session` we would need to call `FetchUser`. Due to specific implementations, we would need to build a compatibility function for every provider, since they cast to concrete types (e.g. [Azure](https://github.com/markbates/goth/blob/master/providers/azureadv2/azureadv2.go#L132)) --------- Co-authored-by: Kyle D <kdumontnu@gmail.com> (cherry picked from commit 416c36f3034e228a27258b5a8a15eec4e5e426ba) Conflicts: - tests/integration/auth_ldap_test.go Trivial conflict resolved by manually applying the change. - routers/web/auth/oauth.go Technically not a conflict, but the original PR removed the modules/util import, which in our version, is still in use. Added it back.
101 lines
2.5 KiB
Go
101 lines
2.5 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package oauth2
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/auth"
|
|
"code.gitea.io/gitea/models/unittest"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestSource(t *testing.T) {
|
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
|
|
source := &Source{
|
|
Provider: "fake",
|
|
authSource: &auth.Source{
|
|
ID: 12,
|
|
Type: auth.OAuth2,
|
|
Name: "fake",
|
|
IsActive: true,
|
|
IsSyncEnabled: true,
|
|
},
|
|
}
|
|
|
|
user := &user_model.User{
|
|
LoginName: "external",
|
|
LoginType: auth.OAuth2,
|
|
LoginSource: source.authSource.ID,
|
|
Name: "test",
|
|
Email: "external@example.com",
|
|
}
|
|
|
|
err := user_model.CreateUser(context.Background(), user, &user_model.CreateUserOverwriteOptions{})
|
|
assert.NoError(t, err)
|
|
|
|
e := &user_model.ExternalLoginUser{
|
|
ExternalID: "external",
|
|
UserID: user.ID,
|
|
LoginSourceID: user.LoginSource,
|
|
RefreshToken: "valid",
|
|
}
|
|
err = user_model.LinkExternalToUser(context.Background(), user, e)
|
|
assert.NoError(t, err)
|
|
|
|
provider, err := createProvider(source.authSource.Name, source)
|
|
assert.NoError(t, err)
|
|
|
|
t.Run("refresh", func(t *testing.T) {
|
|
t.Run("valid", func(t *testing.T) {
|
|
err := source.refresh(context.Background(), provider, e)
|
|
assert.NoError(t, err)
|
|
|
|
e := &user_model.ExternalLoginUser{
|
|
ExternalID: e.ExternalID,
|
|
LoginSourceID: e.LoginSourceID,
|
|
}
|
|
|
|
ok, err := user_model.GetExternalLogin(context.Background(), e)
|
|
assert.NoError(t, err)
|
|
assert.True(t, ok)
|
|
assert.Equal(t, e.RefreshToken, "refresh")
|
|
assert.Equal(t, e.AccessToken, "token")
|
|
|
|
u, err := user_model.GetUserByID(context.Background(), user.ID)
|
|
assert.NoError(t, err)
|
|
assert.True(t, u.IsActive)
|
|
})
|
|
|
|
t.Run("expired", func(t *testing.T) {
|
|
err := source.refresh(context.Background(), provider, &user_model.ExternalLoginUser{
|
|
ExternalID: "external",
|
|
UserID: user.ID,
|
|
LoginSourceID: user.LoginSource,
|
|
RefreshToken: "expired",
|
|
})
|
|
assert.NoError(t, err)
|
|
|
|
e := &user_model.ExternalLoginUser{
|
|
ExternalID: e.ExternalID,
|
|
LoginSourceID: e.LoginSourceID,
|
|
}
|
|
|
|
ok, err := user_model.GetExternalLogin(context.Background(), e)
|
|
assert.NoError(t, err)
|
|
assert.True(t, ok)
|
|
assert.Equal(t, e.RefreshToken, "")
|
|
assert.Equal(t, e.AccessToken, "")
|
|
|
|
u, err := user_model.GetUserByID(context.Background(), user.ID)
|
|
assert.NoError(t, err)
|
|
assert.False(t, u.IsActive)
|
|
})
|
|
})
|
|
}
|