From b0029233d6808eca89c8a530c89a65a0eae2d144 Mon Sep 17 00:00:00 2001 From: Gusted Date: Thu, 10 Feb 2022 20:47:59 +0100 Subject: [PATCH 1/9] Update SSH server - Update SSH server libraries to support extensions negotations. - The extensions negotations are needed to communitcate with algorithms are accepted for "publickey" auth. - This PR adds 2 libraries. The modifed golang.org/x/crypto libraries(this in order to not mismatch with types in ssh.go) and a patched "github.com/gliderlabs/ssh" that has been modified in order to use the modified crypto library. - Resolves #17798 --- go.mod | 3 +++ go.sum | 7 ++++--- modules/ssh/ssh.go | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index c8213fb52b1fb..e3ce05ef2ac2b 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( cloud.google.com/go v0.78.0 // indirect code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 + codeberg.org/gusted/go-crypto v0.0.0-20220210182945-447280c7d883 // indirect gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 @@ -148,6 +149,8 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible +replace github.com/gliderlabs/ssh => codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210193945-7e8a7a7862e8 + exclude github.com/gofrs/uuid v3.2.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible diff --git a/go.sum b/go.sum index 578d7a1cd2239..d510a3273fd15 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,10 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b h1:uv9a8eGSdQ8Dr4Hy code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= +codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210193945-7e8a7a7862e8 h1:FGlD3sYQ96c1teuMzOolqDsdJHo8oEt8QzYSWGa8e9k= +codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210193945-7e8a7a7862e8/go.mod h1:DlyiQTss9qB5V60w8IRMWCMYIPX+8cT1GgzWFCTvAsY= +codeberg.org/gusted/go-crypto v0.0.0-20220210182945-447280c7d883 h1:Eu/c8Jq8YWvLiX49ZIBaLX69XjSzDpOPiD6LT6J81TM= +codeberg.org/gusted/go-crypto v0.0.0-20220210182945-447280c7d883/go.mod h1:AdkJbWxlZ75bsMVCqv8XJJdHi9BZw9FvrQ3ctzJa2Zc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= @@ -311,9 +315,6 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fxamacker/cbor/v2 v2.2.0 h1:6eXqdDDe588rSYAi1HfZKbx6YYQO4mxQ9eC6xYpU/JQ= github.com/fxamacker/cbor/v2 v2.2.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA= -github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 6f4e9934576e5..bb567b6253f9b 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -27,8 +27,8 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" + gossh "codeberg.org/gusted/go-crypto/ssh" "github.com/gliderlabs/ssh" - gossh "golang.org/x/crypto/ssh" ) type contextKey string From 5a6843f1655aba4a99d9f9a0246311ce72a168d9 Mon Sep 17 00:00:00 2001 From: Gusted Date: Thu, 10 Feb 2022 21:35:37 +0100 Subject: [PATCH 2/9] Use replace instead --- go.mod | 7 ++++--- go.sum | 11 +++++------ modules/ssh/ssh.go | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index e3ce05ef2ac2b..0a1149ece0eac 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( cloud.google.com/go v0.78.0 // indirect code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 - codeberg.org/gusted/go-crypto v0.0.0-20220210182945-447280c7d883 // indirect gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 @@ -123,7 +122,7 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect go.uber.org/zap v1.19.0 // indirect - golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 + golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 @@ -149,7 +148,9 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible -replace github.com/gliderlabs/ssh => codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210193945-7e8a7a7862e8 +replace github.com/gliderlabs/ssh => codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d + +replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => codeberg.org/gusted/go-crypto v0.0.0-20220210202945-fb39d7335985 exclude github.com/gofrs/uuid v3.2.0+incompatible diff --git a/go.sum b/go.sum index d510a3273fd15..c52e6db0f0d77 100644 --- a/go.sum +++ b/go.sum @@ -41,10 +41,9 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b h1:uv9a8eGSdQ8Dr4Hy code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= -codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210193945-7e8a7a7862e8 h1:FGlD3sYQ96c1teuMzOolqDsdJHo8oEt8QzYSWGa8e9k= -codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210193945-7e8a7a7862e8/go.mod h1:DlyiQTss9qB5V60w8IRMWCMYIPX+8cT1GgzWFCTvAsY= -codeberg.org/gusted/go-crypto v0.0.0-20220210182945-447280c7d883 h1:Eu/c8Jq8YWvLiX49ZIBaLX69XjSzDpOPiD6LT6J81TM= -codeberg.org/gusted/go-crypto v0.0.0-20220210182945-447280c7d883/go.mod h1:AdkJbWxlZ75bsMVCqv8XJJdHi9BZw9FvrQ3ctzJa2Zc= +codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d h1:Jf8yaYX9i4ypavx73tBLNSIi3un61FKjOB9GNMgp9fo= +codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d/go.mod h1:NVGX6tOmdlNbBQntW8+GxzJoJLC3W9WgtdYAiVCJ/pI= +codeberg.org/gusted/go-crypto v0.0.0-20220210202945-fb39d7335985/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= @@ -1265,8 +1264,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI= -golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 h1:XdAboW3BNMv9ocSCOk/u1MFioZGzCNkiJZ19v9Oe3Ig= +golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index bb567b6253f9b..6f4e9934576e5 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -27,8 +27,8 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - gossh "codeberg.org/gusted/go-crypto/ssh" "github.com/gliderlabs/ssh" + gossh "golang.org/x/crypto/ssh" ) type contextKey string From d92f847f30490ad7579b7a23977bc8d51f8edbef Mon Sep 17 00:00:00 2001 From: Gusted Date: Sat, 12 Feb 2022 18:00:25 +0100 Subject: [PATCH 3/9] Use gitea.com Switch to the gitea-owned version --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0a1149ece0eac..f85d939194139 100644 --- a/go.mod +++ b/go.mod @@ -148,7 +148,7 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible -replace github.com/gliderlabs/ssh => codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d +replace github.com/gliderlabs/ssh => gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => codeberg.org/gusted/go-crypto v0.0.0-20220210202945-fb39d7335985 diff --git a/go.sum b/go.sum index c52e6db0f0d77..aef74d167e89a 100644 --- a/go.sum +++ b/go.sum @@ -41,10 +41,10 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b h1:uv9a8eGSdQ8Dr4Hy code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= -codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d h1:Jf8yaYX9i4ypavx73tBLNSIi3un61FKjOB9GNMgp9fo= -codeberg.org/gusted/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d/go.mod h1:NVGX6tOmdlNbBQntW8+GxzJoJLC3W9WgtdYAiVCJ/pI= codeberg.org/gusted/go-crypto v0.0.0-20220210202945-fb39d7335985/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d h1:RXbQ1b86SRofLjZ8yTTed6USd9b8iB17mAWB6nq2las= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d/go.mod h1:NVGX6tOmdlNbBQntW8+GxzJoJLC3W9WgtdYAiVCJ/pI= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= From cc0a6ca1de355c85c635a78d21c9c7baeffc6fd4 Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 15 Feb 2022 23:57:56 +0100 Subject: [PATCH 4/9] Use gitea.com for go-crypto --- go.mod | 2 +- go.sum | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f85d939194139..6e6f585b22c68 100644 --- a/go.mod +++ b/go.mod @@ -150,7 +150,7 @@ replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompa replace github.com/gliderlabs/ssh => gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d -replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => codeberg.org/gusted/go-crypto v0.0.0-20220210202945-fb39d7335985 +replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => gitea.com/gitea/go-crypto v0.0.0-20220210202945-fb39d7335985 exclude github.com/gofrs/uuid v3.2.0+incompatible diff --git a/go.sum b/go.sum index aef74d167e89a..8b8b8e2dc3d86 100644 --- a/go.sum +++ b/go.sum @@ -41,10 +41,10 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b h1:uv9a8eGSdQ8Dr4Hy code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE= code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= -codeberg.org/gusted/go-crypto v0.0.0-20220210202945-fb39d7335985/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d h1:RXbQ1b86SRofLjZ8yTTed6USd9b8iB17mAWB6nq2las= gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d/go.mod h1:NVGX6tOmdlNbBQntW8+GxzJoJLC3W9WgtdYAiVCJ/pI= +gitea.com/gitea/go-crypto v0.0.0-20220210202945-fb39d7335985/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= From aeaf84aa954e1f5e79fc7eac8e8c176094003497 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 16 Feb 2022 23:31:43 +0100 Subject: [PATCH 5/9] Use really really updated forks --- go.mod | 4 ++-- go.sum | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6e6f585b22c68..c3a66b8109589 100644 --- a/go.mod +++ b/go.mod @@ -148,9 +148,9 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible -replace github.com/gliderlabs/ssh => gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d +replace github.com/gliderlabs/ssh => gitea.com/gitea/gliderlabs-ssh v0.0.0-20220216214906-1599515ea783 -replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => gitea.com/gitea/go-crypto v0.0.0-20220210202945-fb39d7335985 +replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb exclude github.com/gofrs/uuid v3.2.0+incompatible diff --git a/go.sum b/go.sum index 8b8b8e2dc3d86..397a1a337c732 100644 --- a/go.sum +++ b/go.sum @@ -42,9 +42,9 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJE code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d h1:RXbQ1b86SRofLjZ8yTTed6USd9b8iB17mAWB6nq2las= -gitea.com/gitea/gliderlabs-ssh v0.0.0-20220210203306-2ecddf164a2d/go.mod h1:NVGX6tOmdlNbBQntW8+GxzJoJLC3W9WgtdYAiVCJ/pI= -gitea.com/gitea/go-crypto v0.0.0-20220210202945-fb39d7335985/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220216214906-1599515ea783 h1:YeNV5PivkbFYNxpZwdo15anef39rbKiA1ofU++hpwMo= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220216214906-1599515ea783/go.mod h1:TJTbr4qGKlWr6Uutaks5u6zLfWiw1wvPyzWjlIsFcVc= +gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= From e7e7d7c8db7efcbe27d7e39546f5e4292b8002f2 Mon Sep 17 00:00:00 2001 From: Gusted Date: Wed, 16 Feb 2022 23:55:02 +0100 Subject: [PATCH 6/9] Replace x/crypto in our go.mod - Avoid some problems with golang not picking up the replace on the forked version. --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index c3a66b8109589..cebf132fd20b3 100644 --- a/go.mod +++ b/go.mod @@ -148,10 +148,10 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible -replace github.com/gliderlabs/ssh => gitea.com/gitea/gliderlabs-ssh v0.0.0-20220216214906-1599515ea783 - replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb +replace golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 => gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb + exclude github.com/gofrs/uuid v3.2.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible diff --git a/go.sum b/go.sum index 397a1a337c732..4e529225fe5ec 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,7 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJE code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gitea.com/gitea/gliderlabs-ssh v0.0.0-20220216214906-1599515ea783 h1:YeNV5PivkbFYNxpZwdo15anef39rbKiA1ofU++hpwMo= -gitea.com/gitea/gliderlabs-ssh v0.0.0-20220216214906-1599515ea783/go.mod h1:TJTbr4qGKlWr6Uutaks5u6zLfWiw1wvPyzWjlIsFcVc= +gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb h1:FEChZNKzzoLAhrmB9IjoaDP8CluPePeXKMV9ao5Vsfc= gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= @@ -314,6 +313,9 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fxamacker/cbor/v2 v2.2.0 h1:6eXqdDDe588rSYAi1HfZKbx6YYQO4mxQ9eC6xYpU/JQ= github.com/fxamacker/cbor/v2 v2.2.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA= +github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= @@ -1264,8 +1266,6 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 h1:XdAboW3BNMv9ocSCOk/u1MFioZGzCNkiJZ19v9Oe3Ig= -golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= From c01ea7cb4014cc57f7196c9d07f55a646de6c86b Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 4 Mar 2022 14:14:09 +0100 Subject: [PATCH 7/9] Use hard-forks --- go.mod | 7 ++----- go.sum | 11 +++++++---- modules/ssh/ssh.go | 4 ++-- modules/ssh/ssh_graceful.go | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 3c352f247f31f..14ff6ff9278c1 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,8 @@ require ( cloud.google.com/go v0.78.0 // indirect code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 + gitea.com/gitea/gliderlabs-ssh v0.0.0-20220304124244-0214a860fad6 + gitea.com/gitea/go-crypto v0.0.0-20220304121443-e812292233de gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be gitea.com/go-chi/cache v0.0.0-20211013020926-78790b11abf1 gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 @@ -35,7 +37,6 @@ require ( github.com/editorconfig/editorconfig-core-go/v2 v2.4.2 github.com/emirpasic/gods v1.12.0 github.com/ethantkoenig/rupture v1.0.0 - github.com/gliderlabs/ssh v0.3.3 github.com/go-asn1-ber/asn1-ber v1.5.3 // indirect github.com/go-chi/chi/v5 v5.0.4 github.com/go-chi/cors v1.2.0 @@ -148,10 +149,6 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142 replace github.com/satori/go.uuid v1.2.0 => github.com/gofrs/uuid v4.2.0+incompatible -replace golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 => gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb - -replace golang.org/x/crypto v0.0.0-20220210151621-f4118a5b28e2 => gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb - exclude github.com/gofrs/uuid v3.2.0+incompatible exclude github.com/gofrs/uuid v4.0.0+incompatible diff --git a/go.sum b/go.sum index 229467e2dd076..d673e93bb05db 100644 --- a/go.sum +++ b/go.sum @@ -42,8 +42,10 @@ code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b/go.mod h1:zcNbT/aJE code.gitea.io/sdk/gitea v0.15.1 h1:WJreC7YYuxbn0UDaPuWIe/mtiNKTvLN8MLkaw71yx/M= code.gitea.io/sdk/gitea v0.15.1/go.mod h1:klY2LVI3s3NChzIk/MzMn7G1FHrfU7qd63iSMVoHRBA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb h1:FEChZNKzzoLAhrmB9IjoaDP8CluPePeXKMV9ao5Vsfc= -gitea.com/gitea/go-crypto v0.0.0-20220216221207-31cfbd2326cb/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220304124244-0214a860fad6 h1:9H3yHaDDSKA7FOIVFMdRPAwOqGGppKrn1qmG4VA/SO0= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220304124244-0214a860fad6/go.mod h1:XFDRIQ+bRFBEk/kjFrP5rGtZbi9SRcXRHcBl2vIVUvQ= +gitea.com/gitea/go-crypto v0.0.0-20220304121443-e812292233de h1:LUAFC0cLC2iTwORw6v8yh68Vn3ENjlgE29VUo4zjKO4= +gitea.com/gitea/go-crypto v0.0.0-20220304121443-e812292233de/go.mod h1:buuLZh9epm8aBFMsO7hQX3n+J4Ck0Tz8mOKrJ1OTLe4= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be h1:IzSwPVzd2hE6e67ujY8ReBCrQ5IFNd0uiBmC7Ux5IaY= gitea.com/go-chi/binding v0.0.0-20211013065440-d16dc407c2be/go.mod h1:/vR0YjlusOYvosKYW7QKcSnrY0nPLe4RQ/DGi3+i/Do= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0= @@ -313,9 +315,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fxamacker/cbor/v2 v2.2.0 h1:6eXqdDDe588rSYAi1HfZKbx6YYQO4mxQ9eC6xYpU/JQ= github.com/fxamacker/cbor/v2 v2.2.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/gliderlabs/ssh v0.3.3 h1:mBQ8NiOgDkINJrZtoizkC3nDNYgSaWtxyem6S2XHBtA= -github.com/gliderlabs/ssh v0.3.3/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= @@ -1266,6 +1267,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871 h1:/pEO3GD/ABYAjuakUS6xSEmmlyVS4kxBNkeA9tLJiTI= +golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 6f4e9934576e5..f070807ae372d 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -27,8 +27,8 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "github.com/gliderlabs/ssh" - gossh "golang.org/x/crypto/ssh" + ssh "gitea.com/gitea/gliderlabs-ssh" + gossh "gitea.com/gitea/go-crypto/ssh" ) type contextKey string diff --git a/modules/ssh/ssh_graceful.go b/modules/ssh/ssh_graceful.go index 98fe17b3bc611..1da576b899854 100644 --- a/modules/ssh/ssh_graceful.go +++ b/modules/ssh/ssh_graceful.go @@ -9,7 +9,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "github.com/gliderlabs/ssh" + ssh "gitea.com/gitea/gliderlabs-ssh" ) func listen(server *ssh.Server) { From 96cdeb856b1a9eb82bb07f254a3fb63e706bec05 Mon Sep 17 00:00:00 2001 From: Gusted Date: Sun, 13 Mar 2022 14:59:48 +0100 Subject: [PATCH 8/9] Make gitea-vet proof - See https://gitea.com/gitea/gitea-vet/pulls/19 --- modules/ssh/ssh.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index f070807ae372d..9cdec9bedaff8 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -4,6 +4,7 @@ package ssh +// Allow "gitea.com/gitea/go-crypto/ssh" import. import ( "bytes" "context" From f6614ec725de381f83201fd69c7a650e66893aca Mon Sep 17 00:00:00 2001 From: Gusted Date: Fri, 25 Mar 2022 22:11:36 +0100 Subject: [PATCH 9/9] Update depedencies - https://gitea.com/gitea/gliderlabs-ssh/pulls/2 - https://gitea.com/gitea/go-crypto/pulls/3 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 1488038a3fd4d..36a1a03483bf7 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b code.gitea.io/sdk/gitea v0.15.1 - gitea.com/gitea/gliderlabs-ssh v0.0.0-20220304124244-0214a860fad6 - gitea.com/gitea/go-crypto v0.0.0-20220304121443-e812292233de + gitea.com/gitea/gliderlabs-ssh v0.0.0-20220325210844-b53dd11d9536 + gitea.com/gitea/go-crypto v0.0.0-20220325193035-0bf7b22f0acf gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb gitea.com/go-chi/cache v0.0.0-20211201020628-dcb774c4ffea gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5 diff --git a/go.sum b/go.sum index 5bb58355b859f..89a63778e83f4 100644 --- a/go.sum +++ b/go.sum @@ -69,10 +69,10 @@ contrib.go.opencensus.io/exporter/stackdriver v0.13.5/go.mod h1:aXENhDJ1Y4lIg4EU contrib.go.opencensus.io/integrations/ocsql v0.1.4/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE= contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gitea.com/gitea/gliderlabs-ssh v0.0.0-20220304124244-0214a860fad6 h1:9H3yHaDDSKA7FOIVFMdRPAwOqGGppKrn1qmG4VA/SO0= -gitea.com/gitea/gliderlabs-ssh v0.0.0-20220304124244-0214a860fad6/go.mod h1:XFDRIQ+bRFBEk/kjFrP5rGtZbi9SRcXRHcBl2vIVUvQ= -gitea.com/gitea/go-crypto v0.0.0-20220304121443-e812292233de h1:LUAFC0cLC2iTwORw6v8yh68Vn3ENjlgE29VUo4zjKO4= -gitea.com/gitea/go-crypto v0.0.0-20220304121443-e812292233de/go.mod h1:buuLZh9epm8aBFMsO7hQX3n+J4Ck0Tz8mOKrJ1OTLe4= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220325210844-b53dd11d9536 h1:x0r+UU5zhDnSVhydsyAEREB717CzD6QPuIsMO8pPSiw= +gitea.com/gitea/gliderlabs-ssh v0.0.0-20220325210844-b53dd11d9536/go.mod h1:qh1xCKK4gZqEBS9vSRqo5DrVheLOd7m6jeiuNxIsx3E= +gitea.com/gitea/go-crypto v0.0.0-20220325193035-0bf7b22f0acf h1:44CHfaz3/pDiBAGAfGJ6sXCEpEBO56zCtnsXxImdLnQ= +gitea.com/gitea/go-crypto v0.0.0-20220325193035-0bf7b22f0acf/go.mod h1:buuLZh9epm8aBFMsO7hQX3n+J4Ck0Tz8mOKrJ1OTLe4= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb h1:Yy0Bxzc8R2wxiwXoG/rECGplJUSpXqCsog9PuJFgiHs= gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0=