From 2ae680f0a0a936ba642c39dc66cb388ef9b05424 Mon Sep 17 00:00:00 2001
From: Alena Petraki <a.petraki@perx.ru>
Date: Tue, 23 Apr 2024 11:21:23 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20`un?=
=?UTF-8?q?expected=20HTTP=20status=20code=20received=20from=20server`=20?=
=?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B5?=
=?UTF-8?q?=20=D0=BB=D1=8E=D0=B1=D1=8B=D1=85=20=D1=81=D0=B1=D0=BE=D1=80?=
=?UTF-8?q?=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/auth/grpc.go | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/pkg/auth/grpc.go b/pkg/auth/grpc.go
index e2b89c4f..a947a33b 100644
--- a/pkg/auth/grpc.go
+++ b/pkg/auth/grpc.go
@@ -131,6 +131,15 @@ func WithOAuth2Credentials(ctx context.Context, tokenURL, clientID, clientSecret
// WithTLSCredentials возвращает опции для создания grpc-соединения с TLS-сертификатами
func WithTLSCredentials(ctx context.Context, cert, cacert, key []byte) (grpc.DialOption, error) {
+ creds, err := TLSCredentials(ctx, cert, cacert, key)
+ if err != nil {
+ return nil, err
+ }
+ return grpc.WithTransportCredentials(creds), nil
+}
+
+// TLSCredentials возвращает TransportCredentials для создания grpc-соединения с TLS-сертификатами
+func TLSCredentials(ctx context.Context, cert, cacert, key []byte) (credentials.TransportCredentials, error) {
certPool := x509.NewCertPool()
if !certPool.AppendCertsFromPEM(cacert) {
return nil, errors.New("CA certificate not loaded")
@@ -139,5 +148,5 @@ func WithTLSCredentials(ctx context.Context, cert, cacert, key []byte) (grpc.Dia
if err != nil {
return nil, err
}
- return grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{clientCert}, RootCAs: certPool})), nil
+ return credentials.NewTLS(&tls.Config{Certificates: []tls.Certificate{clientCert}, RootCAs: certPool}), nil
}
--
GitLab