feat(agent-installer): gateway URL override field in dialog

Author: irvingoujAtDevolution

package/AgentWindowsManaged/Actions/CustomActions.cs

@@ -325,6 +325,7 @@ public static ActionResult EnrollAgentTunnel(Session session)
             string enrollmentString = session.Property(AgentProperties.AgentTunnelEnrollmentString)?.Trim() ?? string.Empty;
             string subnetsArg = session.Property(AgentProperties.AgentTunnelAdvertiseSubnets)?.Trim() ?? string.Empty;
             string domainsArg = session.Property(AgentProperties.AgentTunnelAdvertiseDomains)?.Trim() ?? string.Empty;
+            string gatewayUrlArg = session.Property(AgentProperties.AgentTunnelGatewayUrl)?.Trim() ?? string.Empty;
 
             if (enrollmentString.Length == 0)
             {
@@ -342,6 +343,7 @@ public static ActionResult EnrollAgentTunnel(Session session)
                 string exePath = Path.Combine(installDir, Includes.EXECUTABLE_NAME);
 
                 string arguments = $"up --enrollment-string \"{enrollmentString}\"";
+                if (gatewayUrlArg.Length != 0) arguments += $" --gateway \"{gatewayUrlArg}\"";
                 if (subnetsArg.Length != 0) arguments += $" --advertise-subnets \"{subnetsArg}\"";
 
                 string Redact(string s) => s.Replace(enrollmentString, "***");

package/AgentWindowsManaged/Dialogs/AgentTunnelDialog.Designer.cs

@@ -24,6 +24,7 @@ public override bool ToProperties()
         Runtime.Session[AgentProperties.AgentTunnelEnrollmentString] = enrollmentString.Text.Trim();
         Runtime.Session[AgentProperties.AgentTunnelAdvertiseSubnets] = advertiseSubnets.Text.Trim();
         Runtime.Session[AgentProperties.AgentTunnelAdvertiseDomains] = advertiseDomains.Text.Trim();
+        Runtime.Session[AgentProperties.AgentTunnelGatewayUrl] = gatewayUrl.Text.Trim();
 
         return true;
     }
@@ -35,6 +36,7 @@ public override void OnLoad(object sender, EventArgs e)
         enrollmentString.Text = Runtime.Session.Property(AgentProperties.AgentTunnelEnrollmentString);
         advertiseSubnets.Text = Runtime.Session.Property(AgentProperties.AgentTunnelAdvertiseSubnets);
         advertiseDomains.Text = Runtime.Session.Property(AgentProperties.AgentTunnelAdvertiseDomains);
+        gatewayUrl.Text = Runtime.Session.Property(AgentProperties.AgentTunnelGatewayUrl);
 
         base.OnLoad(sender, e);
     }

package/AgentWindowsManaged/Dialogs/AgentTunnelDialog.cs

@@ -17,7 +17,7 @@ internal partial class AgentProperties
         public static string InstallDir = "INSTALLDIR";
 
         /// <summary>
-        /// Agent tunnel enrollment string (dgw-enroll:v1:...)
+        /// Agent tunnel enrollment string (DVLS-signed JWT verbatim)
         /// </summary>
         public static string AgentTunnelEnrollmentString = "AGENT_TUNNEL_ENROLLMENT_STRING";
 
@@ -31,6 +31,13 @@ internal partial class AgentProperties
         /// </summary>
         public static string AgentTunnelAdvertiseDomains = "AGENT_TUNNEL_ADVERTISE_DOMAINS";
 
+        /// <summary>
+        /// Optional gateway URL override. When set, the agent uses this URL instead of the JWT's
+        /// jet_gw_url claim. Useful when the JWT was minted with a URL that isn't reachable from
+        /// the agent's network (e.g. DVLS embedded "localhost" but the agent is remote).
+        /// </summary>
+        public static string AgentTunnelGatewayUrl = "AGENT_TUNNEL_GATEWAY_URL";
+
         public AgentProperties(ISession runtimeSession)
         {
             this.runtimeSession = runtimeSession;

package/AgentWindowsManaged/Properties/AgentProperties.cs

@@ -67,4 +67,6 @@ If it appears minimized then active it from the taskbar.</String>
                 <String Id="AgentTunnelDlgSubnetsHint">Comma-separated CIDR notation, e.g. 10.10.0.0/24, 192.168.1.0/24. Leave blank for auto-detection.</String>
                 <String Id="AgentTunnelDlgDomainsLabel">Advertise Domains:</String>
                 <String Id="AgentTunnelDlgDomainsHint">Comma-separated DNS suffixes the agent can resolve, e.g. corp.example.com, lab.example.com. Leave blank to skip.</String>
+                <String Id="AgentTunnelDlgGatewayUrlLabel">Gateway URL (advanced, optional):</String>
+                <String Id="AgentTunnelDlgGatewayUrlHint">Override the URL embedded in the enrollment JWT. Leave blank to use the JWT's value.</String>
                     </WixLocalization>

package/AgentWindowsManaged/Resources/DevolutionsAgent_en-us.wxl

@@ -12,6 +12,8 @@
                 <String Id="AgentTunnelDlgSubnetsHint">Notation CIDR séparée par des virgules, p. ex. 10.10.0.0/24, 192.168.1.0/24. Laissez vide pour la détection automatique.</String>
                 <String Id="AgentTunnelDlgDomainsLabel">Domaines annoncés :</String>
                 <String Id="AgentTunnelDlgDomainsHint">Suffixes DNS séparés par des virgules que l'agent peut résoudre, p. ex. corp.example.com, lab.example.com. Laissez vide pour ignorer.</String>
+                <String Id="AgentTunnelDlgGatewayUrlLabel">URL de la passerelle (avancé, facultatif) :</String>
+                <String Id="AgentTunnelDlgGatewayUrlHint">Remplace l'URL incluse dans le JWT d'enrôlement. Laissez vide pour utiliser la valeur du JWT.</String>
                 <String Id="Language">1036</String>
                 <String Id="ProductDescription">Service à l’échelle du système pour étendre les fonctionnalités de Devolutions Gateway.</String>
                 <String Id="VendorFullName">Devolutions Inc.</String>