Merge pull request #571 from coperni:master

PiperOrigin-RevId: 767561821

Author: copybara-github

fleetspeak/src/config/client/config.go

@@ -25,6 +25,7 @@ func WriteLinuxConfig(cfg *cpb.Config, trustedPEM []byte) error {
 				StateFile:              "/var/lib/misc/fleetspeak-client.state",
 			}},
 		Streaming: !cfg.ComponentsConfig.HttpsConfig.DisableStreaming,
+		Proxy:     cfg.GetProxy(),
 	}
 
 	b, err := prototext.Marshal(out)
@@ -54,6 +55,7 @@ func WriteDarwinConfig(cfg *cpb.Config, trustedPEM []byte) error {
 				StateFile:              "/etc/fleetspeak-client/state",
 			}},
 		Streaming: !cfg.ComponentsConfig.HttpsConfig.DisableStreaming,
+		Proxy:     cfg.GetProxy(),
 	}
 
 	b, err := prototext.Marshal(out)
@@ -82,6 +84,7 @@ func WriteWindowsConfig(cfg *cpb.Config, trustedPEM []byte) error {
 				ConfigurationKey: `HKEY_LOCAL_MACHINE\SOFTWARE\FleetspeakClient`,
 			}},
 		Streaming: !cfg.ComponentsConfig.HttpsConfig.DisableStreaming,
+		Proxy:     cfg.GetProxy(),
 	}
 
 	b, err := prototext.Marshal(out)

fleetspeak/src/config/proto/fleetspeak_config/config.pb.go

@@ -70,4 +70,9 @@ message Config {
 
   // If set, used for SNI server name and client-side certificate validation.
   string server_name = 12;
+
+  // If provided, proxy used for connecting to the server.
+  // The format is a URL.
+  // See https://golang.org/pkg/net/http/#Transport.Proxy for details.
+  string proxy = 13;
 }