mirror of
https://github.com/go-gitea/gitea.git
synced 2025-12-09 11:11:57 +01:00
Merge branch 'main' into lunny/frontend_render_plugin
This commit is contained in:
commit
3310c6ad45
@ -276,8 +276,14 @@ func GetActionsUserRepoPermission(ctx context.Context, repo *repo_model.Reposito
|
|||||||
if !actionsCfg.IsCollaborativeOwner(taskRepo.OwnerID) || !taskRepo.IsPrivate {
|
if !actionsCfg.IsCollaborativeOwner(taskRepo.OwnerID) || !taskRepo.IsPrivate {
|
||||||
// The task repo can access the current repo only if the task repo is private and
|
// The task repo can access the current repo only if the task repo is private and
|
||||||
// the owner of the task repo is a collaborative owner of the current repo.
|
// the owner of the task repo is a collaborative owner of the current repo.
|
||||||
// FIXME allow public repo read access if tokenless pull is enabled
|
|
||||||
// FIXME should owner's visibility also be considered here?
|
// FIXME should owner's visibility also be considered here?
|
||||||
|
|
||||||
|
// check permission like simple user but limit to read-only
|
||||||
|
perm, err = GetUserRepoPermission(ctx, repo, user_model.NewActionsUser())
|
||||||
|
if err != nil {
|
||||||
|
return perm, err
|
||||||
|
}
|
||||||
|
perm.AccessMode = min(perm.AccessMode, perm_model.AccessModeRead)
|
||||||
return perm, nil
|
return perm, nil
|
||||||
}
|
}
|
||||||
accessMode = perm_model.AccessModeRead
|
accessMode = perm_model.AccessModeRead
|
||||||
|
|||||||
@ -215,6 +215,7 @@ more=Níos mó
|
|||||||
buttons.heading.tooltip=Cuir ceannteideal leis
|
buttons.heading.tooltip=Cuir ceannteideal leis
|
||||||
buttons.bold.tooltip=Cuir téacs trom leis
|
buttons.bold.tooltip=Cuir téacs trom leis
|
||||||
buttons.italic.tooltip=Cuir téacs iodálach leis
|
buttons.italic.tooltip=Cuir téacs iodálach leis
|
||||||
|
buttons.strikethrough.tooltip=Cuir téacs trína chéile
|
||||||
buttons.quote.tooltip=Téacs luaigh
|
buttons.quote.tooltip=Téacs luaigh
|
||||||
buttons.code.tooltip=Cuir cód leis
|
buttons.code.tooltip=Cuir cód leis
|
||||||
buttons.link.tooltip=Cuir nasc leis
|
buttons.link.tooltip=Cuir nasc leis
|
||||||
|
|||||||
@ -215,6 +215,7 @@ more=Mais
|
|||||||
buttons.heading.tooltip=Adicionar cabeçalho
|
buttons.heading.tooltip=Adicionar cabeçalho
|
||||||
buttons.bold.tooltip=Adicionar texto em negrito
|
buttons.bold.tooltip=Adicionar texto em negrito
|
||||||
buttons.italic.tooltip=Adicionar texto em itálico
|
buttons.italic.tooltip=Adicionar texto em itálico
|
||||||
|
buttons.strikethrough.tooltip=Adicionar texto rasurado
|
||||||
buttons.quote.tooltip=Citar texto
|
buttons.quote.tooltip=Citar texto
|
||||||
buttons.code.tooltip=Adicionar código-fonte
|
buttons.code.tooltip=Adicionar código-fonte
|
||||||
buttons.link.tooltip=Adicionar uma ligação
|
buttons.link.tooltip=Adicionar uma ligação
|
||||||
|
|||||||
54
tests/integration/api_actions_permission_test.go
Normal file
54
tests/integration/api_actions_permission_test.go
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
// Copyright 2025 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package integration
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
api "code.gitea.io/gitea/modules/structs"
|
||||||
|
"code.gitea.io/gitea/modules/test"
|
||||||
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func testActionUserSignIn(t *testing.T) {
|
||||||
|
req := NewRequest(t, "GET", "/api/v1/user").
|
||||||
|
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
|
||||||
|
var u api.User
|
||||||
|
DecodeJSON(t, resp, &u)
|
||||||
|
assert.Equal(t, "gitea-actions", u.UserName)
|
||||||
|
}
|
||||||
|
|
||||||
|
func testActionUserAccessPublicRepo(t *testing.T) {
|
||||||
|
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/raw/README.md").
|
||||||
|
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
|
||||||
|
resp := MakeRequest(t, req, http.StatusOK)
|
||||||
|
assert.Equal(t, "file", resp.Header().Get("x-gitea-object-type"))
|
||||||
|
|
||||||
|
defer test.MockVariableValue(&setting.Service.RequireSignInViewStrict, true)()
|
||||||
|
|
||||||
|
req = NewRequestf(t, "GET", "/api/v1/repos/user2/repo1/raw/README.md").
|
||||||
|
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
|
||||||
|
resp = MakeRequest(t, req, http.StatusOK)
|
||||||
|
assert.Equal(t, "file", resp.Header().Get("x-gitea-object-type"))
|
||||||
|
}
|
||||||
|
|
||||||
|
func testActionUserNoAccessOtherPrivateRepo(t *testing.T) {
|
||||||
|
req := NewRequestf(t, "GET", "/api/v1/repos/user2/repo2/raw/README.md").
|
||||||
|
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
|
||||||
|
MakeRequest(t, req, http.StatusNotFound)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestActionUserAccessPermission(t *testing.T) {
|
||||||
|
defer tests.PrepareTestEnv(t)()
|
||||||
|
|
||||||
|
t.Run("ActionUserSignIn", testActionUserSignIn)
|
||||||
|
t.Run("ActionUserAccessPublicRepo", testActionUserAccessPublicRepo)
|
||||||
|
t.Run("ActionUserNoAccessOtherPrivateRepo", testActionUserNoAccessOtherPrivateRepo)
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user