Add 'useProxy' setting to gRPC client channel to disable use of proxy…

… for connecting.
iris-connect · Mar 18, 2022 · dbe4263 · dbe4263
1 parent 39f3768
commit dbe4263
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/channels/grpc_client.go b/channels/grpc_client.go
@@ -416,6 +416,11 @@ func (c *GRPCClientChannel) DeliverRequest(request *eps.Request) (*eps.Response,
 	var dialer grpc.Dialer
 
 	if settings.Proxy != "" {
+
+		if !c.Settings.UseProxy {
+			return nil, fmt.Errorf("destination is only reachable via proxy but proxying is disabled")
+		}
+
 		dialer = func(context context.Context, addr string) (net.Conn, error) {
 			eps.Log.Tracef("Dialing to %s through proxy...", address.Operator)
 

diff --git a/grpc/forms.go b/grpc/forms.go
@@ -35,6 +35,13 @@ var AnnouncementForm = forms.Form{
 
 var GRPCClientSettingsForm = forms.Form{
 	Fields: []forms.Field{
+		{
+			Name: "useProxy",
+			Validators: []forms.Validator{
+				forms.IsOptional{Default: true},
+				forms.IsBoolean{},
+			},
+		},
 		{
 			Name: "tls",
 			Validators: []forms.Validator{

diff --git a/grpc/settings.go b/grpc/settings.go
@@ -23,8 +23,9 @@ import (
 
 // Settings for the gRPC client
 type GRPCClientSettings struct {
-	TLS     *tls.TLSSettings `json:"tls"`
-	Enabled bool             `json:"enabled"`
+	TLS      *tls.TLSSettings `json:"tls"`
+	UseProxy bool             `json:"useProxy"`
+	Enabled  bool             `json:"enabled"`
 }
 
 // Settings for the gRPC server