mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-17 16:42:19 +09:00
0e2a188d8e
Backport #39785 by @bircni The [Gitea VS Code extension](https://gitea.com/gitea/gitea-vscode) currently signs in through the builtin `tea` OAuth2 application. Gitea keeps one grant per user and application, so anyone who has already signed in with the tea CLI gets `a grant exists with different scope` when the extension requests its own scopes, and sign-in fails (gitea/gitea-vscode#24). This adds a dedicated builtin application for the extension, following the same mechanism as the existing CLI entries: | | | |---|---| | client ID | `75a9ec3e-42b5-40cb-9144-9ea96ecd56a6` | | config name | `gitea-vscode` | | display name | `gitea-vscode` | | redirect URIs | `http://127.0.0.1`, `https://127.0.0.1` (loopback, any port) | It is enabled by default via `[oauth2].DEFAULT_APPLICATIONS`. Instances that set that option explicitly need to add `gitea-vscode` to use it. The extension will use this client on Gitea >= 28.2.0 and keep falling back to `tea` on older servers, so this should be backported to v28. Co-authored-by: bircni <bircni@icloud.com>
79 lines
2.2 KiB
Go
79 lines
2.2 KiB
Go
// Copyright 2024 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package setting
|
|
|
|
import (
|
|
"os"
|
|
"testing"
|
|
|
|
"gitea.dev/modules/generate"
|
|
"gitea.dev/modules/test"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestGetGeneralSigningSecret(t *testing.T) {
|
|
// when there is no general signing secret, it should be generated, and keep the same value
|
|
generalSigningSecret.Store(nil)
|
|
s1 := GetGeneralTokenSigningSecret()
|
|
assert.NotNil(t, s1)
|
|
s2 := GetGeneralTokenSigningSecret()
|
|
assert.Equal(t, s1, s2)
|
|
|
|
// the config value should always override any pre-generated value
|
|
cfg, _ := NewConfigProviderFromData(`
|
|
[oauth2]
|
|
JWT_SECRET = BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
|
|
`)
|
|
defer test.MockVariableValue(&InstallLock, true)()
|
|
loadOAuth2From(cfg)
|
|
actual := GetGeneralTokenSigningSecret()
|
|
expected, _ := generate.DecodeJwtSecretBase64("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB")
|
|
assert.Len(t, actual, 32)
|
|
assert.Equal(t, expected, actual)
|
|
}
|
|
|
|
func TestGetGeneralSigningSecretSave(t *testing.T) {
|
|
defer test.MockVariableValue(&InstallLock, true)()
|
|
|
|
old := GetGeneralTokenSigningSecret()
|
|
assert.Len(t, old, 32)
|
|
|
|
tmpFile := t.TempDir() + "/app.ini"
|
|
_ = os.WriteFile(tmpFile, nil, 0o644)
|
|
cfg, _ := NewConfigProviderFromFile(tmpFile)
|
|
loadOAuth2From(cfg)
|
|
generated := GetGeneralTokenSigningSecret()
|
|
assert.Len(t, generated, 32)
|
|
assert.NotEqual(t, old, generated)
|
|
|
|
generalSigningSecret.Store(nil)
|
|
cfg, _ = NewConfigProviderFromFile(tmpFile)
|
|
loadOAuth2From(cfg)
|
|
again := GetGeneralTokenSigningSecret()
|
|
assert.Equal(t, generated, again)
|
|
|
|
iniContent, err := os.ReadFile(tmpFile)
|
|
assert.NoError(t, err)
|
|
assert.Contains(t, string(iniContent), "JWT_SECRET = ")
|
|
}
|
|
|
|
func TestOauth2DefaultApplications(t *testing.T) {
|
|
cfg, _ := NewConfigProviderFromData(``)
|
|
loadOAuth2From(cfg)
|
|
assert.Equal(t, []string{"git-credential-oauth", "git-credential-manager", "tea", "gitea-app", "gitea-vscode"}, OAuth2.DefaultApplications)
|
|
|
|
cfg, _ = NewConfigProviderFromData(`[oauth2]
|
|
DEFAULT_APPLICATIONS = tea
|
|
`)
|
|
loadOAuth2From(cfg)
|
|
assert.Equal(t, []string{"tea"}, OAuth2.DefaultApplications)
|
|
|
|
cfg, _ = NewConfigProviderFromData(`[oauth2]
|
|
DEFAULT_APPLICATIONS =
|
|
`)
|
|
loadOAuth2From(cfg)
|
|
assert.Nil(t, OAuth2.DefaultApplications)
|
|
}
|