mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-10-22 01:05:48 +00:00
Allow to set custom trusted clone plugins (#4352)
Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Thomas Anderson <127358482+zc-devs@users.noreply.github.com> Co-authored-by: Anbraten <6918444+anbraten@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
@@ -94,7 +94,6 @@ func PostRepo(c *gin.Context) {
|
||||
repo.RequireApproval = model.RequireApprovalForks
|
||||
repo.AllowPull = true
|
||||
repo.AllowDeploy = false
|
||||
repo.NetrcOnlyTrusted = true
|
||||
repo.CancelPreviousPipelineEvents = server.Config.Pipeline.DefaultCancelPreviousPipelineEvents
|
||||
}
|
||||
repo.IsActive = true
|
||||
@@ -275,8 +274,8 @@ func PatchRepo(c *gin.Context) {
|
||||
if in.CancelPreviousPipelineEvents != nil {
|
||||
repo.CancelPreviousPipelineEvents = *in.CancelPreviousPipelineEvents
|
||||
}
|
||||
if in.NetrcOnlyTrusted != nil {
|
||||
repo.NetrcOnlyTrusted = *in.NetrcOnlyTrusted
|
||||
if in.NetrcTrusted != nil {
|
||||
repo.NetrcTrustedPlugins = *in.NetrcTrusted
|
||||
}
|
||||
if in.Visibility != nil {
|
||||
switch *in.Visibility {
|
||||
|
@@ -71,7 +71,7 @@ type Repo struct {
|
||||
Hash string `json:"-" xorm:"varchar(500) 'hash'"`
|
||||
Perm *Perm `json:"-" xorm:"-"`
|
||||
CancelPreviousPipelineEvents []WebhookEvent `json:"cancel_previous_pipeline_events" xorm:"json 'cancel_previous_pipeline_events'"`
|
||||
NetrcOnlyTrusted bool `json:"netrc_only_trusted" xorm:"NOT NULL DEFAULT true 'netrc_only_trusted'"`
|
||||
NetrcTrustedPlugins []string `json:"netrc_trusted" xorm:"json 'netrc_trusted'"`
|
||||
} // @name Repo
|
||||
|
||||
// TableName return database table name for xorm.
|
||||
@@ -137,7 +137,7 @@ type RepoPatch struct {
|
||||
AllowPull *bool `json:"allow_pr,omitempty"`
|
||||
AllowDeploy *bool `json:"allow_deploy,omitempty"`
|
||||
CancelPreviousPipelineEvents *[]WebhookEvent `json:"cancel_previous_pipeline_events"`
|
||||
NetrcOnlyTrusted *bool `json:"netrc_only_trusted"`
|
||||
NetrcTrusted *[]string `json:"netrc_trusted"`
|
||||
Trusted *TrustedConfigurationPatch `json:"trusted"`
|
||||
} // @name RepoPatch
|
||||
|
||||
|
@@ -290,7 +290,7 @@ func (b *StepBuilder) toInternalRepresentation(parsed *yaml_types.Workflow, envi
|
||||
b.Repo.IsSCMPrivate || server.Config.Pipeline.AuthenticatePublicRepos,
|
||||
),
|
||||
compiler.WithDefaultClonePlugin(server.Config.Pipeline.DefaultClonePlugin),
|
||||
compiler.WithTrustedClonePlugins(server.Config.Pipeline.TrustedClonePlugins),
|
||||
compiler.WithTrustedClonePlugins(append(b.Repo.NetrcTrustedPlugins, server.Config.Pipeline.TrustedClonePlugins...)),
|
||||
compiler.WithRegistry(registries...),
|
||||
compiler.WithSecret(secrets...),
|
||||
compiler.WithPrefix(
|
||||
@@ -304,7 +304,6 @@ func (b *StepBuilder) toInternalRepresentation(parsed *yaml_types.Workflow, envi
|
||||
compiler.WithWorkspaceFromURL(compiler.DefaultWorkspaceBase, b.Repo.ForgeURL),
|
||||
compiler.WithMetadata(metadata),
|
||||
compiler.WithTrustedSecurity(b.Repo.Trusted.Security),
|
||||
compiler.WithNetrcOnlyTrusted(b.Repo.NetrcOnlyTrusted),
|
||||
).Compile(parsed)
|
||||
}
|
||||
|
||||
|
@@ -0,0 +1,36 @@
|
||||
// Copyright 2024 Woodpecker Authors
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package migration
|
||||
|
||||
import (
|
||||
"src.techknowlogick.com/xormigrate"
|
||||
"xorm.io/xorm"
|
||||
)
|
||||
|
||||
var removeRepoNetrcOnlyTrusted = xormigrate.Migration{
|
||||
ID: "remove-repo-netrc-only-trusted",
|
||||
MigrateSession: func(sess *xorm.Session) (err error) {
|
||||
type repos struct {
|
||||
NetrcOnlyTrusted string `xorm:"netrc_only_trusted"`
|
||||
}
|
||||
|
||||
// ensure columns to drop exist
|
||||
if err := sess.Sync(new(repos)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return dropTableColumns(sess, "repos", "netrc_only_trusted")
|
||||
},
|
||||
}
|
@@ -48,6 +48,7 @@ var migrationTasks = []*xormigrate.Migration{
|
||||
&splitTrusted,
|
||||
&correctPotentialCorruptOrgsUsersRelation,
|
||||
&gatedToRequireApproval,
|
||||
&removeRepoNetrcOnlyTrusted,
|
||||
}
|
||||
|
||||
var allBeans = []any{
|
||||
|
Reference in New Issue
Block a user