HTTP CONNECT proxy support (#318)

Author: adeal

src/Temporalio/Bridge/Interop/Interop.cs

@@ -141,6 +141,18 @@ internal partial struct ClientKeepAliveOptions
         public ulong timeout_millis;
     }
 
+    internal partial struct ClientHttpConnectProxyOptions
+    {
+        [NativeTypeName("struct ByteArrayRef")]
+        public ByteArrayRef target_host;
+
+        [NativeTypeName("struct ByteArrayRef")]
+        public ByteArrayRef username;
+
+        [NativeTypeName("struct ByteArrayRef")]
+        public ByteArrayRef password;
+    }
+
     internal unsafe partial struct ClientOptions
     {
         [NativeTypeName("struct ByteArrayRef")]
@@ -169,6 +181,9 @@ internal unsafe partial struct ClientOptions
 
         [NativeTypeName("const struct ClientKeepAliveOptions *")]
         public ClientKeepAliveOptions* keep_alive_options;
+
+        [NativeTypeName("const struct ClientHttpConnectProxyOptions *")]
+        public ClientHttpConnectProxyOptions* http_connect_proxy_options;
     }
 
     internal unsafe partial struct ByteArray
@@ -546,7 +561,7 @@ internal unsafe partial struct SlotSupplier
     {
         public SlotSupplier_Tag tag;
 
-        [NativeTypeName("__AnonymousRecord_temporal-sdk-bridge_L380_C3")]
+        [NativeTypeName("__AnonymousRecord_temporal-sdk-bridge_L387_C3")]
         public _Anonymous_e__Union Anonymous;
 
         internal ref FixedSizeSlotSupplier fixed_size
@@ -575,11 +590,11 @@ internal ref ResourceBasedSlotSupplier resource_based
         internal unsafe partial struct _Anonymous_e__Union
         {
             [FieldOffset(0)]
-            [NativeTypeName("__AnonymousRecord_temporal-sdk-bridge_L381_C5")]
+            [NativeTypeName("__AnonymousRecord_temporal-sdk-bridge_L388_C5")]
             public _Anonymous1_e__Struct Anonymous1;
 
             [FieldOffset(0)]
-            [NativeTypeName("__AnonymousRecord_temporal-sdk-bridge_L384_C5")]
+            [NativeTypeName("__AnonymousRecord_temporal-sdk-bridge_L391_C5")]
             public _Anonymous2_e__Struct Anonymous2;
 
             internal partial struct _Anonymous1_e__Struct

src/Temporalio/Bridge/OptionsExtensions.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using Temporalio.Bridge.Interop;
 using Temporalio.Exceptions;
 
 namespace Temporalio.Bridge
@@ -245,6 +246,10 @@ public static unsafe Interop.ClientOptions ToInteropOptions(
                     options.KeepAlive == null
                         ? null
                         : scope.Pointer(options.KeepAlive.ToInteropOptions()),
+                http_connect_proxy_options =
+                    options.HttpConnectProxy == null
+                        ? null
+                        : scope.Pointer(options.HttpConnectProxy.ToInteropOptions(scope)),
             };
         }
 
@@ -310,6 +315,29 @@ public static Interop.ClientKeepAliveOptions ToInteropOptions(
                 timeout_millis = (ulong)options.Timeout.TotalMilliseconds,
             };
 
+        /// <summary>
+        /// Convert http connect proxy options.
+        /// </summary>
+        /// <param name="options">Options to convert.</param>
+        /// <param name="scope">Scope to use.</param>
+        /// <returns>Converted options.</returns>
+        public static Interop.ClientHttpConnectProxyOptions ToInteropOptions(
+            this Temporalio.Client.HttpConnectProxyOptions options,
+            Scope scope)
+        {
+            if (string.IsNullOrEmpty(options.TargetHost))
+            {
+                throw new ArgumentException("TargetHost is required");
+            }
+
+            return new ClientHttpConnectProxyOptions
+            {
+                target_host = scope.ByteArray(options.TargetHost),
+                username = scope.ByteArray(options.BasicAuth?.Username),
+                password = scope.ByteArray(options.BasicAuth?.Username),
+            };
+        }
+
         /// <summary>
         /// Convert start local options options.
         /// </summary>

src/Temporalio/Bridge/include/temporal-sdk-bridge.h

@@ -96,6 +96,12 @@ typedef struct ClientKeepAliveOptions {
   uint64_t timeout_millis;
 } ClientKeepAliveOptions;
 
+typedef struct ClientHttpConnectProxyOptions {
+  struct ByteArrayRef target_host;
+  struct ByteArrayRef username;
+  struct ByteArrayRef password;
+} ClientHttpConnectProxyOptions;
+
 typedef struct ClientOptions {
   struct ByteArrayRef target_url;
   struct ByteArrayRef client_name;
@@ -106,6 +112,7 @@ typedef struct ClientOptions {
   const struct ClientTlsOptions *tls_options;
   const struct ClientRetryOptions *retry_options;
   const struct ClientKeepAliveOptions *keep_alive_options;
+  const struct ClientHttpConnectProxyOptions *http_connect_proxy_options;
 } ClientOptions;
 
 typedef struct ByteArray {

src/Temporalio/Bridge/src/client.rs

@@ -9,7 +9,7 @@ use std::str::FromStr;
 use std::time::Duration;
 use temporal_client::{
     ClientKeepAliveConfig, ClientOptions as CoreClientOptions, ClientOptionsBuilder,
-    ClientTlsConfig, CloudService, ConfiguredClient, HealthService, OperatorService, RetryClient,
+    ClientTlsConfig, CloudService, ConfiguredClient, HealthService, HttpConnectProxyOptions, OperatorService, RetryClient,
     RetryConfig, TemporalServiceClientWithMetrics, TestService, TlsConfig, WorkflowService,
 };
 use tonic::metadata::MetadataKey;
@@ -26,6 +26,7 @@ pub struct ClientOptions {
     tls_options: *const ClientTlsOptions,
     retry_options: *const ClientRetryOptions,
     keep_alive_options: *const ClientKeepAliveOptions,
+    http_connect_proxy_options: *const ClientHttpConnectProxyOptions,
 }
 
 #[repr(C)]
@@ -52,6 +53,13 @@ pub struct ClientKeepAliveOptions {
     pub timeout_millis: u64,
 }
 
+#[repr(C)]
+pub struct ClientHttpConnectProxyOptions {
+    pub target_host: ByteArrayRef,
+    pub username: ByteArrayRef,
+    pub password: ByteArrayRef,
+}
+
 type CoreClient = RetryClient<ConfiguredClient<TemporalServiceClientWithMetrics>>;
 
 pub struct Client {
@@ -576,3 +584,16 @@ impl From<&ClientKeepAliveOptions> for ClientKeepAliveConfig {
         }
     }
 }
+
+impl From<&ClientHttpConnectProxyOptions> for HttpConnectProxyOptions {
+    fn from(opts: &ClientHttpConnectProxyOptions) -> Self {
+        HttpConnectProxyOptions {
+            target_addr: opts.target_host.to_string(),
+            basic_auth: if opts.username.size != 0 && opts.password.size != 0 {
+                Some((opts.username.to_string(), opts.password.to_string()))
+            } else {
+                None
+            },
+        }
+    }
+}

src/Temporalio/Client/HttpConnectProxyOptions.cs

@@ -0,0 +1,45 @@
+using System;
+
+namespace Temporalio.Client
+{
+    /// <summary>
+    /// HTTP connect proxy options for Temporal connections.
+    /// </summary>
+    public class HttpConnectProxyOptions : ICloneable
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpConnectProxyOptions"/> class.
+        /// </summary>
+        /// <remarks>
+        /// <see cref="TargetHost"/> must be set.
+        /// </remarks>
+        public HttpConnectProxyOptions()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpConnectProxyOptions"/> class.
+        /// </summary>
+        /// <param name="targetHost">A 'host:port' string representing the target to proxy through.</param>
+        public HttpConnectProxyOptions(string targetHost) => TargetHost = targetHost;
+
+        /// <summary>
+        /// Gets or sets the target host to proxy through as a host:port string.
+        /// </summary>
+        /// <remarks>
+        /// This is required for all proxy options.
+        /// </remarks>
+        public string? TargetHost { get; set; }
+
+        /// <summary>
+        /// Gets or sets HTTP basic auth for the proxy.
+        /// </summary>
+        public (string Username, string Password)? BasicAuth { get; set; }
+
+        /// <summary>
+        /// Create a shallow copy of these options.
+        /// </summary>
+        /// <returns>A shallow copy of these options.</returns>
+        public virtual object Clone() => MemberwiseClone();
+    }
+}

src/Temporalio/Client/TemporalConnectionOptions.cs

@@ -59,6 +59,11 @@ public TemporalConnectionOptions()
         /// </remarks>
         public KeepAliveOptions? KeepAlive { get; set; } = new();
 
+        /// <summary>
+        /// Gets or sets HTTP connect proxy options for this connection.
+        /// </summary>
+        public HttpConnectProxyOptions? HttpConnectProxy { get; set; }
+
         /// <summary>
         /// Gets or sets the gRPC metadata for all calls (i.e. the headers).
         /// </summary>