Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2022-05-05 08:55:27 +0300
committerIgor Drozdov <idrozdov@gitlab.com>2022-06-08 16:33:10 +0300
commita96b9667d9e864e80425795277f3f36ba65e7992 (patch)
treead39887e4b1580aa4abd48364ca233f03daff4ab
parent32c2ef904e489ce6e3fe827b758184b2e07e5cb4 (diff)
Remove self_signed_cert optionid-update-gitlab-shell
This option has been deprecated and recently removed since it didn't have any implication on self signed cert but has been discouraged from using due to security reasons Changelog: removed
-rw-r--r--NOTICE28
-rw-r--r--config.toml.example1
-rw-r--r--go.mod2
-rw-r--r--internal/git/smudge/config_test.go2
-rw-r--r--internal/gitaly/config/config.go1
-rw-r--r--internal/gitlab/http_client.go1
6 files changed, 18 insertions, 17 deletions
diff --git a/NOTICE b/NOTICE
index 6d78496e7..c629e610b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4495,6 +4495,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+LICENSE - github.com/golang-jwt/jwt/v4
+Copyright (c) 2012 Dave Grijalva
+Copyright (c) 2021 golang-jwt maintainers
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LICENSE - github.com/google/go-cmp/cmp
Copyright (c) 2017 The Go Authors. All rights reserved.
@@ -16903,9 +16915,9 @@ LICENSE - github.com/xanzy/ssh-agent
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LICENSE - gitlab.com/gitlab-org/gitlab-shell/client
-Copyright (c) 2011-2018 GitLab B.V.
+MIT License
-With regard to the GitLab Software:
+Copyright (c) 2011-present GitLab B.V.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -16914,20 +16926,16 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-For all third party components incorporated into the GitLab Software, those
-components are licensed under the original license provided by the owner of the
-applicable component.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LICENSE - gitlab.com/gitlab-org/labkit
diff --git a/config.toml.example b/config.toml.example
index 9a4753e1e..a088a5e0f 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -119,7 +119,6 @@ url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.soc
# password = somepass
# ca_file = /etc/ssl/cert.pem
# ca_path = /etc/pki/tls/certs
-self_signed_cert = false
# # You can adjust the concurrency of each RPC endpoint
# [[concurrency]]
diff --git a/go.mod b/go.mod
index d2474b3c1..c9831482d 100644
--- a/go.mod
+++ b/go.mod
@@ -9,7 +9,6 @@ require (
github.com/getsentry/sentry-go v0.13.0
github.com/git-lfs/git-lfs/v3 v3.2.0
github.com/go-enry/go-license-detector/v4 v4.3.0
- github.com/go-git/go-git/v5 v5.3.0 // indirect
github.com/google/go-cmp v0.5.6
github.com/google/uuid v1.2.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
@@ -37,7 +36,6 @@ require (
go.uber.org/goleak v1.1.10
gocloud.dev v0.23.0
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
- golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect
golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
diff --git a/internal/git/smudge/config_test.go b/internal/git/smudge/config_test.go
index d988bf16c..c6d9b2dfa 100644
--- a/internal/git/smudge/config_test.go
+++ b/internal/git/smudge/config_test.go
@@ -18,7 +18,6 @@ func TestConfigFromEnvironment(t *testing.T) {
Password: "correcthorsebatterystaple",
CAFile: "/ca/file",
CAPath: "/ca/path",
- SelfSigned: true,
},
SecretFile: "/secret/path",
}
@@ -157,7 +156,6 @@ func TestConfig_Environment(t *testing.T) {
Password: "correcthorsebatterystaple",
CAFile: "/ca/file",
CAPath: "/ca/path",
- SelfSigned: true,
},
SecretFile: "/secret/path",
},
diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
index 29718876f..bb930d906 100644
--- a/internal/gitaly/config/config.go
+++ b/internal/gitaly/config/config.go
@@ -98,7 +98,6 @@ type HTTPSettings struct {
Password string `toml:"password" json:"password"`
CAFile string `toml:"ca_file" json:"ca_file"`
CAPath string `toml:"ca_path" json:"ca_path"`
- SelfSigned bool `toml:"self_signed_cert" json:"self_signed_cert"`
}
// Git contains the settings for the Git executable
diff --git a/internal/gitlab/http_client.go b/internal/gitlab/http_client.go
index 05b75c521..cfefe4e9b 100644
--- a/internal/gitlab/http_client.go
+++ b/internal/gitlab/http_client.go
@@ -52,7 +52,6 @@ func NewHTTPClient(
gitlabCfg.RelativeURLRoot,
gitlabCfg.HTTPSettings.CAFile,
gitlabCfg.HTTPSettings.CAPath,
- gitlabCfg.HTTPSettings.SelfSigned,
uint64(gitlabCfg.HTTPSettings.ReadTimeout),
opts,
)