From a8fa090eaa63e26df13ea36720dab7342f27aba7 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 01:51:25 +0200
Subject: [PATCH 01/25] Extend utils.MatchImage by add utils.MatchImageDynamic
 and utils.MatchImageExact

to compare container images
---
 pipeline/frontend/yaml/utils/image.go      |  41 ++++-
 pipeline/frontend/yaml/utils/image_test.go | 188 +++++++++++++++++++++
 2 files changed, 228 insertions(+), 1 deletion(-)

diff --git a/pipeline/frontend/yaml/utils/image.go b/pipeline/frontend/yaml/utils/image.go
index 63054c21d1..34350a9f2a 100644
--- a/pipeline/frontend/yaml/utils/image.go
+++ b/pipeline/frontend/yaml/utils/image.go
@@ -14,7 +14,11 @@
 
 package utils
 
-import "github.com/distribution/reference"
+import (
+	"strings"
+
+	"github.com/distribution/reference"
+)
 
 // trimImage returns the short image name without tag.
 func trimImage(name string) string {
@@ -57,6 +61,41 @@ func MatchImage(from string, to ...string) bool {
 	return false
 }
 
+// MatchImageExact returns true if the image name and tag matches
+// an image in the list.
+func MatchImageExact(from string, to ...string) bool {
+	from = expandImage(from)
+	for _, match := range to {
+		if from == expandImage(match) {
+			return true
+		}
+	}
+	return false
+}
+
+// MatchImageDynamic check if image is in list based on list.
+// If an list entry has a tag specified it only will match if both are the same, else the tag is ignored.
+func MatchImageDynamic(from string, to ...string) bool {
+	fullFrom := expandImage(from)
+	trimFrom := trimImage(from)
+	for _, match := range to {
+		if imageHasTag(match) {
+			if fullFrom == expandImage(match) {
+				return true
+			}
+		} else {
+			if trimFrom == trimImage(match) {
+				return true
+			}
+		}
+	}
+	return false
+}
+
+func imageHasTag(name string) bool {
+	return strings.Contains(name, ":")
+}
+
 // MatchHostname returns true if the image hostname
 // matches the specified hostname.
 func MatchHostname(image, hostname string) bool {
diff --git a/pipeline/frontend/yaml/utils/image_test.go b/pipeline/frontend/yaml/utils/image_test.go
index 17fab45d5b..9464048209 100644
--- a/pipeline/frontend/yaml/utils/image_test.go
+++ b/pipeline/frontend/yaml/utils/image_test.go
@@ -113,6 +113,10 @@ func Test_expandImage(t *testing.T) {
 			from: "gcr.io/golang:1.0.0",
 			want: "gcr.io/golang:1.0.0",
 		},
+		{
+			from: "codeberg.org/6543/hello:latest@2c98dce11f78c2b4e40f513ca82f75035eb8cfa4957a6d8eb3f917ecaf77803",
+			want: "codeberg.org/6543/hello:latest@2c98dce11f78c2b4e40f513ca82f75035eb8cfa4957a6d8eb3f917ecaf77803",
+		},
 		// error cases, return input unmodified
 		{
 			from: "foo/bar?baz:boo",
@@ -124,6 +128,57 @@ func Test_expandImage(t *testing.T) {
 	}
 }
 
+func Test_imageHasTag(t *testing.T) {
+	testdata := []struct {
+		from string
+		want bool
+	}{
+		{
+			from: "golang",
+			want: false,
+		},
+		{
+			from: "golang:latest",
+			want: true,
+		},
+		{
+			from: "golang:1.0.0",
+			want: true,
+		},
+		{
+			from: "library/golang",
+			want: false,
+		},
+		{
+			from: "library/golang:latest",
+			want: true,
+		},
+		{
+			from: "library/golang:1.0.0",
+			want: true,
+		},
+		{
+			from: "index.docker.io/library/golang:1.0.0",
+			want: true,
+		},
+		{
+			from: "gcr.io/golang",
+			want: false,
+		},
+		{
+			from: "gcr.io/golang:1.0.0",
+			want: true,
+		},
+		{
+			from: "codeberg.org/6543/hello:latest@2c98dce11f78c2b4e40f513ca82f75035eb8cfa4957a6d8eb3f917ecaf77803",
+			want: true,
+		},
+	}
+	for _, test := range testdata {
+		assert.Equal(t, test.want, imageHasTag(test.from))
+	}
+}
+
 func Test_matchImage(t *testing.T) {
 	testdata := []struct {
 		from, to string
@@ -205,6 +260,139 @@ func Test_matchImage(t *testing.T) {
 	}
 }
 
+func Test_matchImageExact(t *testing.T) {
+	testdata := []struct {
+		from, to string
+		want     bool
+	}{
+		{
+			from: "golang",
+			to:   "golang",
+			want: true,
+		},
+		{
+			from: "golang:latest",
+			to:   "golang",
+			want: true,
+		},
+		{
+			from: "library/golang:latest",
+			to:   "golang",
+			want: true,
+		},
+		{
+			from: "index.docker.io/library/golang:1.0.0",
+			to:   "golang",
+			want: false,
+		},
+		{
+			from: "golang",
+			to:   "golang:latest",
+			want: true,
+		},
+		{
+			from: "library/golang:latest",
+			to:   "library/golang",
+			want: true,
+		},
+		{
+			from: "gcr.io/golang",
+			to:   "gcr.io/golang",
+			want: true,
+		},
+		{
+			from: "gcr.io/golang:1.0.0",
+			to:   "gcr.io/golang",
+			want: false,
+		},
+		{
+			from: "gcr.io/golang:latest",
+			to:   "gcr.io/golang",
+			want: true,
+		},
+		{
+			from: "gcr.io/golang",
+			to:   "gcr.io/golang:latest",
+			want: true,
+		},
+		{
+			from: "golang",
+			to:   "library/golang",
+			want: true,
+		},
+		{
+			from: "golang",
+			to:   "gcr.io/project/golang",
+			want: false,
+		},
+		{
+			from: "golang",
+			to:   "gcr.io/library/golang",
+			want: false,
+		},
+		{
+			from: "golang",
+			to:   "gcr.io/golang",
+			want: false,
+		},
+	}
+	for _, test := range testdata {
+		if !assert.Equal(t, test.want, MatchImageExact(test.from, test.to)) {
+			t.Logf("test data: '%s' -> '%s'", test.from, test.to)
+		}
+	}
+}
+
+func Test_matchImageDynamic(t *testing.T) {
+	testdata := []struct {
+		name, from string
+		to         []string
+		want       bool
+	}{
+		{
+			name: "simple compare",
+			from: "golang",
+			to:   []string{"golang"},
+			want: true,
+		},
+		{
+			name: "compare non-taged image whit list who tag requirement",
+			from: "golang",
+			to:   []string{"golang:v3.0"},
+			want: false,
+		},
+		{
+			name: "compare taged image whit list who tag no requirement",
+			from: "golang:v3.0",
+			to:   []string{"golang"},
+			want: true,
+		},
+		{
+			name: "compare taged image whit list who has image with no tag requirement",
+			from: "golang:1.0",
+			to:   []string{"golang", "golang:2.0"},
+			want: true,
+		},
+		{
+			name: "compare taged image whit list who only has images with tag requirement",
+			from: "golang:1.0",
+			to:   []string{"golang:latest", "golang:2.0"},
+			want: false,
+		},
+		{
+			name: "compare taged image whit list who only has images with tag requirement",
+			from: "golang:1.0",
+			to:   []string{"golang:latest", "golang:1.0"},
+			want: true,
+		},
+	}
+	for _, test := range testdata {
+		if !assert.Equal(t, test.want, MatchImageDynamic(test.from, test.to...)) {
+			t.Logf("test data: '%s' -> '%s'", test.from, test.to)
+		}
+	}
+}
+
 func Test_matchHostname(t *testing.T) {
 	testdata := []struct {
 		image, hostname string

From 9a59c5b62e3193c9da15ab5bc2b95a95c0c0e82b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 02:07:59 +0200
Subject: [PATCH 02/25] allow-list trusted- and escalated-plugins by exact
 match

this enforce tag compare of images
---
 .../30-administration/10-server-config.md     |  1 +
 pipeline/frontend/yaml/compiler/compiler.go   |  2 +-
 pipeline/frontend/yaml/compiler/convert.go    |  2 +-
 pipeline/frontend/yaml/types/container.go     |  2 +-
 shared/constant/constant.go                   | 37 ++++++++++++++++++-
 5 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index ed624bf6e6..2771da2e4e 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -351,6 +351,7 @@ a user can log into Woodpecker, without re-authentication.
 > Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
 Docker images to run in privileged mode. Only change if you are sure what you do!
+You should specify the tag as images are compared via exact matches.
 
 <!--
 ### `WOODPECKER_VOLUME`
diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go
index 9b9c2d7d4a..281e1c7faf 100644
--- a/pipeline/frontend/yaml/compiler/compiler.go
+++ b/pipeline/frontend/yaml/compiler/compiler.go
@@ -49,7 +49,7 @@ func (s *Secret) Available(event string, container *yaml_types.Container) error
 		return fmt.Errorf("secret %q only allowed to be used by plugins by step %q", s.Name, container.Name)
 	}
 
-	if onlyAllowSecretForPlugins && !utils.MatchImage(container.Image, s.AllowedPlugins...) {
+	if onlyAllowSecretForPlugins && !utils.MatchImageDynamic(container.Image, s.AllowedPlugins...) {
 		return fmt.Errorf("secret %q is not allowed to be used with image %q by step %q", s.Name, container.Image, container.Name)
 	}
 
diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go
index d011753683..70a752cb45 100644
--- a/pipeline/frontend/yaml/compiler/convert.go
+++ b/pipeline/frontend/yaml/compiler/convert.go
@@ -138,7 +138,7 @@ func (c *Compiler) createProcess(container *yaml_types.Container, stepType backe
 		environment[requested] = secretValue
 	}
 
-	if utils.MatchImage(container.Image, c.escalated...) && container.IsPlugin() {
+	if utils.MatchImageExact(container.Image, c.escalated...) && container.IsPlugin() {
 		privileged = true
 	}
 
diff --git a/pipeline/frontend/yaml/types/container.go b/pipeline/frontend/yaml/types/container.go
index 3cb6833818..23e57f0d72 100644
--- a/pipeline/frontend/yaml/types/container.go
+++ b/pipeline/frontend/yaml/types/container.go
@@ -126,5 +126,5 @@ func (c *Container) IsPlugin() bool {
 }
 
 func (c *Container) IsTrustedCloneImage() bool {
-	return c.IsPlugin() && utils.MatchImage(c.Image, constant.TrustedCloneImages...)
+	return c.IsPlugin() && utils.MatchImageExact(c.Image, constant.TrustedCloneImages...)
 }
diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index d4984725ae..a47bfb4a9b 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -38,6 +38,41 @@ const (
 )
 
 var TrustedCloneImages = []string{
+	// we should trust to inject netrc to the clone step image we assign ourselves
 	DefaultCloneImage,
-	"quay.io/woodpeckerci/plugin-git",
+	// we should trust the latest versions of our clone plugin(s)
+	"docker.io/woodpeckerci/plugin-git:latest",
+	"quay.io/woodpeckerci/plugin-git:latest",
+	// alternate valid trusted images
+	// renovate: datasource=docker depName=quay.io/woodpeckerci/plugin-git
+	"quay.io/woodpeckerci/plugin-git:2.5.2",
+
+	// allow the dev image
+	"docker.io/woodpeckerci/plugin-git:next",
+
+	// old version witch we know have no problem (e.g. allow-list)
+	"docker.io/woodpeckerci/plugin-git:2.5.2",
+	"quay.io/woodpeckerci/plugin-git:2.5.2",
+	"docker.io/woodpeckerci/plugin-git:2.5.1",
+	"quay.io/woodpeckerci/plugin-git:2.5.1",
+	"docker.io/woodpeckerci/plugin-git:2.5.0",
+	"quay.io/woodpeckerci/plugin-git:2.5.0",
+	"docker.io/woodpeckerci/plugin-git:2.4.0",
+	"quay.io/woodpeckerci/plugin-git:2.4.0",
+	"docker.io/woodpeckerci/plugin-git:2.3.1",
+	"quay.io/woodpeckerci/plugin-git:2.3.1",
+	"docker.io/woodpeckerci/plugin-git:2.3.0",
+	"quay.io/woodpeckerci/plugin-git:2.3.0",
+	"docker.io/woodpeckerci/plugin-git:2.2.0",
+	"quay.io/woodpeckerci/plugin-git:2.2.0",
+	"docker.io/woodpeckerci/plugin-git:2.1.2",
+	"quay.io/woodpeckerci/plugin-git:2.1.2",
+	"docker.io/woodpeckerci/plugin-git:2.1.0",
+	"quay.io/woodpeckerci/plugin-git:2.1.0",
+	"docker.io/woodpeckerci/plugin-git:2.0.3",
+	"quay.io/woodpeckerci/plugin-git:2.0.3",
+	"docker.io/woodpeckerci/plugin-git:2.0.2",
+	"quay.io/woodpeckerci/plugin-git:2.0.2",
+	"docker.io/woodpeckerci/plugin-git:2.0.1",
+	"quay.io/woodpeckerci/plugin-git:2.0.1",
 }

From 553b0951b4c8feb8b97e476f8329138dc8503601 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 02:10:34 +0200
Subject: [PATCH 03/25] document one change

---
 docs/docs/91-migrations.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md
index db82b83b8e..d6141dcc48 100644
--- a/docs/docs/91-migrations.md
+++ b/docs/docs/91-migrations.md
@@ -4,6 +4,7 @@ Some versions need some changes to the server configuration or the pipeline conf
 
 ## `next`
 
+- Only allow trusted-clone- and escalated-plugins if image name **AND TAG** matches (before the tag was ignored)
 - Removed `WOODPECKER_DEV_OAUTH_HOST` and `WOODPECKER_DEV_GITEA_OAUTH_URL` use `WOODPECKER_EXPERT_FORGE_OAUTH_HOST`
 - Compatibility mode of deprecated `pipeline:`, `platform:` and `branches:` pipeline config options are now removed and pipeline will now fail if still in use.
 - Removed `steps.[name].group` in favor of `steps.[name].depends_on` (see [workflow syntax](./20-usage/20-workflow-syntax.md#depends_on) to learn how to set dependencies)

From 95f8b6dc8f69b61829513e6430f969d7ee525b6b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 02:14:45 +0200
Subject: [PATCH 04/25] document MatchImageDynamic usage for secret plugin
 filer

---
 docs/docs/20-usage/40-secrets.md | 5 +++++
 docs/docs/91-migrations.md       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/docs/docs/20-usage/40-secrets.md b/docs/docs/20-usage/40-secrets.md
index e87a043842..3af0d8494e 100644
--- a/docs/docs/20-usage/40-secrets.md
+++ b/docs/docs/20-usage/40-secrets.md
@@ -74,6 +74,11 @@ Please be careful when exposing secrets to pull requests. If your repository is
 
 To prevent abusing your secrets from malicious usage, you can limit a secret to a list of plugins. If enabled they are not available to any other plugin (steps without user-defined commands). If you or an attacker defines explicit commands, the secrets will not be available to the container to prevent leaking them.
 
+:::note
+if you specify an tag, the filter will also respect it.
+just make sure you don't specify the same image without one, this will lead to ignore it again.
+:::
+
 ![plugins filter](./secrets-plugins-filter.png)
 
 ## Adding Secrets
diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md
index d6141dcc48..a3988e5cbe 100644
--- a/docs/docs/91-migrations.md
+++ b/docs/docs/91-migrations.md
@@ -4,6 +4,7 @@ Some versions need some changes to the server configuration or the pipeline conf
 
 ## `next`
 
+- If secret who are filtered by plugin now check against tag if you specify a tag
 - Only allow trusted-clone- and escalated-plugins if image name **AND TAG** matches (before the tag was ignored)
 - Removed `WOODPECKER_DEV_OAUTH_HOST` and `WOODPECKER_DEV_GITEA_OAUTH_URL` use `WOODPECKER_EXPERT_FORGE_OAUTH_HOST`
 - Compatibility mode of deprecated `pipeline:`, `platform:` and `branches:` pipeline config options are now removed and pipeline will now fail if still in use.

From fa83a29766426bf8de6588fbce1bfb8d44665974 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 02:19:13 +0200
Subject: [PATCH 05/25] update privilged plugins to allow list

---
 shared/constant/constant.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index a47bfb4a9b..e7c3466c3e 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -19,8 +19,13 @@ var PrivilegedPlugins = []string{
 	"plugins/docker",
 	"plugins/gcr",
 	"plugins/ecr",
-	"woodpeckerci/plugin-docker-buildx",
-	"codeberg.org/woodpecker-plugins/docker-buildx",
+	// latest buildx
+	"docker.io/woodpeckerci/plugin-docker-buildx:latest",
+	"codeberg.org/woodpecker-plugins/docker-buildx:latest",
+	// renovate: datasource=docker depName=docker.io/woodpeckerci/plugin-docker-buildx
+	"docker.io/woodpeckerci/plugin-docker-buildx:4.2.0",
+	// renovate: datasource=docker depName=codeberg.org/woodpecker-plugins/docker-buildx
+	"codeberg.org/woodpecker-plugins/docker-buildx:4.2.0",
 }
 
 // DefaultConfigOrder represent the priority in witch woodpecker search for a pipeline config by default

From 5dfed307f6a2708552ae11018029c013d7dbd7a6 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 02:55:27 +0200
Subject: [PATCH 06/25] lint against clone steps with untrusted images

---
 pipeline/frontend/yaml/linter/linter.go      | 18 ++++++++++++++++++
 pipeline/frontend/yaml/linter/linter_test.go |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go
index 6b4a51fc75..a7ee6b50e6 100644
--- a/pipeline/frontend/yaml/linter/linter.go
+++ b/pipeline/frontend/yaml/linter/linter.go
@@ -24,6 +24,8 @@ import (
 	errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types"
+	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils"
+	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 )
 
 // A Linter lints a pipeline configuration.
@@ -71,6 +73,10 @@ func (l *Linter) lintFile(config *WorkflowConfig) error {
 		linterErr = multierr.Append(linterErr, newLinterError("Invalid or missing steps section", config.File, "steps", false))
 	}
 
+	if err := l.lintCloneSteps(config); err != nil {
+		linterErr = multierr.Append(linterErr, err)
+	}
+
 	if err := l.lintContainers(config, "clone"); err != nil {
 		linterErr = multierr.Append(linterErr, err)
 	}
@@ -94,6 +100,18 @@ func (l *Linter) lintFile(config *WorkflowConfig) error {
 	return linterErr
 }
 
+func (l *Linter) lintCloneSteps(config *WorkflowConfig) error {
+	if len(config.Workflow.Clone.ContainerList) == 0 {
+		return nil
+	}
+	for _, container := range config.Workflow.Clone.ContainerList {
+		if !utils.MatchImageExact(container.Image, constant.TrustedCloneImages...) {
+			return newLinterError("Specified clone image does not match allow list, netrc will not be injected", config.File, fmt.Sprintf("clone.%s", container.Name), true)
+		}
+	}
+	return nil
+}
+
 func (l *Linter) lintContainers(config *WorkflowConfig, area string) error {
 	var linterErr error
 
diff --git a/pipeline/frontend/yaml/linter/linter_test.go b/pipeline/frontend/yaml/linter/linter_test.go
index 19bc5ae431..27e090567c 100644
--- a/pipeline/frontend/yaml/linter/linter_test.go
+++ b/pipeline/frontend/yaml/linter/linter_test.go
@@ -169,6 +169,10 @@ func TestLintErrors(t *testing.T) {
 			from: "{pipeline: { build: { image: golang, settings: { test: 'true' } } }, when: { branch: main, event: push } }",
 			want: "Additional property pipeline is not allowed",
 		},
+		{
+			from: "{steps: { build: { image: golang, settings: { test: 'true' } } }, when: { branch: main, event: push }, clone: { git: { image: woodpeckerci/plugin-git:v1.1.0 } } }",
+			want: "Specified clone image does not match allow list, netrc will not be injected",
+		},
 	}
 
 	for _, test := range testdata {

From 1d490b7eb33f30f5d5aafbebff4e99498e216954 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 26 Aug 2024 02:57:08 +0200
Subject: [PATCH 07/25] could be more

---
 pipeline/frontend/yaml/linter/linter.go | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go
index a7ee6b50e6..31bd5c2e40 100644
--- a/pipeline/frontend/yaml/linter/linter.go
+++ b/pipeline/frontend/yaml/linter/linter.go
@@ -104,12 +104,17 @@ func (l *Linter) lintCloneSteps(config *WorkflowConfig) error {
 	if len(config.Workflow.Clone.ContainerList) == 0 {
 		return nil
 	}
+	var linterErr error
 	for _, container := range config.Workflow.Clone.ContainerList {
 		if !utils.MatchImageExact(container.Image, constant.TrustedCloneImages...) {
-			return newLinterError("Specified clone image does not match allow list, netrc will not be injected", config.File, fmt.Sprintf("clone.%s", container.Name), true)
+			linterErr = multierr.Append(linterErr,
+				newLinterError(
+					"Specified clone image does not match allow list, netrc will not be injected",
+					config.File, fmt.Sprintf("clone.%s", container.Name), true),
+			)
 		}
 	}
-	return nil
+	return linterErr
 }
 
 func (l *Linter) lintContainers(config *WorkflowConfig, area string) error {

From b95281b8ac232950fed0dc85f259f7cb46ba6504 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 31 Aug 2024 19:47:26 +0200
Subject: [PATCH 08/25] Apply suggestions from code review

---
 docs/docs/30-administration/10-server-config.md | 2 +-
 pipeline/frontend/yaml/compiler/convert.go      | 2 +-
 pipeline/frontend/yaml/linter/linter.go         | 2 +-
 pipeline/frontend/yaml/types/container.go       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index 2771da2e4e..e198a9499b 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -351,7 +351,7 @@ a user can log into Woodpecker, without re-authentication.
 > Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
 Docker images to run in privileged mode. Only change if you are sure what you do!
-You should specify the tag as images are compared via exact matches.
+You should specify the tag of your images too, as this enforces exact matches.
 
 <!--
 ### `WOODPECKER_VOLUME`
diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go
index 70a752cb45..bab841d8ac 100644
--- a/pipeline/frontend/yaml/compiler/convert.go
+++ b/pipeline/frontend/yaml/compiler/convert.go
@@ -138,7 +138,7 @@ func (c *Compiler) createProcess(container *yaml_types.Container, stepType backe
 		environment[requested] = secretValue
 	}
 
-	if utils.MatchImageExact(container.Image, c.escalated...) && container.IsPlugin() {
+	if utils.MatchImageDynamic(container.Image, c.escalated...) && container.IsPlugin() {
 		privileged = true
 	}
 
diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go
index fc0dd4e235..fc8e2360f8 100644
--- a/pipeline/frontend/yaml/linter/linter.go
+++ b/pipeline/frontend/yaml/linter/linter.go
@@ -107,7 +107,7 @@ func (l *Linter) lintCloneSteps(config *WorkflowConfig) error {
 	}
 	var linterErr error
 	for _, container := range config.Workflow.Clone.ContainerList {
-		if !utils.MatchImageExact(container.Image, constant.TrustedCloneImages...) {
+		if !utils.MatchImageDynamic(container.Image, constant.TrustedCloneImages...) {
 			linterErr = multierr.Append(linterErr,
 				newLinterError(
 					"Specified clone image does not match allow list, netrc will not be injected",
diff --git a/pipeline/frontend/yaml/types/container.go b/pipeline/frontend/yaml/types/container.go
index 23e57f0d72..0c33ff2688 100644
--- a/pipeline/frontend/yaml/types/container.go
+++ b/pipeline/frontend/yaml/types/container.go
@@ -126,5 +126,5 @@ func (c *Container) IsPlugin() bool {
 }
 
 func (c *Container) IsTrustedCloneImage() bool {
-	return c.IsPlugin() && utils.MatchImageExact(c.Image, constant.TrustedCloneImages...)
+	return c.IsPlugin() && utils.MatchImageDynamic(c.Image, constant.TrustedCloneImages...)
 }

From 9336afb2b8e4c3d6819cf286401038e609137b05 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 31 Aug 2024 19:48:01 +0200
Subject: [PATCH 09/25] clean

---
 pipeline/frontend/yaml/utils/image.go      | 12 ----
 pipeline/frontend/yaml/utils/image_test.go | 83 ----------------------
 2 files changed, 95 deletions(-)

diff --git a/pipeline/frontend/yaml/utils/image.go b/pipeline/frontend/yaml/utils/image.go
index 34350a9f2a..3462a58f11 100644
--- a/pipeline/frontend/yaml/utils/image.go
+++ b/pipeline/frontend/yaml/utils/image.go
@@ -61,18 +61,6 @@ func MatchImage(from string, to ...string) bool {
 	return false
 }
 
-// MatchImageExact returns true if the image name and tag matches
-// an image in the list.
-func MatchImageExact(from string, to ...string) bool {
-	from = expandImage(from)
-	for _, match := range to {
-		if from == expandImage(match) {
-			return true
-		}
-	}
-	return false
-}
-
 // MatchImageDynamic check if image is in list based on list.
 // If an list entry has a tag specified it only will match if both are the same, else the tag is ignored.
 func MatchImageDynamic(from string, to ...string) bool {
diff --git a/pipeline/frontend/yaml/utils/image_test.go b/pipeline/frontend/yaml/utils/image_test.go
index 2982c3e748..7b79f669b7 100644
--- a/pipeline/frontend/yaml/utils/image_test.go
+++ b/pipeline/frontend/yaml/utils/image_test.go
@@ -265,89 +265,6 @@ func Test_matchImage(t *testing.T) {
 	}
 }
 
-func Test_matchImageExact(t *testing.T) {
-	testdata := []struct {
-		from, to string
-		want     bool
-	}{
-		{
-			from: "golang",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "golang:latest",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "library/golang:latest",
-			to:   "golang",
-			want: true,
-		},
-		{
-			from: "index.docker.io/library/golang:1.0.0",
-			to:   "golang",
-			want: false,
-		},
-		{
-			from: "golang",
-			to:   "golang:latest",
-			want: true,
-		},
-		{
-			from: "library/golang:latest",
-			to:   "library/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang",
-			to:   "gcr.io/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang:1.0.0",
-			to:   "gcr.io/golang",
-			want: false,
-		},
-		{
-			from: "gcr.io/golang:latest",
-			to:   "gcr.io/golang",
-			want: true,
-		},
-		{
-			from: "gcr.io/golang",
-			to:   "gcr.io/golang:latest",
-			want: true,
-		},
-		{
-			from: "golang",
-			to:   "library/golang",
-			want: true,
-		},
-		{
-			from: "golang",
-			to:   "gcr.io/project/golang",
-			want: false,
-		},
-		{
-			from: "golang",
-			to:   "gcr.io/library/golang",
-			want: false,
-		},
-		{
-			from: "golang",
-			to:   "gcr.io/golang",
-			want: false,
-		},
-	}
-	for _, test := range testdata {
-		if !assert.Equal(t, test.want, MatchImageExact(test.from, test.to)) {
-			t.Logf("test data: '%s' -> '%s'", test.from, test.to)
-		}
-	}
-}
-
 func Test_matchImageDynamic(t *testing.T) {
 	testdata := []struct {
 		name, from string

From f81a86e9b4f57fcb1a2cb749824b55ceab886a7b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 31 Aug 2024 19:50:44 +0200
Subject: [PATCH 10/25] clean

---
 shared/constant/constant.go | 46 +++----------------------------------
 1 file changed, 3 insertions(+), 43 deletions(-)

diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index 20163a26f0..fc6bb40ee5 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -16,13 +16,8 @@ package constant
 
 // PrivilegedPlugins can be changed by 'WOODPECKER_ESCALATE' at runtime.
 var PrivilegedPlugins = []string{
-	// latest buildx
-	"docker.io/woodpeckerci/plugin-docker-buildx:latest",
-	"codeberg.org/woodpecker-plugins/docker-buildx:latest",
-	// renovate: datasource=docker depName=docker.io/woodpeckerci/plugin-docker-buildx
-	"docker.io/woodpeckerci/plugin-docker-buildx:4.2.0",
-	// renovate: datasource=docker depName=codeberg.org/woodpecker-plugins/docker-buildx
-	"codeberg.org/woodpecker-plugins/docker-buildx:4.2.0",
+	"docker.io/woodpeckerci/plugin-docker-buildx",
+	"codeberg.org/woodpecker-plugins/docker-buildx",
 }
 
 // DefaultConfigOrder represent the priority in witch woodpecker search for a pipeline config by default
@@ -40,41 +35,6 @@ const (
 )
 
 var TrustedCloneImages = []string{
-	// we should trust to inject netrc to the clone step image we assign ourselves
 	DefaultCloneImage,
-	// we should trust the latest versions of our clone plugin(s)
-	"docker.io/woodpeckerci/plugin-git:latest",
-	"quay.io/woodpeckerci/plugin-git:latest",
-	// alternate valid trusted images
-	// renovate: datasource=docker depName=quay.io/woodpeckerci/plugin-git
-	"quay.io/woodpeckerci/plugin-git:2.5.2",
-
-	// allow the dev image
-	"docker.io/woodpeckerci/plugin-git:next",
-
-	// old version witch we know have no problem (e.g. allow-list)
-	"docker.io/woodpeckerci/plugin-git:2.5.2",
-	"quay.io/woodpeckerci/plugin-git:2.5.2",
-	"docker.io/woodpeckerci/plugin-git:2.5.1",
-	"quay.io/woodpeckerci/plugin-git:2.5.1",
-	"docker.io/woodpeckerci/plugin-git:2.5.0",
-	"quay.io/woodpeckerci/plugin-git:2.5.0",
-	"docker.io/woodpeckerci/plugin-git:2.4.0",
-	"quay.io/woodpeckerci/plugin-git:2.4.0",
-	"docker.io/woodpeckerci/plugin-git:2.3.1",
-	"quay.io/woodpeckerci/plugin-git:2.3.1",
-	"docker.io/woodpeckerci/plugin-git:2.3.0",
-	"quay.io/woodpeckerci/plugin-git:2.3.0",
-	"docker.io/woodpeckerci/plugin-git:2.2.0",
-	"quay.io/woodpeckerci/plugin-git:2.2.0",
-	"docker.io/woodpeckerci/plugin-git:2.1.2",
-	"quay.io/woodpeckerci/plugin-git:2.1.2",
-	"docker.io/woodpeckerci/plugin-git:2.1.0",
-	"quay.io/woodpeckerci/plugin-git:2.1.0",
-	"docker.io/woodpeckerci/plugin-git:2.0.3",
-	"quay.io/woodpeckerci/plugin-git:2.0.3",
-	"docker.io/woodpeckerci/plugin-git:2.0.2",
-	"quay.io/woodpeckerci/plugin-git:2.0.2",
-	"docker.io/woodpeckerci/plugin-git:2.0.1",
-	"quay.io/woodpeckerci/plugin-git:2.0.1",
+	"quay.io/woodpeckerci/plugin-git",
 }

From 9fc5be86b2f32ea78087bfcd41e916e0b8eca8c4 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 31 Aug 2024 19:51:15 +0200
Subject: [PATCH 11/25] Revert "clean"

This reverts commit f81a86e9b4f57fcb1a2cb749824b55ceab886a7b.
---
 shared/constant/constant.go | 46 ++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index fc6bb40ee5..20163a26f0 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -16,8 +16,13 @@ package constant
 
 // PrivilegedPlugins can be changed by 'WOODPECKER_ESCALATE' at runtime.
 var PrivilegedPlugins = []string{
-	"docker.io/woodpeckerci/plugin-docker-buildx",
-	"codeberg.org/woodpecker-plugins/docker-buildx",
+	// latest buildx
+	"docker.io/woodpeckerci/plugin-docker-buildx:latest",
+	"codeberg.org/woodpecker-plugins/docker-buildx:latest",
+	// renovate: datasource=docker depName=docker.io/woodpeckerci/plugin-docker-buildx
+	"docker.io/woodpeckerci/plugin-docker-buildx:4.2.0",
+	// renovate: datasource=docker depName=codeberg.org/woodpecker-plugins/docker-buildx
+	"codeberg.org/woodpecker-plugins/docker-buildx:4.2.0",
 }
 
 // DefaultConfigOrder represent the priority in witch woodpecker search for a pipeline config by default
@@ -35,6 +40,41 @@ const (
 )
 
 var TrustedCloneImages = []string{
+	// we should trust to inject netrc to the clone step image we assign ourselves
 	DefaultCloneImage,
-	"quay.io/woodpeckerci/plugin-git",
+	// we should trust the latest versions of our clone plugin(s)
+	"docker.io/woodpeckerci/plugin-git:latest",
+	"quay.io/woodpeckerci/plugin-git:latest",
+	// alternate valid trusted images
+	// renovate: datasource=docker depName=quay.io/woodpeckerci/plugin-git
+	"quay.io/woodpeckerci/plugin-git:2.5.2",
+
+	// allow the dev image
+	"docker.io/woodpeckerci/plugin-git:next",
+
+	// old version witch we know have no problem (e.g. allow-list)
+	"docker.io/woodpeckerci/plugin-git:2.5.2",
+	"quay.io/woodpeckerci/plugin-git:2.5.2",
+	"docker.io/woodpeckerci/plugin-git:2.5.1",
+	"quay.io/woodpeckerci/plugin-git:2.5.1",
+	"docker.io/woodpeckerci/plugin-git:2.5.0",
+	"quay.io/woodpeckerci/plugin-git:2.5.0",
+	"docker.io/woodpeckerci/plugin-git:2.4.0",
+	"quay.io/woodpeckerci/plugin-git:2.4.0",
+	"docker.io/woodpeckerci/plugin-git:2.3.1",
+	"quay.io/woodpeckerci/plugin-git:2.3.1",
+	"docker.io/woodpeckerci/plugin-git:2.3.0",
+	"quay.io/woodpeckerci/plugin-git:2.3.0",
+	"docker.io/woodpeckerci/plugin-git:2.2.0",
+	"quay.io/woodpeckerci/plugin-git:2.2.0",
+	"docker.io/woodpeckerci/plugin-git:2.1.2",
+	"quay.io/woodpeckerci/plugin-git:2.1.2",
+	"docker.io/woodpeckerci/plugin-git:2.1.0",
+	"quay.io/woodpeckerci/plugin-git:2.1.0",
+	"docker.io/woodpeckerci/plugin-git:2.0.3",
+	"quay.io/woodpeckerci/plugin-git:2.0.3",
+	"docker.io/woodpeckerci/plugin-git:2.0.2",
+	"quay.io/woodpeckerci/plugin-git:2.0.2",
+	"docker.io/woodpeckerci/plugin-git:2.0.1",
+	"quay.io/woodpeckerci/plugin-git:2.0.1",
 }

From c29a41694ab0f26bd5c18847ce9027e445e2486a Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 31 Aug 2024 19:51:56 +0200
Subject: [PATCH 12/25] clean fix

---
 shared/constant/constant.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index 20163a26f0..4dffad7af9 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -16,13 +16,8 @@ package constant
 
 // PrivilegedPlugins can be changed by 'WOODPECKER_ESCALATE' at runtime.
 var PrivilegedPlugins = []string{
-	// latest buildx
-	"docker.io/woodpeckerci/plugin-docker-buildx:latest",
-	"codeberg.org/woodpecker-plugins/docker-buildx:latest",
-	// renovate: datasource=docker depName=docker.io/woodpeckerci/plugin-docker-buildx
-	"docker.io/woodpeckerci/plugin-docker-buildx:4.2.0",
-	// renovate: datasource=docker depName=codeberg.org/woodpecker-plugins/docker-buildx
-	"codeberg.org/woodpecker-plugins/docker-buildx:4.2.0",
+	"docker.io/woodpeckerci/plugin-docker-buildx",
+	"codeberg.org/woodpecker-plugins/docker-buildx",
 }
 
 // DefaultConfigOrder represent the priority in witch woodpecker search for a pipeline config by default

From 8b39ef1df646e2c1d77d09f3fa77232221f844b1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:01:07 +0200
Subject: [PATCH 13/25] make no-tag mach as of now

---
 shared/constant/constant.go | 38 ++-----------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index 4dffad7af9..085f7e1583 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -35,41 +35,7 @@ const (
 )
 
 var TrustedCloneImages = []string{
-	// we should trust to inject netrc to the clone step image we assign ourselves
 	DefaultCloneImage,
-	// we should trust the latest versions of our clone plugin(s)
-	"docker.io/woodpeckerci/plugin-git:latest",
-	"quay.io/woodpeckerci/plugin-git:latest",
-	// alternate valid trusted images
-	// renovate: datasource=docker depName=quay.io/woodpeckerci/plugin-git
-	"quay.io/woodpeckerci/plugin-git:2.5.2",
-
-	// allow the dev image
-	"docker.io/woodpeckerci/plugin-git:next",
-
-	// old version witch we know have no problem (e.g. allow-list)
-	"docker.io/woodpeckerci/plugin-git:2.5.2",
-	"quay.io/woodpeckerci/plugin-git:2.5.2",
-	"docker.io/woodpeckerci/plugin-git:2.5.1",
-	"quay.io/woodpeckerci/plugin-git:2.5.1",
-	"docker.io/woodpeckerci/plugin-git:2.5.0",
-	"quay.io/woodpeckerci/plugin-git:2.5.0",
-	"docker.io/woodpeckerci/plugin-git:2.4.0",
-	"quay.io/woodpeckerci/plugin-git:2.4.0",
-	"docker.io/woodpeckerci/plugin-git:2.3.1",
-	"quay.io/woodpeckerci/plugin-git:2.3.1",
-	"docker.io/woodpeckerci/plugin-git:2.3.0",
-	"quay.io/woodpeckerci/plugin-git:2.3.0",
-	"docker.io/woodpeckerci/plugin-git:2.2.0",
-	"quay.io/woodpeckerci/plugin-git:2.2.0",
-	"docker.io/woodpeckerci/plugin-git:2.1.2",
-	"quay.io/woodpeckerci/plugin-git:2.1.2",
-	"docker.io/woodpeckerci/plugin-git:2.1.0",
-	"quay.io/woodpeckerci/plugin-git:2.1.0",
-	"docker.io/woodpeckerci/plugin-git:2.0.3",
-	"quay.io/woodpeckerci/plugin-git:2.0.3",
-	"docker.io/woodpeckerci/plugin-git:2.0.2",
-	"quay.io/woodpeckerci/plugin-git:2.0.2",
-	"docker.io/woodpeckerci/plugin-git:2.0.1",
-	"quay.io/woodpeckerci/plugin-git:2.0.1",
+	"docker.io/woodpeckerci/plugin-git",
+	"quay.io/woodpeckerci/plugin-git",
 }

From 68560af6bf20f670329ce891e2c3822066a4d4fb Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:18:29 +0200
Subject: [PATCH 14/25] rename

---
 cmd/server/flags.go                           |  7 ++--
 cmd/server/setup.go                           |  4 +-
 .../30-administration/10-server-config.md     |  2 +-
 docs/docs/91-migrations.md                    |  1 +
 pipeline/frontend/yaml/compiler/compiler.go   | 39 ++++++++++---------
 .../frontend/yaml/compiler/compiler_test.go   |  2 +-
 pipeline/frontend/yaml/compiler/option.go     |  4 +-
 .../frontend/yaml/compiler/option_test.go     |  4 +-
 server/config.go                              |  3 +-
 server/pipeline/stepbuilder/stepBuilder.go    |  2 +-
 shared/constant/constant.go                   |  6 +--
 11 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/cmd/server/flags.go b/cmd/server/flags.go
index 1f2400aca6..40aeabd681 100644
--- a/cmd/server/flags.go
+++ b/cmd/server/flags.go
@@ -135,10 +135,11 @@ var flags = append([]cli.Flag{
 		Value:   []string{"push", "pull_request"},
 	},
 	&cli.StringFlag{
-		Sources: cli.EnvVars("WOODPECKER_DEFAULT_CLONE_IMAGE"),
-		Name:    "default-clone-image",
+		Sources: cli.EnvVars("WOODPECKER_DEFAULT_CLONE_PLUGIN", "WOODPECKER_DEFAULT_CLONE_IMAGE"),
+		Name:    "default-clone-plugin",
+		Aliases: []string{"default-clone-image"},
 		Usage:   "The default docker image to be used when cloning the repo",
-		Value:   constant.DefaultCloneImage,
+		Value:   constant.DefaultClonePlugin,
 	},
 	&cli.IntFlag{
 		Sources: cli.EnvVars("WOODPECKER_DEFAULT_PIPELINE_TIMEOUT"),
diff --git a/cmd/server/setup.go b/cmd/server/setup.go
index 375df7a90a..aa60f4133c 100644
--- a/cmd/server/setup.go
+++ b/cmd/server/setup.go
@@ -165,8 +165,8 @@ func setupEvilGlobals(ctx context.Context, c *cli.Command, s store.Store) error
 	server.Config.Pipeline.AuthenticatePublicRepos = c.Bool("authenticate-public-repos")
 
 	// Cloning
-	server.Config.Pipeline.DefaultCloneImage = c.String("default-clone-image")
-	constant.TrustedCloneImages = append(constant.TrustedCloneImages, server.Config.Pipeline.DefaultCloneImage)
+	server.Config.Pipeline.DefaultClonePlugin = c.String("default-clone-plugin")
+	constant.TrustedCloneImages = append(constant.TrustedCloneImages, server.Config.Pipeline.DefaultClonePlugin)
 
 	// Execution
 	_events := c.StringSlice("default-cancel-previous-pipeline-events")
diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index e198a9499b..6443cc2be0 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -319,7 +319,7 @@ Always use authentication to clone repositories even if they are public. Needed
 
 List of event names that will be canceled when a new pipeline for the same context (tag, branch) is created.
 
-### `WOODPECKER_DEFAULT_CLONE_IMAGE`
+### `WOODPECKER_DEFAULT_CLONE_PLUGIN`
 
 > Default is defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md
index 5aabe15fb3..2cc396303d 100644
--- a/docs/docs/91-migrations.md
+++ b/docs/docs/91-migrations.md
@@ -4,6 +4,7 @@ Some versions need some changes to the server configuration or the pipeline conf
 
 ## `next`
 
+- `WOODPECKER_DEFAULT_CLONE_IMAGE` got depricated use `WOODPECKER_DEFAULT_CLONE_PLUGIN`
 - Check trusted-clone- and priviledged-plugins by image name and tag (if tag is set)
 - Remove `plugins/docker`, `plugins/gcr` and `plugins/ecr` from the default list of privileged plugins ([modify the list via config if needed](./30-administration/10-server-config.md#woodpecker_escalate)).
 - Secret filters for plugins now check against tag if specified
diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go
index 281e1c7faf..d8572faf91 100644
--- a/pipeline/frontend/yaml/compiler/compiler.go
+++ b/pipeline/frontend/yaml/compiler/compiler.go
@@ -92,22 +92,23 @@ type ResourceLimit struct {
 
 // Compiler compiles the yaml.
 type Compiler struct {
-	local             bool
-	escalated         []string
-	prefix            string
-	volumes           []string
-	networks          []string
-	env               map[string]string
-	cloneEnv          map[string]string
-	workspaceBase     string
-	workspacePath     string
-	metadata          metadata.Metadata
-	registries        []Registry
-	secrets           map[string]Secret
-	reslimit          ResourceLimit
-	defaultCloneImage string
-	trustedPipeline   bool
-	netrcOnlyTrusted  bool
+	local               bool
+	escalated           []string
+	prefix              string
+	volumes             []string
+	networks            []string
+	env                 map[string]string
+	cloneEnv            map[string]string
+	workspaceBase       string
+	workspacePath       string
+	metadata            metadata.Metadata
+	registries          []Registry
+	secrets             map[string]Secret
+	reslimit            ResourceLimit
+	defaultClonePlugin  string
+	trustedClonePlugins []string
+	trustedPipeline     bool
+	netrcOnlyTrusted    bool
 }
 
 // New creates a new Compiler with options.
@@ -163,9 +164,9 @@ func (c *Compiler) Compile(conf *yaml_types.Workflow) (*backend_types.Config, er
 		c.workspacePath = path.Clean(conf.Workspace.Path)
 	}
 
-	cloneImage := constant.DefaultCloneImage
-	if len(c.defaultCloneImage) > 0 {
-		cloneImage = c.defaultCloneImage
+	cloneImage := constant.DefaultClonePlugin
+	if len(c.defaultClonePlugin) > 0 {
+		cloneImage = c.defaultClonePlugin
 	}
 
 	// add default clone step
diff --git a/pipeline/frontend/yaml/compiler/compiler_test.go b/pipeline/frontend/yaml/compiler/compiler_test.go
index 66bb1a19b6..242229c61a 100644
--- a/pipeline/frontend/yaml/compiler/compiler_test.go
+++ b/pipeline/frontend/yaml/compiler/compiler_test.go
@@ -92,7 +92,7 @@ func TestCompilerCompile(t *testing.T) {
 		Steps: []*backend_types.Step{{
 			Name:       "clone",
 			Type:       backend_types.StepTypeClone,
-			Image:      constant.DefaultCloneImage,
+			Image:      constant.DefaultClonePlugin,
 			OnSuccess:  true,
 			Failure:    "fail",
 			Volumes:    []string{defaultVolumes[0].Name + ":/woodpecker"},
diff --git a/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go
index dd2d558e5e..7b6cfb0791 100644
--- a/pipeline/frontend/yaml/compiler/option.go
+++ b/pipeline/frontend/yaml/compiler/option.go
@@ -172,9 +172,9 @@ func WithResourceLimit(swap, mem, shmSize, cpuQuota, cpuShares int64, cpuSet str
 	}
 }
 
-func WithDefaultCloneImage(cloneImage string) Option {
+func WithDefaultClonePlugin(cloneImage string) Option {
 	return func(compiler *Compiler) {
-		compiler.defaultCloneImage = cloneImage
+		compiler.defaultClonePlugin = cloneImage
 	}
 }
 
diff --git a/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go
index 48ed13d480..ed21e00bbe 100644
--- a/pipeline/frontend/yaml/compiler/option_test.go
+++ b/pipeline/frontend/yaml/compiler/option_test.go
@@ -166,9 +166,9 @@ func TestWithEnviron(t *testing.T) {
 	assert.Equal(t, "true", compiler.env["SHOW"])
 }
 
-func TestWithDefaultCloneImage(t *testing.T) {
+func TestDefaultClonePlugin(t *testing.T) {
 	compiler := New(
-		WithDefaultCloneImage("not-an-image"),
+		WithDefaultClonePlugin("not-an-image"),
 	)
 	assert.Equal(t, "not-an-image", compiler.defaultCloneImage)
 }
diff --git a/server/config.go b/server/config.go
index 80e367a51e..96e9d43268 100644
--- a/server/config.go
+++ b/server/config.go
@@ -64,7 +64,8 @@ var Config = struct {
 	Pipeline struct {
 		AuthenticatePublicRepos             bool
 		DefaultCancelPreviousPipelineEvents []model.WebhookEvent
-		DefaultCloneImage                   string
+		DefaultClonePlugin                  string
+		TrustedClonePlugins                 []string
 		Limits                              model.ResourceLimit
 		Volumes                             []string
 		Networks                            []string
diff --git a/server/pipeline/stepbuilder/stepBuilder.go b/server/pipeline/stepbuilder/stepBuilder.go
index eafb58a552..3aa4fac22a 100644
--- a/server/pipeline/stepbuilder/stepBuilder.go
+++ b/server/pipeline/stepbuilder/stepBuilder.go
@@ -281,7 +281,7 @@ func (b *StepBuilder) toInternalRepresentation(parsed *yaml_types.Workflow, envi
 			),
 			b.Repo.IsSCMPrivate || server.Config.Pipeline.AuthenticatePublicRepos,
 		),
-		compiler.WithDefaultCloneImage(server.Config.Pipeline.DefaultCloneImage),
+		compiler.WithDefaultClonePlugin(server.Config.Pipeline.DefaultClonePlugin),
 		compiler.WithRegistry(registries...),
 		compiler.WithSecret(secrets...),
 		compiler.WithPrefix(
diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index 085f7e1583..e7354195da 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -29,13 +29,13 @@ var DefaultConfigOrder = [...]string{
 }
 
 const (
-	// DefaultCloneImage can be changed by 'WOODPECKER_DEFAULT_CLONE_IMAGE' at runtime.
+	// DefaultCloneImage can be changed by 'WOODPECKER_DEFAULT_CLONE_PLUGIN' at runtime.
 	// renovate: datasource=docker depName=woodpeckerci/plugin-git
-	DefaultCloneImage = "docker.io/woodpeckerci/plugin-git:2.5.2"
+	DefaultClonePlugin = "docker.io/woodpeckerci/plugin-git:2.5.2"
 )
 
 var TrustedCloneImages = []string{
-	DefaultCloneImage,
+	DefaultClonePlugin,
 	"docker.io/woodpeckerci/plugin-git",
 	"quay.io/woodpeckerci/plugin-git",
 }

From 184a13b671f31f92746e46e85d5c3e88f1d5e3c1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:39:19 +0200
Subject: [PATCH 15/25] make trustedClonePlugins an setting for admins

---
 cli/exec/exec.go                                |  6 +++++-
 cli/lint/lint.go                                |  6 +++++-
 cmd/server/flags.go                             |  6 ++++++
 cmd/server/setup.go                             |  4 ++--
 docs/docs/30-administration/10-server-config.md |  9 +++++++++
 pipeline/frontend/yaml/compiler/compiler.go     | 11 ++++++-----
 pipeline/frontend/yaml/compiler/option.go       |  6 ++++++
 pipeline/frontend/yaml/compiler/option_test.go  |  2 +-
 pipeline/frontend/yaml/linter/linter.go         | 13 ++++++++++---
 pipeline/frontend/yaml/linter/option.go         |  7 +++++++
 pipeline/frontend/yaml/types/container.go       |  5 ++---
 server/pipeline/stepbuilder/stepBuilder.go      |  2 ++
 shared/constant/constant.go                     |  5 +++--
 13 files changed, 64 insertions(+), 18 deletions(-)

diff --git a/cli/exec/exec.go b/cli/exec/exec.go
index 79994e6b92..c59df519f3 100644
--- a/cli/exec/exec.go
+++ b/cli/exec/exec.go
@@ -41,6 +41,7 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix"
 	pipelineLog "go.woodpecker-ci.org/woodpecker/v2/pipeline/log"
+	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 	"go.woodpecker-ci.org/woodpecker/v2/shared/utils"
 )
 
@@ -185,7 +186,10 @@ func execWithAxis(ctx context.Context, c *cli.Command, file, repoPath string, ax
 	}
 
 	// lint the yaml file
-	err = linter.New(linter.WithTrusted(true)).Lint([]*linter.WorkflowConfig{{
+	err = linter.New(
+		linter.WithTrusted(true),
+		linter.WithTrustedClonePlugins(constant.TrustedClonePlugins),
+	).Lint([]*linter.WorkflowConfig{{
 		File:      path.Base(file),
 		RawConfig: confStr,
 		Workflow:  conf,
diff --git a/cli/lint/lint.go b/cli/lint/lint.go
index 1e053369df..b015a87ee4 100644
--- a/cli/lint/lint.go
+++ b/cli/lint/lint.go
@@ -27,6 +27,7 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v2/cli/common"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter"
+	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 )
 
 // Command exports the info command.
@@ -95,7 +96,10 @@ func lintFile(_ context.Context, _ *cli.Command, file string) error {
 	}
 
 	// TODO: lint multiple files at once to allow checks for sth like "depends_on" to work
-	err = linter.New(linter.WithTrusted(true)).Lint([]*linter.WorkflowConfig{config})
+	err = linter.New(
+		linter.WithTrusted(true),
+		linter.WithTrustedClonePlugins(constant.TrustedClonePlugins),
+	).Lint([]*linter.WorkflowConfig{config})
 	if err != nil {
 		str, err := FormatLintError(config.File, err)
 
diff --git a/cmd/server/flags.go b/cmd/server/flags.go
index 40aeabd681..f29071d986 100644
--- a/cmd/server/flags.go
+++ b/cmd/server/flags.go
@@ -165,6 +165,12 @@ var flags = append([]cli.Flag{
 		Usage:   "Allow plugins to run in privileged mode, if environment variable is defined but empty there will be none",
 		Value:   constant.PrivilegedPlugins,
 	},
+	&cli.StringSliceFlag{
+		Sources: cli.EnvVars("WOODPECKER_PLUGINS_TRUSTED_CLONE"),
+		Name:    "plugins-trusted-clone",
+		Usage:   "Plugins witch are trusted to handle the netrc info in clone steps",
+		Value:   constant.TrustedClonePlugins,
+	},
 	&cli.StringSliceFlag{
 		Sources: cli.EnvVars("WOODPECKER_VOLUME"),
 		Name:    "volume",
diff --git a/cmd/server/setup.go b/cmd/server/setup.go
index aa60f4133c..3b67c0ca6e 100644
--- a/cmd/server/setup.go
+++ b/cmd/server/setup.go
@@ -43,7 +43,6 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v2/server/store"
 	"go.woodpecker-ci.org/woodpecker/v2/server/store/datastore"
 	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
-	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 )
 
 const (
@@ -166,7 +165,8 @@ func setupEvilGlobals(ctx context.Context, c *cli.Command, s store.Store) error
 
 	// Cloning
 	server.Config.Pipeline.DefaultClonePlugin = c.String("default-clone-plugin")
-	constant.TrustedCloneImages = append(constant.TrustedCloneImages, server.Config.Pipeline.DefaultClonePlugin)
+	server.Config.Pipeline.TrustedClonePlugins = c.StringSlice("plugins-trusted-clone")
+	server.Config.Pipeline.TrustedClonePlugins = append(server.Config.Pipeline.TrustedClonePlugins, server.Config.Pipeline.DefaultClonePlugin)
 
 	// Execution
 	_events := c.StringSlice("default-cancel-previous-pipeline-events")
diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index 6443cc2be0..154b248b14 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -353,6 +353,15 @@ a user can log into Woodpecker, without re-authentication.
 Docker images to run in privileged mode. Only change if you are sure what you do!
 You should specify the tag of your images too, as this enforces exact matches.
 
+### WOODPECKER_PLUGINS_TRUSTED_CLONE
+
+> Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
+
+Plugins witch are trusted to handle the netrc info in clone steps.
+If a clone step use an image not in this list, the netrc will not be injected and an user has to use other methods (e.g. secrets) to clone non public repos.
+
+You should specify the tag of your images too, as this enforces exact matches.
+
 <!--
 ### `WOODPECKER_VOLUME`
 > Default: empty
diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go
index d8572faf91..1a5844f834 100644
--- a/pipeline/frontend/yaml/compiler/compiler.go
+++ b/pipeline/frontend/yaml/compiler/compiler.go
@@ -114,9 +114,10 @@ type Compiler struct {
 // New creates a new Compiler with options.
 func New(opts ...Option) *Compiler {
 	compiler := &Compiler{
-		env:      map[string]string{},
-		cloneEnv: map[string]string{},
-		secrets:  map[string]Secret{},
+		env:                 map[string]string{},
+		cloneEnv:            map[string]string{},
+		secrets:             map[string]Secret{},
+		trustedClonePlugins: constant.TrustedClonePlugins,
 	}
 	for _, opt := range opts {
 		opt(compiler)
@@ -209,7 +210,7 @@ func (c *Compiler) Compile(conf *yaml_types.Workflow) (*backend_types.Config, er
 			}
 
 			// only inject netrc if it's a trusted repo or a trusted plugin
-			if !c.netrcOnlyTrusted || c.trustedPipeline || (container.IsPlugin() && container.IsTrustedCloneImage()) {
+			if !c.netrcOnlyTrusted || c.trustedPipeline || (container.IsPlugin() && container.IsTrustedCloneImage(c.trustedClonePlugins)) {
 				for k, v := range c.cloneEnv {
 					step.Environment[k] = v
 				}
@@ -266,7 +267,7 @@ func (c *Compiler) Compile(conf *yaml_types.Workflow) (*backend_types.Config, er
 		}
 
 		// inject netrc if it's a trusted repo or a trusted clone-plugin
-		if c.trustedPipeline || (container.IsPlugin() && container.IsTrustedCloneImage()) {
+		if c.trustedPipeline || (container.IsPlugin() && container.IsTrustedCloneImage(c.trustedClonePlugins)) {
 			for k, v := range c.cloneEnv {
 				step.Environment[k] = v
 			}
diff --git a/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go
index 7b6cfb0791..c25b555ec0 100644
--- a/pipeline/frontend/yaml/compiler/option.go
+++ b/pipeline/frontend/yaml/compiler/option.go
@@ -178,6 +178,12 @@ func WithDefaultClonePlugin(cloneImage string) Option {
 	}
 }
 
+func WithTrustedClonePlugins(images []string) Option {
+	return func(compiler *Compiler) {
+		compiler.trustedClonePlugins = images
+	}
+}
+
 // WithTrusted configures the compiler with the trusted repo option.
 func WithTrusted(trusted bool) Option {
 	return func(compiler *Compiler) {
diff --git a/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go
index ed21e00bbe..360aef64d0 100644
--- a/pipeline/frontend/yaml/compiler/option_test.go
+++ b/pipeline/frontend/yaml/compiler/option_test.go
@@ -170,5 +170,5 @@ func TestDefaultClonePlugin(t *testing.T) {
 	compiler := New(
 		WithDefaultClonePlugin("not-an-image"),
 	)
-	assert.Equal(t, "not-an-image", compiler.defaultCloneImage)
+	assert.Equal(t, "not-an-image", compiler.defaultClonePlugin)
 }
diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go
index fc8e2360f8..e3830c311c 100644
--- a/pipeline/frontend/yaml/linter/linter.go
+++ b/pipeline/frontend/yaml/linter/linter.go
@@ -30,8 +30,9 @@ import (
 
 // A Linter lints a pipeline configuration.
 type Linter struct {
-	trusted           bool
-	privilegedPlugins *[]string
+	trusted             bool
+	privilegedPlugins   *[]string
+	trustedClonePlugins *[]string
 }
 
 // New creates a new Linter with options.
@@ -105,9 +106,15 @@ func (l *Linter) lintCloneSteps(config *WorkflowConfig) error {
 	if len(config.Workflow.Clone.ContainerList) == 0 {
 		return nil
 	}
+
+	trustedClonePlugins := constant.TrustedClonePlugins
+	if l.trustedClonePlugins != nil {
+		trustedClonePlugins = *l.trustedClonePlugins
+	}
+
 	var linterErr error
 	for _, container := range config.Workflow.Clone.ContainerList {
-		if !utils.MatchImageDynamic(container.Image, constant.TrustedCloneImages...) {
+		if !utils.MatchImageDynamic(container.Image, trustedClonePlugins...) {
 			linterErr = multierr.Append(linterErr,
 				newLinterError(
 					"Specified clone image does not match allow list, netrc will not be injected",
diff --git a/pipeline/frontend/yaml/linter/option.go b/pipeline/frontend/yaml/linter/option.go
index 3a3cbba445..d1032c6f50 100644
--- a/pipeline/frontend/yaml/linter/option.go
+++ b/pipeline/frontend/yaml/linter/option.go
@@ -30,3 +30,10 @@ func PrivilegedPlugins(plugins []string) Option {
 		linter.privilegedPlugins = &plugins
 	}
 }
+
+// PrivilegedPlugins adds the list of privileged plugins.
+func WithTrustedClonePlugins(plugins []string) Option {
+	return func(linter *Linter) {
+		linter.trustedClonePlugins = &plugins
+	}
+}
diff --git a/pipeline/frontend/yaml/types/container.go b/pipeline/frontend/yaml/types/container.go
index 0c33ff2688..9ebc8f12ac 100644
--- a/pipeline/frontend/yaml/types/container.go
+++ b/pipeline/frontend/yaml/types/container.go
@@ -22,7 +22,6 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base"
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils"
-	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 )
 
 type (
@@ -125,6 +124,6 @@ func (c *Container) IsPlugin() bool {
 		len(c.Secrets) == 0
 }
 
-func (c *Container) IsTrustedCloneImage() bool {
-	return c.IsPlugin() && utils.MatchImageDynamic(c.Image, constant.TrustedCloneImages...)
+func (c *Container) IsTrustedCloneImage(trustedClonePlugins []string) bool {
+	return c.IsPlugin() && utils.MatchImageDynamic(c.Image, trustedClonePlugins...)
 }
diff --git a/server/pipeline/stepbuilder/stepBuilder.go b/server/pipeline/stepbuilder/stepBuilder.go
index 3aa4fac22a..aeb91a25a4 100644
--- a/server/pipeline/stepbuilder/stepBuilder.go
+++ b/server/pipeline/stepbuilder/stepBuilder.go
@@ -143,6 +143,7 @@ func (b *StepBuilder) genItemForWorkflow(workflow *model.Workflow, axis matrix.A
 	errorsAndWarnings = multierr.Append(errorsAndWarnings, linter.New(
 		linter.WithTrusted(b.Repo.IsTrusted),
 		linter.PrivilegedPlugins(server.Config.Pipeline.PrivilegedPlugins),
+		linter.WithTrustedClonePlugins(server.Config.Pipeline.TrustedClonePlugins),
 	).Lint([]*linter.WorkflowConfig{{
 		Workflow:  parsed,
 		File:      workflow.Name,
@@ -282,6 +283,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.WithRegistry(registries...),
 		compiler.WithSecret(secrets...),
 		compiler.WithPrefix(
diff --git a/shared/constant/constant.go b/shared/constant/constant.go
index e7354195da..d4560bb453 100644
--- a/shared/constant/constant.go
+++ b/shared/constant/constant.go
@@ -29,12 +29,13 @@ var DefaultConfigOrder = [...]string{
 }
 
 const (
-	// DefaultCloneImage can be changed by 'WOODPECKER_DEFAULT_CLONE_PLUGIN' at runtime.
+	// DefaultClonePlugin can be changed by 'WOODPECKER_DEFAULT_CLONE_PLUGIN' at runtime.
 	// renovate: datasource=docker depName=woodpeckerci/plugin-git
 	DefaultClonePlugin = "docker.io/woodpeckerci/plugin-git:2.5.2"
 )
 
-var TrustedCloneImages = []string{
+// TrustedClonePlugins can be changed by 'WOODPECKER_PLUGINS_TRUSTED_CLONE' at runtime.
+var TrustedClonePlugins = []string{
 	DefaultClonePlugin,
 	"docker.io/woodpeckerci/plugin-git",
 	"quay.io/woodpeckerci/plugin-git",

From 4501f882ba4e73654f88b6d1c7d086df8ecfee7c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:46:42 +0200
Subject: [PATCH 16/25] cli lint respect custom trusted clone plugins

---
 cli/lint/lint.go | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/cli/lint/lint.go b/cli/lint/lint.go
index b015a87ee4..0f324f14c3 100644
--- a/cli/lint/lint.go
+++ b/cli/lint/lint.go
@@ -36,6 +36,14 @@ var Command = &cli.Command{
 	Usage:     "lint a pipeline configuration file",
 	ArgsUsage: "[path/to/.woodpecker.yaml]",
 	Action:    lint,
+	Flags: []cli.Flag{
+		&cli.StringSliceFlag{
+			Sources: cli.EnvVars("WOODPECKER_PLUGINS_TRUSTED_CLONE"),
+			Name:    "plugins-trusted-clone",
+			Usage:   "Plugins witch are trusted to handle the netrc info in clone steps",
+			Value:   constant.TrustedClonePlugins,
+		},
+	},
 }
 
 func lint(ctx context.Context, c *cli.Command) error {
@@ -70,7 +78,7 @@ func lintDir(ctx context.Context, c *cli.Command, dir string) error {
 	return nil
 }
 
-func lintFile(_ context.Context, _ *cli.Command, file string) error {
+func lintFile(_ context.Context, c *cli.Command, file string) error {
 	fi, err := os.Open(file)
 	if err != nil {
 		return err
@@ -84,7 +92,7 @@ func lintFile(_ context.Context, _ *cli.Command, file string) error {
 
 	rawConfig := string(buf)
 
-	c, err := yaml.ParseString(rawConfig)
+	parsedConfig, err := yaml.ParseString(rawConfig)
 	if err != nil {
 		return err
 	}
@@ -92,13 +100,13 @@ func lintFile(_ context.Context, _ *cli.Command, file string) error {
 	config := &linter.WorkflowConfig{
 		File:      path.Base(file),
 		RawConfig: rawConfig,
-		Workflow:  c,
+		Workflow:  parsedConfig,
 	}
 
 	// TODO: lint multiple files at once to allow checks for sth like "depends_on" to work
 	err = linter.New(
 		linter.WithTrusted(true),
-		linter.WithTrustedClonePlugins(constant.TrustedClonePlugins),
+		linter.WithTrustedClonePlugins(c.StringSlice("plugins-trusted-clone")),
 	).Lint([]*linter.WorkflowConfig{config})
 	if err != nil {
 		str, err := FormatLintError(config.File, err)

From b8a62d86be4b23c3f861568a1e64c01ae3a7754e Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:48:54 +0200
Subject: [PATCH 17/25] Update docs/docs/30-administration/10-server-config.md

---
 docs/docs/30-administration/10-server-config.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index 154b248b14..8d0617494b 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -351,6 +351,7 @@ a user can log into Woodpecker, without re-authentication.
 > Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
 Docker images to run in privileged mode. Only change if you are sure what you do!
+
 You should specify the tag of your images too, as this enforces exact matches.
 
 ### WOODPECKER_PLUGINS_TRUSTED_CLONE

From bd6aff7b5a2256ba7cb1fd677caf36129f703560 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:52:13 +0200
Subject: [PATCH 18/25] pipeline compiler: init defaultClonePlugin the same and
 respect 0 if set to 0

---
 pipeline/frontend/yaml/compiler/compiler.go | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go
index 1a5844f834..dd9654b1c5 100644
--- a/pipeline/frontend/yaml/compiler/compiler.go
+++ b/pipeline/frontend/yaml/compiler/compiler.go
@@ -117,6 +117,7 @@ func New(opts ...Option) *Compiler {
 		env:                 map[string]string{},
 		cloneEnv:            map[string]string{},
 		secrets:             map[string]Secret{},
+		defaultClonePlugin:  constant.DefaultClonePlugin,
 		trustedClonePlugins: constant.TrustedClonePlugins,
 	}
 	for _, opt := range opts {
@@ -165,20 +166,15 @@ func (c *Compiler) Compile(conf *yaml_types.Workflow) (*backend_types.Config, er
 		c.workspacePath = path.Clean(conf.Workspace.Path)
 	}
 
-	cloneImage := constant.DefaultClonePlugin
-	if len(c.defaultClonePlugin) > 0 {
-		cloneImage = c.defaultClonePlugin
-	}
-
 	// add default clone step
-	if !c.local && len(conf.Clone.ContainerList) == 0 && !conf.SkipClone {
+	if !c.local && len(conf.Clone.ContainerList) == 0 && !conf.SkipClone && len(c.defaultClonePlugin) != 0 {
 		cloneSettings := map[string]any{"depth": "0"}
 		if c.metadata.Curr.Event == metadata.EventTag {
 			cloneSettings["tags"] = "true"
 		}
 		container := &yaml_types.Container{
 			Name:        defaultCloneName,
-			Image:       cloneImage,
+			Image:       c.defaultClonePlugin,
 			Settings:    cloneSettings,
 			Environment: make(map[string]any),
 		}

From 052668a5c4c193225552e6972ef7126b8dd465ae Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 19:57:50 +0200
Subject: [PATCH 19/25] clean: all about trusted clone

---
 pipeline/frontend/yaml/compiler/convert.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go
index bab841d8ac..d011753683 100644
--- a/pipeline/frontend/yaml/compiler/convert.go
+++ b/pipeline/frontend/yaml/compiler/convert.go
@@ -138,7 +138,7 @@ func (c *Compiler) createProcess(container *yaml_types.Container, stepType backe
 		environment[requested] = secretValue
 	}
 
-	if utils.MatchImageDynamic(container.Image, c.escalated...) && container.IsPlugin() {
+	if utils.MatchImage(container.Image, c.escalated...) && container.IsPlugin() {
 		privileged = true
 	}
 

From 53a9a3f4f67b067262a7edc020637ec79120426b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 20:05:04 +0200
Subject: [PATCH 20/25] clean docs

---
 docs/docs/30-administration/10-server-config.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index 8d0617494b..654eadbff0 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -352,8 +352,6 @@ a user can log into Woodpecker, without re-authentication.
 
 Docker images to run in privileged mode. Only change if you are sure what you do!
 
-You should specify the tag of your images too, as this enforces exact matches.
-
 ### WOODPECKER_PLUGINS_TRUSTED_CLONE
 
 > Defaults are defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)

From c90b4dec00f7ff4d05fde61f0d609b69bd26f1ad Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 20:08:04 +0200
Subject: [PATCH 21/25] clean docs (2)

---
 docs/docs/91-migrations.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md
index 2cc396303d..97eb8b8d22 100644
--- a/docs/docs/91-migrations.md
+++ b/docs/docs/91-migrations.md
@@ -5,7 +5,7 @@ Some versions need some changes to the server configuration or the pipeline conf
 ## `next`
 
 - `WOODPECKER_DEFAULT_CLONE_IMAGE` got depricated use `WOODPECKER_DEFAULT_CLONE_PLUGIN`
-- Check trusted-clone- and priviledged-plugins by image name and tag (if tag is set)
+- Check trusted-clone-plugins by image name and tag (if tag is set)
 - Remove `plugins/docker`, `plugins/gcr` and `plugins/ecr` from the default list of privileged plugins ([modify the list via config if needed](./30-administration/10-server-config.md#woodpecker_escalate)).
 - Secret filters for plugins now check against tag if specified
 - Removed `WOODPECKER_DEV_OAUTH_HOST` and `WOODPECKER_DEV_GITEA_OAUTH_URL` use `WOODPECKER_EXPERT_FORGE_OAUTH_HOST`

From 1710cb6448196b60faa7143bfbf6d7ba6e18e6a4 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 20:11:00 +0200
Subject: [PATCH 22/25] add one more info

---
 docs/docs/30-administration/10-server-config.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md
index 654eadbff0..c11d91f528 100644
--- a/docs/docs/30-administration/10-server-config.md
+++ b/docs/docs/30-administration/10-server-config.md
@@ -323,7 +323,9 @@ List of event names that will be canceled when a new pipeline for the same conte
 
 > Default is defined in [shared/constant/constant.go](https://github.com/woodpecker-ci/woodpecker/blob/main/shared/constant/constant.go)
 
-The default docker image to be used when cloning the repo
+The default docker image to be used when cloning the repo.
+
+It is also added to the trusted clone plugin list.
 
 ### `WOODPECKER_DEFAULT_PIPELINE_TIMEOUT`
 

From 54f9d0a2de8abe88079e3f9dba42e0321fd78749 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 20:18:09 +0200
Subject: [PATCH 23/25] add test

---
 pipeline/frontend/yaml/compiler/option_test.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go
index 360aef64d0..a865ef254c 100644
--- a/pipeline/frontend/yaml/compiler/option_test.go
+++ b/pipeline/frontend/yaml/compiler/option_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata"
+	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
 )
 
 func TestWithWorkspace(t *testing.T) {
@@ -172,3 +173,11 @@ func TestDefaultClonePlugin(t *testing.T) {
 	)
 	assert.Equal(t, "not-an-image", compiler.defaultClonePlugin)
 }
+
+func TestWithTrustedClonePlugins(t *testing.T) {
+	compiler := New(WithTrustedClonePlugins([]string{"not-an-image"}))
+	assert.ElementsMatch(t, []string{"not-an-image"}, compiler.trustedClonePlugins)
+
+	compiler = New()
+	assert.ElementsMatch(t, constant.TrustedClonePlugins, compiler.trustedClonePlugins)
+}

From 9380b5bebe67ad9d96fc5c92580f00f14e078a92 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 20:19:37 +0200
Subject: [PATCH 24/25] Update pipeline/frontend/yaml/linter/linter_test.go

---
 pipeline/frontend/yaml/linter/linter_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline/frontend/yaml/linter/linter_test.go b/pipeline/frontend/yaml/linter/linter_test.go
index 99518c728e..23a5cf3832 100644
--- a/pipeline/frontend/yaml/linter/linter_test.go
+++ b/pipeline/frontend/yaml/linter/linter_test.go
@@ -174,7 +174,7 @@ func TestLintErrors(t *testing.T) {
 			want: "Cannot use once privileged plugins removed from WOODPECKER_ESCALATE, use 'woodpeckerci/plugin-docker-buildx' instead",
 		},
 		{
-			from: "{steps: { build: { image: golang, settings: { test: 'true' } } }, when: { branch: main, event: push }, clone: { git: { image: woodpeckerci/plugin-git:v1.1.0 } } }",
+			from: "{steps: { build: { image: golang, settings: { test: 'true' } } }, when: { branch: main, event: push }, clone: { git: { image: some-other/plugin-git:v1.1.0 } } }",
 			want: "Specified clone image does not match allow list, netrc will not be injected",
 		},
 	}

From 4310ce453710e5ffd240419fc568e8e046508b2a Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 1 Sep 2024 20:20:04 +0200
Subject: [PATCH 25/25] Update pipeline/frontend/yaml/linter/option.go

---
 pipeline/frontend/yaml/linter/option.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pipeline/frontend/yaml/linter/option.go b/pipeline/frontend/yaml/linter/option.go
index d1032c6f50..ca9a3afd94 100644
--- a/pipeline/frontend/yaml/linter/option.go
+++ b/pipeline/frontend/yaml/linter/option.go
@@ -31,7 +31,7 @@ func PrivilegedPlugins(plugins []string) Option {
 	}
 }
 
-// PrivilegedPlugins adds the list of privileged plugins.
+// WithTrustedClonePlugins adds the list of trusted clone plugins.
 func WithTrustedClonePlugins(plugins []string) Option {
 	return func(linter *Linter) {
 		linter.trustedClonePlugins = &plugins