Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-21 17:46:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1673: TLS certs generation for gRPC service

Browse Source 
Wait for Bridge certificate and use it for gRPC connection

Other: add README file for Bridge-GUI prerequisites

GODT-1673: Configure Client/Server to make use of the bridge cert

Other : comments + todo on known issue

Other: fix go import alias [skip-ci]
This commit is contained in:
Romain LE JEUNE
2022-07-15 17:46:11 +02:00
committed by Jakub
parent 72708d6e2c
commit 8f2e616e07
8 changed files with 131 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/frontend/grpc/service.go
View File

@ -20,7 +20,7 @@ package grpc
//go:generate protoc --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative bridge.proto
import (
"crypto/tls"
cryptotls "crypto/tls"
"net"
"runtime"
"strings"
@ -29,6 +29,7 @@ import (
"github.com/ProtonMail/proton-bridge/v2/internal/bridge"
"github.com/ProtonMail/proton-bridge/v2/internal/config/settings"
bridgetls "github.com/ProtonMail/proton-bridge/v2/internal/config/tls"
"github.com/ProtonMail/proton-bridge/v2/internal/config/useragent"
"github.com/ProtonMail/proton-bridge/v2/internal/events"
"github.com/ProtonMail/proton-bridge/v2/internal/frontend/types"
@ -54,6 +55,7 @@ type Service struct { // nolint:structcheck
programName string
programVersion string
panicHandler types.PanicHandler
tls *bridgetls.TLS
locations *locations.Locations
settings *settings.Settings
eventListener listener.Listener
@ -78,6 +80,7 @@ func NewService(
programName string,
showOnStartup bool,
panicHandler types.PanicHandler,
tls *bridgetls.TLS,
locations *locations.Locations,
settings *settings.Settings,
eventListener listener.Listener,
@ -93,6 +96,7 @@ func NewService(
programName: programName,
programVersion: version,
panicHandler: panicHandler,
tls: tls,
locations: locations,
settings: settings,
eventListener: eventListener,
@ -109,19 +113,16 @@ func NewService(
}
s.userAgent.SetPlatform(runtime.GOOS) // TO-DO GODT-1672 In the previous Qt frontend, this routine used QSysInfo::PrettyProductName to return a more accurate description, e.g. "Windows 10" or "MacOS 10.12"
cert, err := tls.X509KeyPair([]byte(serverCert), []byte(serverKey))
config, err := tls.GetConfig()
config.ClientAuth = cryptotls.NoClientCert // skip client auth if the certificate allow it.
if err != nil {
s.log.WithError(err).Error("could not create key pair")
s.log.WithError(err).Error("could not get TLS config")
panic(err)
}
s.initAutostart()
s.grpcServer = grpc.NewServer(grpc.Creds(credentials.NewTLS(&tls.Config{
Certificates: []tls.Certificate{cert},
MinVersion: tls.VersionTLS13,
})))
s.grpcServer = grpc.NewServer(grpc.Creds(credentials.NewTLS(config)))
RegisterBridgeServer(s.grpcServer, &s)