This is an automated email from the ASF dual-hosted git repository.

abeizn pushed a commit to branch release-v1.0
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 689c7327165470a113acd38733b6f2af51b2093e
Author: Klesh Wong <[email protected]>
AuthorDate: Thu Apr 11 11:41:47 2024 +0800

    fix: giturls CVE-2023-46402 (#7310)
---
 backend/go.mod                            | 6 +++---
 backend/go.sum                            | 4 ++--
 backend/plugins/gitextractor/impl/impl.go | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/go.mod b/backend/go.mod
index 0f4aa5fc1..8062a749b 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -30,7 +30,7 @@ require (
        github.com/swaggo/swag v1.16.1
        github.com/tidwall/gjson v1.14.3
        github.com/viant/afs v1.16.0
-       golang.org/x/crypto v0.21.0
+       golang.org/x/crypto v0.21.0 // indirect
        golang.org/x/exp v0.0.0-20221028150844-83b7d23a625f
        golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
        golang.org/x/sync v0.3.0
@@ -93,7 +93,6 @@ require (
        github.com/pjbgf/sha1cd v0.3.0 // indirect
        github.com/pkg/errors v0.9.1 // indirect
        github.com/pmezard/go-difflib v1.0.0 // indirect
-       github.com/rogpeppe/go-internal v1.11.0 // indirect
        github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // 
indirect
        github.com/skeema/knownhosts v1.2.2 // indirect
        github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -104,7 +103,6 @@ require (
        github.com/tidwall/pretty v1.2.0 // indirect
        github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
        github.com/ugorji/go/codec v1.2.11 // indirect
-       github.com/whilp/git-urls v1.0.0 // indirect
        github.com/xanzy/ssh-agent v0.3.3 // indirect
        golang.org/x/arch v0.3.0 // indirect
        golang.org/x/net v0.22.0 // indirect
@@ -120,8 +118,10 @@ require (
 )
 
 require (
+       github.com/chainguard-dev/git-urls v1.0.2
        github.com/go-sql-driver/mysql v1.7.1
        github.com/golang-jwt/jwt/v5 v5.0.0-rc.1
+       github.com/rogpeppe/go-internal v1.11.0
        golang.org/x/mod v0.13.0
 )
 
diff --git a/backend/go.sum b/backend/go.sum
index 3f69d4be1..d48de10e0 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -61,6 +61,8 @@ github.com/bytedance/sonic v1.5.0/go.mod 
h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1
 github.com/bytedance/sonic v1.9.1 
h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod 
h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod 
h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/chainguard-dev/git-urls v1.0.2 
h1:pSpT7ifrpc5X55n4aTTm7FFUE+ZQHKiqpiwNkJrVcKQ=
+github.com/chainguard-dev/git-urls v1.0.2/go.mod 
h1:rbGgj10OS7UgZlbzdUQIQpT0k/D4+An04HJY7Ol+Y/o=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod 
h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 
h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod 
h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
@@ -512,8 +514,6 @@ github.com/ugorji/go/codec v1.2.11 
h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4d
 github.com/ugorji/go/codec v1.2.11/go.mod 
h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/viant/afs v1.16.0 h1:yb9TQ1gjVVLji9lcXLWaarklqmGWeXTZOwc2fwJevCI=
 github.com/viant/afs v1.16.0/go.mod 
h1:wdiEDffZKJwj1ZSFasy7hHoxLQdSpFZkd3XOWNt1aN0=
-github.com/whilp/git-urls v1.0.0 
h1:95f6UMWN5FKW71ECsXRUd3FVYiXdrE7aX4NZKcPmIjU=
-github.com/whilp/git-urls v1.0.0/go.mod 
h1:J16SAmobsqc3Qcy98brfl5f5+e0clUvg1krgwk/qCfE=
 github.com/xanzy/ssh-agent v0.3.3 
h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
 github.com/xanzy/ssh-agent v0.3.3/go.mod 
h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
 github.com/yuin/goldmark v1.1.25/go.mod 
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/backend/plugins/gitextractor/impl/impl.go 
b/backend/plugins/gitextractor/impl/impl.go
index 6d63622a5..ae4982551 100644
--- a/backend/plugins/gitextractor/impl/impl.go
+++ b/backend/plugins/gitextractor/impl/impl.go
@@ -26,7 +26,7 @@ import (
        helper "github.com/apache/incubator-devlake/helpers/pluginhelper/api"
        "github.com/apache/incubator-devlake/plugins/gitextractor/parser"
        "github.com/apache/incubator-devlake/plugins/gitextractor/tasks"
-       giturls "github.com/whilp/git-urls"
+       giturls "github.com/chainguard-dev/git-urls"
 )
 
 var _ interface {

Reply via email to