Force proxy to replace default value in .vv file

Corsinvest · Nov 19, 2020 · 01fc6b3 · 01fc6b3
1 parent a08c9d7
commit 01fc6b3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ Options:
   --proxy           SPICE proxy server. This can be used by the client to specify the proxy server.
                     All nodes in a cluster runs 'spiceproxy', so it is up to the client to choose one.
                     By default, we return the node where the VM is currently running.
+                    If specify http://[host]:[port] then replace proxy option in file .vv. E.g. for reverse proxy.
   --viewer          Executable SPICE client remote viewer
 
 Commands:

diff --git a/src/Corsinvest.ProxmoxVE.Pepper/Corsinvest.ProxmoxVE.Pepper.csproj b/src/Corsinvest.ProxmoxVE.Pepper/Corsinvest.ProxmoxVE.Pepper.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <Version>1.3.8</Version>
+    <Version>1.3.9</Version>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>cv4pve-pepper</AssemblyName>
     <Company>Corsinvest Srl</Company>

diff --git a/src/Corsinvest.ProxmoxVE.Pepper/Program.cs b/src/Corsinvest.ProxmoxVE.Pepper/Program.cs
@@ -31,7 +31,8 @@ static int Main(string[] args)
             var optProxy = app.Option("--proxy",
                                       @"SPICE proxy server. This can be used by the client to specify the proxy server." +
                                       " All nodes in a cluster runs 'spiceproxy', so it is up to the client to choose one." +
-                                      " By default, we return the node where the VM is currently running.",
+                                      " By default, we return the node where the VM is currently running." +
+                                      " If specify http://[host]:[port] then replace proxy option in file .vv. E.g. for reverse proxy.",
                                       CommandOptionType.SingleValue);
 
             var optRemoteViewer = app.Option("--viewer",
@@ -43,13 +44,36 @@ static int Main(string[] args)
             app.OnExecute(() =>
             {
                 var client = app.ClientTryLogin();
-                var content = client.GetVM(optVmId.Value())
-                                    .GetSpiceFileVV(optProxy.HasValue() ? optProxy.Value() : null);
 
+                var proxy = optProxy.HasValue() ? optProxy.Value() : null;
+                var proxyForce = (proxy + "").ToLower().StartsWith("http://");
+
+                var content = client.GetVM(optVmId.Value()).GetSpiceFileVV(proxyForce ? null : proxy);
                 var ret = client.LastResult.IsSuccessStatusCode;
 
                 if (ret)
                 {
+                    //proxy force
+                    if (proxyForce)
+                    {
+                        var lines = content.Split("\n");
+                        for (int i = 0; i < lines.Length; i++)
+                        {
+                            if (lines[i].StartsWith("proxy="))
+                            {
+                                lines[i] = $"proxy={proxy}";
+                                break;
+                            }
+                        }
+                        content = string.Join("\n", lines);
+
+                        if (app.DebugIsActive())
+                        {
+                            app.Out.WriteLine($"Replace Proxy: {proxy}");
+                            app.Out.WriteLine(content);
+                        }
+                    }
+
                     var fileName = Path.GetTempFileName().Replace(".tmp", ".vv");
                     File.WriteAllText(fileName, content);
                     var startInfo = new ProcessStartInfo