2023-06-14 02:36:52 -04:00
|
|
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
package setting
|
|
|
|
|
|
|
|
import (
|
|
|
|
"path/filepath"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
Restrict `[actions].DEFAULT_ACTIONS_URL` to only `github` or `self` (#25581) (#25604)
Backport #25581 by @wolfogre
Resolve #24789
## :warning: BREAKING :warning:
Before this, `DEFAULT_ACTIONS_URL` cound be set to any custom URLs like
`https://gitea.com` or `http://your-git-server,https://gitea.com`, and
the default value was `https://gitea.com`.
But now, `DEFAULT_ACTIONS_URL` supports only
`github`(`https://github.com`) or `self`(the root url of current Gitea
instance), and the default value is `github`.
If it has configured with a URL, an error log will be displayed and it
will fallback to `github`.
Actually, what we really want to do is always make it
`https://github.com`, however, this may not be acceptable for some
instances of internal use, so there's extra support for `self`, but no
more, even `https://gitea.com`.
Please note that `uses: https://xxx/yyy/zzz` always works and it does
exactly what it is supposed to do.
Although it's breaking, I belive it should be backported to `v1.20` due
to some security issues.
Follow-up on the runner side:
- https://gitea.com/gitea/act_runner/pulls/262
- https://gitea.com/gitea/act/pulls/70
Co-authored-by: Jason Song <i@wolfogre.com>
2023-06-30 03:53:00 -04:00
|
|
|
"github.com/stretchr/testify/require"
|
2023-06-14 02:36:52 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
func Test_getStorageInheritNameSectionTypeForActions(t *testing.T) {
|
|
|
|
iniStr := `
|
|
|
|
[storage]
|
|
|
|
STORAGE_TYPE = minio
|
|
|
|
`
|
|
|
|
cfg, err := NewConfigProviderFromData(iniStr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
|
|
|
|
assert.EqualValues(t, "minio", Actions.LogStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
|
|
|
|
assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
|
|
|
|
|
|
|
|
iniStr = `
|
|
|
|
[storage.actions_log]
|
|
|
|
STORAGE_TYPE = minio
|
|
|
|
`
|
|
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
|
|
|
|
assert.EqualValues(t, "minio", Actions.LogStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
|
|
|
|
assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
|
|
|
|
|
|
|
|
iniStr = `
|
|
|
|
[storage.actions_log]
|
|
|
|
STORAGE_TYPE = my_storage
|
|
|
|
|
|
|
|
[storage.my_storage]
|
|
|
|
STORAGE_TYPE = minio
|
|
|
|
`
|
|
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
|
|
|
|
assert.EqualValues(t, "minio", Actions.LogStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_log/", Actions.LogStorage.MinioConfig.BasePath)
|
|
|
|
assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
|
|
|
|
|
|
|
|
iniStr = `
|
|
|
|
[storage.actions_artifacts]
|
|
|
|
STORAGE_TYPE = my_storage
|
|
|
|
|
|
|
|
[storage.my_storage]
|
|
|
|
STORAGE_TYPE = minio
|
|
|
|
`
|
|
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
|
|
|
|
assert.EqualValues(t, "local", Actions.LogStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
|
|
|
|
assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
|
|
|
|
|
|
|
|
iniStr = `
|
|
|
|
[storage.actions_artifacts]
|
|
|
|
STORAGE_TYPE = my_storage
|
|
|
|
|
|
|
|
[storage.my_storage]
|
|
|
|
STORAGE_TYPE = minio
|
|
|
|
`
|
|
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
|
|
|
|
assert.EqualValues(t, "local", Actions.LogStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
|
|
|
|
assert.EqualValues(t, "minio", Actions.ArtifactStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_artifacts/", Actions.ArtifactStorage.MinioConfig.BasePath)
|
|
|
|
|
|
|
|
iniStr = ``
|
|
|
|
cfg, err = NewConfigProviderFromData(iniStr)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NoError(t, loadActionsFrom(cfg))
|
|
|
|
|
|
|
|
assert.EqualValues(t, "local", Actions.LogStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_log", filepath.Base(Actions.LogStorage.Path))
|
|
|
|
assert.EqualValues(t, "local", Actions.ArtifactStorage.Type)
|
|
|
|
assert.EqualValues(t, "actions_artifacts", filepath.Base(Actions.ArtifactStorage.Path))
|
|
|
|
}
|
Restrict `[actions].DEFAULT_ACTIONS_URL` to only `github` or `self` (#25581) (#25604)
Backport #25581 by @wolfogre
Resolve #24789
## :warning: BREAKING :warning:
Before this, `DEFAULT_ACTIONS_URL` cound be set to any custom URLs like
`https://gitea.com` or `http://your-git-server,https://gitea.com`, and
the default value was `https://gitea.com`.
But now, `DEFAULT_ACTIONS_URL` supports only
`github`(`https://github.com`) or `self`(the root url of current Gitea
instance), and the default value is `github`.
If it has configured with a URL, an error log will be displayed and it
will fallback to `github`.
Actually, what we really want to do is always make it
`https://github.com`, however, this may not be acceptable for some
instances of internal use, so there's extra support for `self`, but no
more, even `https://gitea.com`.
Please note that `uses: https://xxx/yyy/zzz` always works and it does
exactly what it is supposed to do.
Although it's breaking, I belive it should be backported to `v1.20` due
to some security issues.
Follow-up on the runner side:
- https://gitea.com/gitea/act_runner/pulls/262
- https://gitea.com/gitea/act/pulls/70
Co-authored-by: Jason Song <i@wolfogre.com>
2023-06-30 03:53:00 -04:00
|
|
|
|
|
|
|
func Test_getDefaultActionsURLForActions(t *testing.T) {
|
|
|
|
oldActions := Actions
|
|
|
|
oldAppURL := AppURL
|
|
|
|
defer func() {
|
|
|
|
Actions = oldActions
|
|
|
|
AppURL = oldAppURL
|
|
|
|
}()
|
|
|
|
|
|
|
|
AppURL = "http://test_get_default_actions_url_for_actions:3000/"
|
|
|
|
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
iniStr string
|
|
|
|
wantErr assert.ErrorAssertionFunc
|
|
|
|
wantURL string
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "default",
|
|
|
|
iniStr: `
|
|
|
|
[actions]
|
|
|
|
`,
|
|
|
|
wantErr: assert.NoError,
|
|
|
|
wantURL: "https://github.com",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "github",
|
|
|
|
iniStr: `
|
|
|
|
[actions]
|
|
|
|
DEFAULT_ACTIONS_URL = github
|
|
|
|
`,
|
|
|
|
wantErr: assert.NoError,
|
|
|
|
wantURL: "https://github.com",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "self",
|
|
|
|
iniStr: `
|
|
|
|
[actions]
|
|
|
|
DEFAULT_ACTIONS_URL = self
|
|
|
|
`,
|
|
|
|
wantErr: assert.NoError,
|
|
|
|
wantURL: "http://test_get_default_actions_url_for_actions:3000",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "custom url",
|
|
|
|
iniStr: `
|
|
|
|
[actions]
|
|
|
|
DEFAULT_ACTIONS_URL = https://gitea.com
|
|
|
|
`,
|
|
|
|
wantErr: assert.NoError,
|
|
|
|
wantURL: "https://github.com",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "custom urls",
|
|
|
|
iniStr: `
|
|
|
|
[actions]
|
|
|
|
DEFAULT_ACTIONS_URL = https://gitea.com,https://github.com
|
|
|
|
`,
|
|
|
|
wantErr: assert.NoError,
|
|
|
|
wantURL: "https://github.com",
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "invalid",
|
|
|
|
iniStr: `
|
|
|
|
[actions]
|
|
|
|
DEFAULT_ACTIONS_URL = gitea
|
|
|
|
`,
|
|
|
|
wantErr: assert.Error,
|
|
|
|
wantURL: "https://github.com",
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
cfg, err := NewConfigProviderFromData(tt.iniStr)
|
|
|
|
require.NoError(t, err)
|
|
|
|
if !tt.wantErr(t, loadActionsFrom(cfg)) {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
assert.EqualValues(t, tt.wantURL, Actions.DefaultActionsURL.URL())
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|