Skip to content

Commit 39b1aaa

Browse files
MartinBastichmouel
authored andcommitted
fix(forgejo): bump forgejo-sdk to bypass Anubis AI protection
Forgejo sdk v3.0.0 contains commit [1] that fixes request headers. That makes Anubis AI to accept API request. Also bumping mongo diver to v1.17.7, which is new indirect dependency of forgejo-sdk, but v.1.17.6 has CVE-2026-2303 https://codeberg.org/mvdkleijn/forgejo-sdk/ commit/d67f46d514df94f377c3ae73bcc4be41a11c061b Signed-off-by: Martin Basti <mbasti@redhat.com> Signed-off-by: Chmouel Boudjnah <chmouel@redhat.com>
1 parent fbbf735 commit 39b1aaa

File tree

238 files changed

+33410
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

238 files changed

+33410
-238
lines changed

go.mod

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/openshift-pipelines/pipelines-as-code
33
go 1.25.0
44

55
require (
6-
codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2 v2.2.0
6+
codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3 v3.0.0
77
github.com/AlecAivazis/survey/v2 v2.3.7
88
github.com/bradleyfalzon/ghinstallation/v2 v2.17.0
99
github.com/chzyer/readline v1.5.1
@@ -56,6 +56,8 @@ require (
5656
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
5757
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
5858
github.com/go-jose/go-jose/v4 v4.1.3 // indirect
59+
github.com/go-openapi/errors v0.22.6 // indirect
60+
github.com/go-openapi/strfmt v0.25.0 // indirect
5961
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
6062
github.com/go-openapi/swag/conv v0.25.4 // indirect
6163
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
@@ -67,10 +69,13 @@ require (
6769
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
6870
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
6971
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
72+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
7073
github.com/google/gofuzz v1.2.0 // indirect
74+
github.com/oklog/ulid v1.3.1 // indirect
7175
github.com/rickb777/plural v1.4.7 // indirect
7276
github.com/robfig/cron/v3 v3.0.1 // indirect
7377
github.com/x448/float16 v0.8.4 // indirect
78+
go.mongodb.org/mongo-driver v1.17.7 // indirect
7479
go.uber.org/atomic v1.11.0 // indirect
7580
go.yaml.in/yaml/v2 v2.4.3 // indirect
7681
go.yaml.in/yaml/v3 v3.0.4 // indirect

go.sum

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
3232
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
3333
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
3434
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
35-
codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2 v2.2.0 h1:HTCWpzyWQOHDWt3LzI6/d2jvUDsw/vgGRWm/8BTvcqI=
36-
codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2 v2.2.0/go.mod h1:ZglEEDj+qkxYUb+SQIeqGtFxQrbaMYqIOgahNKb7uxs=
35+
codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3 v3.0.0 h1:s2fK+FBwvcYsmKDjNhmoe7B8q9zsgs0UrSlYe9r4XjM=
36+
codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3 v3.0.0/go.mod h1:Is2jTpS1dizeXm4skQv/ES3QVqnzcNhn2GzZXpiw9f8=
3737
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI=
3838
contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY=
3939
contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg=
@@ -157,10 +157,14 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
157157
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
158158
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
159159
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
160+
github.com/go-openapi/errors v0.22.6 h1:eDxcf89O8odEnohIXwEjY1IB4ph5vmbUsBMsFNwXWPo=
161+
github.com/go-openapi/errors v0.22.6/go.mod h1:z9S8ASTUqx7+CP1Q8dD8ewGH/1JWFFLX/2PmAYNQLgk=
160162
github.com/go-openapi/jsonpointer v0.22.4 h1:dZtK82WlNpVLDW2jlA1YCiVJFVqkED1MegOUy9kR5T4=
161163
github.com/go-openapi/jsonpointer v0.22.4/go.mod h1:elX9+UgznpFhgBuaMQ7iu4lvvX1nvNsesQ3oxmYTw80=
162164
github.com/go-openapi/jsonreference v0.21.4 h1:24qaE2y9bx/q3uRK/qN+TDwbok1NhbSmGjjySRCHtC8=
163165
github.com/go-openapi/jsonreference v0.21.4/go.mod h1:rIENPTjDbLpzQmQWCj5kKj3ZlmEh+EFVbz3RTUh30/4=
166+
github.com/go-openapi/strfmt v0.25.0 h1:7R0RX7mbKLa9EYCTHRcCuIPcaqlyQiWNPTXwClK0saQ=
167+
github.com/go-openapi/strfmt v0.25.0/go.mod h1:nNXct7OzbwrMY9+5tLX4I21pzcmE6ccMGXl3jFdPfn8=
164168
github.com/go-openapi/swag v0.25.4 h1:OyUPUFYDPDBMkqyxOTkqDYFnrhuhi9NR6QVUvIochMU=
165169
github.com/go-openapi/swag v0.25.4/go.mod h1:zNfJ9WZABGHCFg2RnY0S4IOkAcVTzJ6z2Bi+Q4i6qFQ=
166170
github.com/go-openapi/swag/cmdutils v0.25.4 h1:8rYhB5n6WawR192/BfUu2iVlxqVR9aRgGJP6WaBoW+4=
@@ -195,6 +199,8 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
195199
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
196200
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
197201
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
202+
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
203+
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
198204
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
199205
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
200206
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
@@ -384,6 +390,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
384390
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
385391
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
386392
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
393+
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
394+
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
387395
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
388396
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
389397
github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M=
@@ -499,6 +507,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
499507
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
500508
gitlab.com/gitlab-org/api/client-go v1.14.0 h1:0TAU8zwN4p6ZMUnXLUEkSRmUr+mN4B3JQpdOp+PCpO8=
501509
gitlab.com/gitlab-org/api/client-go v1.14.0/go.mod h1:adtVJ4zSTEJ2fP5Pb1zF4Ox1OKFg0MH43yxpb0T0248=
510+
go.mongodb.org/mongo-driver v1.17.7 h1:a9w+U3Vt67eYzcfq3k/OAv284/uUUkL0uP75VE5rCOU=
511+
go.mongodb.org/mongo-driver v1.17.7/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
502512
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
503513
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
504514
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

pkg/provider/gitea/acl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"strings"
88

9-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
9+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
1010
"github.com/openshift-pipelines/pipelines-as-code/pkg/acl"
1111
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"
1212
"github.com/openshift-pipelines/pipelines-as-code/pkg/policy"

pkg/provider/gitea/acl_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88
"testing"
99

10-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
10+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
1111
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
1212
"github.com/openshift-pipelines/pipelines-as-code/pkg/params"
1313
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"

pkg/provider/gitea/gitea.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"strings"
1717
"time"
1818

19-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
19+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
2020
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
2121
"github.com/openshift-pipelines/pipelines-as-code/pkg/changedfiles"
2222
"github.com/openshift-pipelines/pipelines-as-code/pkg/events"

pkg/provider/gitea/test/setup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"testing"
1414

15-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
15+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
1616
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"
1717
"gotest.tools/v3/assert"
1818
)

test/gitea_gitops_commands_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
forgejo "codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
13+
forgejo "codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
1414
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
1515
"github.com/openshift-pipelines/pipelines-as-code/pkg/opscomments"
1616
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/triggertype"

test/gitea_params_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
15+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
1616
packeys "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/keys"
1717
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
1818
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"

test/gitea_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
15+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
1616
"github.com/google/go-github/v81/github"
1717
"github.com/tektoncd/pipeline/pkg/names"
1818
"gotest.tools/v3/assert"
@@ -554,7 +554,7 @@ func TestGiteaConfigCancelInProgressAfterPRClosed(t *testing.T) {
554554
closed := forgejo.StateClosed
555555
_, _, err = topts.GiteaCNX.Client().EditPullRequest(topts.Opts.Organization, topts.Opts.Repo, topts.PullRequest.Index, forgejo.EditPullRequestOption{
556556
State: &closed,
557-
Body: topts.PullRequest.Body,
557+
Body: &topts.PullRequest.Body,
558558
})
559559
assert.NilError(t, err)
560560

test/pkg/gitea/crd.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"os"
66

7-
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v2"
7+
"codeberg.org/mvdkleijn/forgejo-sdk/forgejo/v3"
88
"github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
99
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"
1010
pacrepo "github.com/openshift-pipelines/pipelines-as-code/test/pkg/repository"
@@ -16,7 +16,7 @@ const webhookSecretName = "webhook-secret"
1616

1717
// CreateToken creates gitea token with all scopes.
1818
func CreateToken(topts *TestOpts) (string, error) {
19-
token, _, err := topts.GiteaCNX.Client().CreateAccessToken(forgejo.CreateAccessTokenOption{
19+
token, _, err := topts.GiteaCNX.Client().CreateAccessToken(topts.Opts.Organization, forgejo.CreateAccessTokenOption{
2020
Name: topts.TargetNS,
2121
Scopes: []forgejo.AccessTokenScope{forgejo.AccessTokenScopeAll},
2222
})

0 commit comments

Comments
 (0)