Commit f9c7ba4e authored by justcoding121's avatar justcoding121

remove firefox proxy manager; fix obsolete msg

parent f2a567b4
using System;
using System.IO;
namespace Titanium.Web.Proxy.Helpers
{
/// <summary>
/// A helper class to set proxy settings for firefox
/// </summary>
internal class FireFoxProxySettingsManager
{
/// <summary>
/// Add Firefox settings.
/// </summary>
internal void UseSystemProxy()
{
try
{
var myProfileDirectory =
new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\Mozilla\\Firefox\\Profiles\\")
.GetDirectories("*.default");
string myFfPrefFile = myProfileDirectory[0].FullName + "\\prefs.js";
if (!File.Exists(myFfPrefFile))
{
return;
}
// We have a pref file so let''s make sure it has the proxy setting
var myReader = new StreamReader(myFfPrefFile);
string myPrefContents = myReader.ReadToEnd();
myReader.Close();
for (int i = 0; i <= 4; i++)
{
string searchStr = $"user_pref(\"network.proxy.type\", {i});";
if (myPrefContents.Contains(searchStr))
{
// Add the proxy enable line and write it back to the file
myPrefContents = myPrefContents.Replace(searchStr, "user_pref(\"network.proxy.type\", 5);");
}
}
File.Delete(myFfPrefFile);
File.WriteAllText(myFfPrefFile, myPrefContents);
}
catch (Exception)
{
// Only exception should be a read/write error because the user opened up FireFox so they can be ignored.
}
}
}
}
...@@ -78,7 +78,7 @@ namespace Titanium.Web.Proxy.Models ...@@ -78,7 +78,7 @@ namespace Titanium.Web.Proxy.Models
/// <summary> /// <summary>
/// List of host names to exclude using Regular Expressions. /// List of host names to exclude using Regular Expressions.
/// </summary> /// </summary>
[Obsolete("ExcludedHttpsHostNameRegex is deprecated, please use ExcludeTunnelConnect instead.")] [Obsolete("ExcludedHttpsHostNameRegex is deprecated, please use BeforeTunnelConnect event instead.")]
public IEnumerable<string> ExcludedHttpsHostNameRegex public IEnumerable<string> ExcludedHttpsHostNameRegex
{ {
get { return ExcludedHttpsHostNameRegexList?.Select(x => x.ToString()).ToList(); } get { return ExcludedHttpsHostNameRegexList?.Select(x => x.ToString()).ToList(); }
...@@ -96,7 +96,7 @@ namespace Titanium.Web.Proxy.Models ...@@ -96,7 +96,7 @@ namespace Titanium.Web.Proxy.Models
/// <summary> /// <summary>
/// List of host names to exclude using Regular Expressions. /// List of host names to exclude using Regular Expressions.
/// </summary> /// </summary>
[Obsolete("IncludedHttpsHostNameRegex is deprecated, please use ExcludeTunnelConnect instead.")] [Obsolete("IncludedHttpsHostNameRegex is deprecated, please use BeforeTunnelConnect event instead.")]
public IEnumerable<string> IncludedHttpsHostNameRegex public IEnumerable<string> IncludedHttpsHostNameRegex
{ {
get { return IncludedHttpsHostNameRegexList?.Select(x => x.ToString()).ToList(); } get { return IncludedHttpsHostNameRegexList?.Select(x => x.ToString()).ToList(); }
......
...@@ -51,11 +51,6 @@ namespace Titanium.Web.Proxy ...@@ -51,11 +51,6 @@ namespace Titanium.Web.Proxy
/// </summary> /// </summary>
private SystemProxyManager systemProxySettingsManager { get; } private SystemProxyManager systemProxySettingsManager { get; }
/// <summary>
/// Set firefox to use default system proxy
/// </summary>
private readonly FireFoxProxySettingsManager firefoxProxySettingsManager = new FireFoxProxySettingsManager();
/// <summary> /// <summary>
/// An default exception log func /// An default exception log func
/// </summary> /// </summary>
...@@ -485,8 +480,6 @@ namespace Titanium.Web.Proxy ...@@ -485,8 +480,6 @@ namespace Titanium.Web.Proxy
endPoint.IsSystemHttpsProxy = true; endPoint.IsSystemHttpsProxy = true;
} }
firefoxProxySettingsManager.UseSystemProxy();
string proxyType = null; string proxyType = null;
switch (protocolType) switch (protocolType)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment