add support for Flashpoint Proxy preferences

Author: tomysshadow

FlashpointSecurePlayer/FlashpointProxy.cs

@@ -15,6 +15,12 @@ public static class FlashpointProxy {
 
         private const uint INTERNET_OPEN_TYPE_DIRECT = 1;
 
+        private const bool FP_PROXY_DEFAULT = true;
+        private const int FP_PROXY_PORT_DEFAULT = 22500;
+
+        private const string FP_PROXY = nameof(FP_PROXY);
+        private const string FP_PROXY_PORT = nameof(FP_PROXY_PORT);
+
         [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Ansi)]
         private static extern IntPtr InternetOpen(string lpszAgent, uint dwAccessType, IntPtr lpszProxy, IntPtr lpszProxyBypass, uint dwFlags);
 
@@ -129,8 +135,71 @@ private static void GetSystemProxy(ref INTERNET_PER_CONN_OPTION_LIST internetPer
                 throw;
             }
         }
-        
-        public static void Enable(string proxyServer) {
+
+        public static void GetPreferences(out bool proxy, out int port) {
+            FlashpointSecurePlayerSection.FlashpointProxyElement flashpointProxyElement = null;
+
+            try {
+                FlashpointSecurePlayerSection flashpointSecurePlayerSection = GetFlashpointSecurePlayerSection(false, ACTIVE_EXE_CONFIGURATION_NAME);
+                flashpointProxyElement = flashpointSecurePlayerSection.FlashpointProxy;
+            } catch {
+                // fail silently
+            }
+
+            bool? proxyFile = null;
+            int? portFile = null;
+
+            if (flashpointProxyElement != null
+                && flashpointProxyElement.ElementInformation.IsPresent) {
+                proxyFile = flashpointProxyElement.Proxy;
+                portFile = flashpointProxyElement.Port;
+            }
+
+            // try getting from the proxy element
+            // if that fails, try from the environment variables
+            // if that fails, use the default
+            if (proxyFile == null) {
+                string proxyEnvironmentVariable = null;
+
+                try {
+                    proxyEnvironmentVariable = Environment.GetEnvironmentVariable(FP_PROXY, EnvironmentVariableTarget.Process);
+                } catch {
+                    // fail silently
+                }
+
+                if (!bool.TryParse(proxyEnvironmentVariable, out proxy)) {
+                    proxy = FP_PROXY_DEFAULT;
+                }
+            } else {
+                proxy = proxyFile.GetValueOrDefault();
+            }
+
+            if (portFile == null) {
+                string portEnvironmentVariable = null;
+
+                try {
+                    portEnvironmentVariable = Environment.GetEnvironmentVariable(FP_PROXY_PORT, EnvironmentVariableTarget.Process);
+                } catch {
+                    // fail silently
+                }
+
+                if (!int.TryParse(portEnvironmentVariable, out port)) {
+                    port = FP_PROXY_PORT_DEFAULT;
+                }
+            } else {
+                port = portFile.GetValueOrDefault();
+            }
+        }
+
+        public static void Enable() {
+            GetPreferences(out bool proxy, out int port);
+
+            if (!proxy) {
+                return;
+            }
+
+            string proxyServer = "http=127.0.0.1:" + port + ";https=127.0.0.1:" + port + ";ftp=127.0.0.1:" + port;
+
             IntPtr internetHandle = InternetOpen(AGENT, INTERNET_OPEN_TYPE_DIRECT, IntPtr.Zero, IntPtr.Zero, 0);
 
             if (internetHandle == IntPtr.Zero) {

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -708,7 +708,7 @@ private async Task ActivateModeAsync(TemplateElement templateElement, ErrorDeleg
 
                             try {
                                 // StartProcessCreateBreakawayFromJob required for Process Sync on Windows 7
-                                StartProcessCreateBreakawayFromJob(softwareProcessStartInfo, out softwareProcess);
+                                softwareProcess = StartProcessCreateBreakawayFromJob(softwareProcessStartInfo);
                             } catch (JobObjectException ex) {
                                 // popup message box and blow up
                                 LogExceptionToLauncher(ex);

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

@@ -33,7 +33,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.3.0")]
-[assembly: AssemblyFileVersion("2.2.3.0")]
+[assembly: AssemblyVersion("2.2.4.0")]
+[assembly: AssemblyFileVersion("2.2.4.0")]
 [assembly: NeutralResourcesLanguage("en")]
 

FlashpointSecurePlayer/Shared.cs

@@ -958,12 +958,32 @@ public enum MODIFICATIONS_REVERT_METHOD {
 
         // there should be only one HTTP Client per application
         // (as of right now though this is exclusively used by DownloadsBefore class)
-        private static readonly HttpClientHandler httpClientHandler = new HttpClientHandler {
-            Proxy = new WebProxy("127.0.0.1", 22500),
-            UseProxy = true
-        };
+        private static HttpClientHandler httpClientHandler = null;
+
+        private static HttpClientHandler HttpClientHandler {
+            get {
+                if (httpClientHandler == null) {
+                    FlashpointProxy.GetPreferences(out bool proxy, out int port);
+
+                    httpClientHandler = new HttpClientHandler {
+                        Proxy = proxy ? new WebProxy("127.0.0.1", port) : null,
+                        UseProxy = proxy
+                    };
+                }
+                return httpClientHandler;
+            }
+        }
+
+        private static HttpClient httpClient = null;
 
-        public static readonly HttpClient httpClient = new HttpClient(httpClientHandler);
+        public static HttpClient HttpClient {
+            get {
+                if (httpClient == null) {
+                    httpClient = new HttpClient(HttpClientHandler);
+                }
+                return httpClient;
+            }
+        }
 
         // no parallel downloads
         // if parallel downloads are ever supported, the max value should
@@ -1264,7 +1284,7 @@ public ModeElement Mode {
                             if (String.IsNullOrEmpty(Name) || _mode == null) {
                                 return null;
                             }
-                            return base[_mode] as ModeElement;
+                            return (ModeElement)base[_mode];
                         }
 
                         set {
@@ -1400,7 +1420,7 @@ protected override ConfigurationPropertyCollection Properties {
                             }
 
                             protected override object GetElementKey(ConfigurationElement configurationElement) {
-                                EnvironmentVariablesElement environmentVariablesElement = configurationElement as EnvironmentVariablesElement;
+                                EnvironmentVariablesElement environmentVariablesElement = (EnvironmentVariablesElement)configurationElement;
                                 return environmentVariablesElement._Key;
                             }
 
@@ -1444,7 +1464,7 @@ public string Name {
                             }
 
                             protected override object GetElementKey(ConfigurationElement configurationElement) {
-                                DownloadBeforeElement downloadBeforeElement = configurationElement as DownloadBeforeElement;
+                                DownloadBeforeElement downloadBeforeElement = (DownloadBeforeElement)configurationElement;
                                 return downloadBeforeElement.Name;
                             }
 
@@ -1653,7 +1673,7 @@ protected override ConfigurationPropertyCollection Properties {
                             }
 
                             protected override object GetElementKey(ConfigurationElement configurationElement) {
-                                RegistryStateElement registryStateElement = configurationElement as RegistryStateElement;
+                                RegistryStateElement registryStateElement = (RegistryStateElement)configurationElement;
                                 return registryStateElement.Name;
                             }
 
@@ -1848,10 +1868,10 @@ public OldCPUSimulatorElement OldCPUSimulator {
                             }
                         }
                     }
-                    
+
                     public ModificationsElement Modifications {
                         get {
-                            return base[_modifications] as ModificationsElement;
+                            return (ModificationsElement)base[_modifications];
                         }
 
                         set {
@@ -1867,7 +1887,7 @@ protected override ConfigurationPropertyCollection Properties {
                 }
 
                 protected override object GetElementKey(ConfigurationElement configurationElement) {
-                    TemplateElement templateElement = configurationElement as TemplateElement;
+                    TemplateElement templateElement = (TemplateElement)configurationElement;
                     return templateElement.Name;
                 }
 
@@ -1884,6 +1904,22 @@ public override void Remove(string name) {
                 }
             }
 
+            public class FlashpointProxyElement : ConfigurationElement {
+                [ConfigurationProperty("proxy", IsRequired = false)]
+                public bool? Proxy {
+                    get {
+                        return base["proxy"] as bool?;
+                    }
+                }
+
+                [ConfigurationProperty("port", IsRequired = false)]
+                public int? Port {
+                    get {
+                        return base["port"] as int?;
+                    }
+                }
+            }
+
             [ConfigurationProperty("templates", IsDefaultCollection = true, IsRequired = true)]
             [ConfigurationCollection(typeof(TemplatesElementCollection), AddItemName = "template")]
             public TemplatesElementCollection Templates {
@@ -1895,6 +1931,13 @@ public TemplatesElementCollection Templates {
                     base["templates"] = value;
                 }
             }
+
+            [ConfigurationProperty("flashpointProxy", IsDefaultCollection = false, IsRequired = false)]
+            public FlashpointProxyElement FlashpointProxy {
+                get {
+                    return (FlashpointProxyElement)base["flashpointProxy"];
+                }
+            }
         }
 
         public const string ACTIVE_EXE_CONFIGURATION_NAME = "";
@@ -2227,7 +2270,7 @@ public static async Task<Uri> DownloadAsync(string name) {
             await downloadSemaphoreSlim.WaitAsync().ConfigureAwait(true);
 
             try {
-                using (HttpResponseMessage httpResponseMessage = await httpClient.GetAsync(name, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(true)) {
+                using (HttpResponseMessage httpResponseMessage = await HttpClient.GetAsync(name, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(true)) {
                     if (!httpResponseMessage.IsSuccessStatusCode) {
                         throw new Exceptions.DownloadFailedException("The HTTP Response Message failed with a Status Code of \"" + httpResponseMessage.StatusCode + "\".");
                     }
@@ -2510,8 +2553,11 @@ public static async Task DownloadFlashpointSecurePlayerSectionAsync(string name)
         public static FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement GetTemplateElement(bool createTemplateElement, string exeConfigurationName) {
             // need the section to operate on
             FlashpointSecurePlayerSection flashpointSecurePlayerSection = GetFlashpointSecurePlayerSection(createTemplateElement, exeConfigurationName);
+            
             // get the element
-            FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement templateElement = flashpointSecurePlayerSection.Templates.Get(exeConfigurationName) as FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement;
+            FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement templateElement
+                = flashpointSecurePlayerSection.Templates.Get(exeConfigurationName)
+                as FlashpointSecurePlayerSection.TemplatesElementCollection.TemplateElement;
 
             // create it if it doesn't exist...
             if (createTemplateElement && templateElement == null) {
@@ -2614,9 +2660,9 @@ public static StringBuilder GetCreateProcessCommandLine(ProcessStartInfo process
             return commandLine;
         }
 
-        public static void StartProcessCreateBreakawayFromJob(ProcessStartInfo processStartInfo, out Process process) {
-            process = null;
-
+        public static Process StartProcessCreateBreakawayFromJob(ProcessStartInfo processStartInfo) {
+            Process process = null;
+            
             if (processStartInfo == null) {
                 throw new ArgumentNullException("The processStartInfo is null.");
             }
@@ -2651,7 +2697,7 @@ public static void StartProcessCreateBreakawayFromJob(ProcessStartInfo processSt
 
             if (!CreateProcess(null, commandLine, IntPtr.Zero, IntPtr.Zero, false, creationFlags, IntPtr.Zero, currentDirectory, ref startupInfo, out processInformation)) {
                 Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
-                return;
+                return process;
             }
 
             try {
@@ -2666,7 +2712,7 @@ public static void StartProcessCreateBreakawayFromJob(ProcessStartInfo processSt
 
                     if (ResumeThread(processInformation.hThread) == -1) {
                         Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
-                        return;
+                        return process;
                     }
                 } catch {
                     process.Kill();
@@ -2683,6 +2729,7 @@ public static void StartProcessCreateBreakawayFromJob(ProcessStartInfo processSt
                     Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
                 }
             }
+            return process;
         }
 
         public static BINARY_TYPE GetLibraryBinaryType(string libFileName) {

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -567,7 +567,7 @@ private void WebBrowserMode_Load(object sender, EventArgs e) {
             }
 
             try {
-                FlashpointProxy.Enable("http=127.0.0.1:22500;https=127.0.0.1:22500;ftp=127.0.0.1:22500");
+                FlashpointProxy.Enable();
             } catch (FlashpointProxyException ex) {
                 // popup message box but allow through anyway
                 LogExceptionToLauncher(ex);