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

refactor: set app version when enabling remote tls issue reporting

Browse Source
This commit is contained in:
James Houlahan
2020-04-24 16:00:12 +02:00
committed by Michal Horejsek
parent 0fd5ca3a24
commit e9735c6110
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/config/pmapi_prod.go
View File

@ -44,11 +44,11 @@ func (c *Config) GetRoundTripper(cm *pmapi.ClientManager, listener listener.List
basicDialer := pmapi.NewBasicTLSDialer() basicDialer := pmapi.NewBasicTLSDialer()
// We wrap the TLS dialer in a layer which enforces connections to trusted servers. // We wrap the TLS dialer in a layer which enforces connections to trusted servers.
pinningDialer := pmapi.NewPinningTLSDialer(basicDialer, c.GetAPIConfig().AppVersion) pinningDialer := pmapi.NewPinningTLSDialer(basicDialer)
// We want any pin mismatches to be communicated back to bridge GUI and reported. // We want any pin mismatches to be communicated back to bridge GUI and reported.
pinningDialer.SetTLSIssueNotifier(func() { listener.Emit(events.TLSCertIssue, "") }) pinningDialer.SetTLSIssueNotifier(func() { listener.Emit(events.TLSCertIssue, "") })
pinningDialer.SetRemoteTLSIssueReporting(true) pinningDialer.EnableRemoteTLSIssueReporting(c.GetAPIConfig().AppVersion)
// We wrap the pinning dialer in a layer which adds "alternative routing" feature. // We wrap the pinning dialer in a layer which adds "alternative routing" feature.
proxyDialer := pmapi.NewProxyTLSDialer(pinningDialer, cm) proxyDialer := pmapi.NewProxyTLSDialer(pinningDialer, cm)

14
pkg/pmapi/dialer_pinning.go
View File

@ -33,12 +33,12 @@ type PinningTLSDialer struct {
// pinChecker is used to check TLS keys of connections. // pinChecker is used to check TLS keys of connections.
pinChecker PinChecker pinChecker PinChecker
// appVersion is supplied if there is a TLS mismatch.
appVersion string
// tlsIssueNotifier is used to notify something when there is a TLS issue. // tlsIssueNotifier is used to notify something when there is a TLS issue.
tlsIssueNotifier func() tlsIssueNotifier func()
// appVersion is needed to report TLS mismatches.
appVersion string
// enableRemoteReporting instructs the dialer to report TLS mismatches. // enableRemoteReporting instructs the dialer to report TLS mismatches.
enableRemoteReporting bool enableRemoteReporting bool
@ -49,11 +49,10 @@ type PinningTLSDialer struct {
// NewPinningTLSDialer constructs a new dialer which only returns tcp connections to servers // NewPinningTLSDialer constructs a new dialer which only returns tcp connections to servers
// which present known certificates. // which present known certificates.
// If enabled, it reports any invalid certificates it finds. // If enabled, it reports any invalid certificates it finds.
func NewPinningTLSDialer(dialer TLSDialer, appVersion string) *PinningTLSDialer { func NewPinningTLSDialer(dialer TLSDialer) *PinningTLSDialer {
return &PinningTLSDialer{ return &PinningTLSDialer{
dialer: dialer, dialer: dialer,
pinChecker: NewPinChecker(TrustedAPIPins), pinChecker: NewPinChecker(TrustedAPIPins),
appVersion: appVersion,
log: logrus.WithField("pkg", "pmapi/tls-pinning"), log: logrus.WithField("pkg", "pmapi/tls-pinning"),
} }
} }
@ -62,8 +61,9 @@ func (p *PinningTLSDialer) SetTLSIssueNotifier(notifier func()) {
p.tlsIssueNotifier = notifier p.tlsIssueNotifier = notifier
} }
func (p *PinningTLSDialer) SetRemoteTLSIssueReporting(enabled bool) { func (p *PinningTLSDialer) EnableRemoteTLSIssueReporting(appVersion string) {
p.enableRemoteReporting = enabled p.enableRemoteReporting = true
p.appVersion = appVersion
} }
// DialTLS dials the given network/address, returning an error if the certificates don't match the trusted pins. // DialTLS dials the given network/address, returning an error if the certificates don't match the trusted pins.

2
pkg/pmapi/dialer_pinning_test.go
View File

@ -33,7 +33,7 @@ var testLiveConfig = &ClientConfig{
func createAndSetPinningDialer(cm *ClientManager) (*int, *PinningTLSDialer) { func createAndSetPinningDialer(cm *ClientManager) (*int, *PinningTLSDialer) {
called := 0 called := 0
dialer := NewPinningTLSDialer(NewBasicTLSDialer(), testLiveConfig.AppVersion) dialer := NewPinningTLSDialer(NewBasicTLSDialer())
dialer.SetTLSIssueNotifier(func() { called++ }) dialer.SetTLSIssueNotifier(func() { called++ })
cm.SetRoundTripper(CreateTransportWithDialer(dialer)) cm.SetRoundTripper(CreateTransportWithDialer(dialer))

2
pkg/pmapi/proxy.go
View File

@ -144,7 +144,7 @@ func (p *proxyProvider) canReach(url string) bool {
url = "https://" + url url = "https://" + url
} }
pinningDialer := NewPinningTLSDialer(NewBasicTLSDialer(), "") pinningDialer := NewPinningTLSDialer(NewBasicTLSDialer())
pinger := resty.New(). pinger := resty.New().
SetHostURL(url). SetHostURL(url).