Skip to content

System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 3 commits into from
Aug 14, 2022
Merged

System.Net.WebProxy Bypass regex list optimization #73803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f27b711
System.Net.WebProxy Bypass regex list optimization
Aug 11, 2022
02b0c7a
Cosmetic changes.
Aug 11, 2022
c635195
Address PR feedback
stephentoub Aug 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 105 additions & 24 deletions src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
public partial class WebProxy : IWebProxy, ISerializable
{
private ArrayList? _bypassList;
private ChangeTrackingArrayList? _bypassList;
private Regex[]? _regexBypassList;

public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
this.BypassProxyOnLocal = BypassOnLocal;
if (BypassList != null)
{
_bypassList = new ArrayList(BypassList);
UpdateRegexList(true);
_bypassList = new ChangeTrackingArrayList(BypassList);
UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
}
}

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
get
{
if (_bypassList == null)
{
return Array.Empty<string>();
}

var bypassList = new string[_bypassList.Count];
_bypassList.CopyTo(bypassList);
return bypassList;
}
set
{
_bypassList = value != null ? new ArrayList(value) : null;
UpdateRegexList(true);
_bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
}
}

public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
return proxyUri;
}

private void UpdateRegexList(bool canThrow)
private void UpdateRegexList()
{
Regex[]? regexBypassList = null;
ArrayList? bypassList = _bypassList;
try
if (_bypassList is ChangeTrackingArrayList bypassList)
{
if (bypassList != null && bypassList.Count > 0)
bypassList.IsChanged = false;
if (bypassList.Count > 0)
{
regexBypassList = new Regex[bypassList.Count];
for (int i = 0; i < bypassList.Count; i++)
for (int i = 0; i < regexBypassList.Length; i++)
{
regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
}
}
}
catch
{
if (!canThrow)
{
_regexBypassList = null;
return;
}
throw;
}

// Update field here, as it could throw earlier in the loop
_regexBypassList = regexBypassList;
}

private bool IsMatchInBypassList(Uri input)
{
UpdateRegexList(canThrow: false);
// Update our list of Regex instances if the ArrayList has changed.
if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
{
try
{
UpdateRegexList();
}
catch
{
_regexBypassList = null;
}
}

if (_regexBypassList is Regex[] bypassList)
if (_regexBypassList is Regex[] regexBypassList)
{
bool isDefaultPort = input.IsDefaultPort;
int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
Debug.Assert(formatted);
url = url.Slice(0, charsWritten);

foreach (Regex r in bypassList)
foreach (Regex r in regexBypassList)
{
if (r.IsMatch(url))
{
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
// The .NET Framework here returns a proxy that fetches IE settings and
// executes JavaScript to determine the correct proxy.
throw new PlatformNotSupportedException();

private sealed class ChangeTrackingArrayList : ArrayList
{
public ChangeTrackingArrayList() { }

public ChangeTrackingArrayList(ICollection c) : base(c) { }

public bool IsChanged { get; set; }

// Override the methods that can add, remove, or change the regexes in the bypass list.
// Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
// the collection but that don't change the overall list of regexes (e.g. Sort) do not
// need to be overridden.

public override object? this[int index]
{
get => base[index];
set
{
IsChanged = true;
base[index] = value;
}
}

public override int Add(object? value)
{
IsChanged = true;
return base.Add(value);
}

public override void AddRange(ICollection c)
{
IsChanged = true;
base.AddRange(c);
}

public override void Insert(int index, object? value)
{
IsChanged = true;
base.Insert(index, value);
}

public override void InsertRange(int index, ICollection c)
{
IsChanged = true;
base.InsertRange(index, c);
}

public override void SetRange(int index, ICollection c)
{
IsChanged = true;
base.SetRange(index, c);
}

public override void Remove(object? obj)
{
IsChanged = true;
base.Remove(obj);
}

public override void RemoveAt(int index)
{
IsChanged = true;
base.RemoveAt(index);
}

public override void RemoveRange(int index, int count)
{
IsChanged = true;
base.RemoveRange(index, count);
}

public override void Clear()
{
IsChanged = true;
base.Clear();
}
}
}
}
41 changes: 41 additions & 0 deletions src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
}

[Fact]
public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
{
var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
Assert.False(p.IsBypassed(new Uri("http://bing.com")));

p.BypassArrayList.Add("bing");
Assert.True(p.IsBypassed(new Uri("http://bing.com")));

p.BypassArrayList.Remove("bing");
Assert.False(p.IsBypassed(new Uri("http://bing.com")));

p.BypassArrayList.AddRange(new[] { "dot.net" });
Assert.True(p.IsBypassed(new Uri("http://dot.net")));

p.BypassArrayList.InsertRange(0, new[] { "bing" });
Assert.True(p.IsBypassed(new Uri("http://bing.com")));

p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
Assert.True(p.IsBypassed(new Uri("http://example.com")));
Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
Assert.False(p.IsBypassed(new Uri("http://bing.com")));
Assert.False(p.IsBypassed(new Uri("http://dot.net")));

p.BypassArrayList.Clear();
Assert.False(p.IsBypassed(new Uri("http://example.com")));
Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

p.BypassArrayList.Insert(0, "bing");
p.BypassArrayList.Insert(1, "example");
Assert.True(p.IsBypassed(new Uri("http://bing.com")));
Assert.True(p.IsBypassed(new Uri("http://example.com")));

p.BypassArrayList.RemoveAt(0);
Assert.False(p.IsBypassed(new Uri("http://bing.com")));
Assert.True(p.IsBypassed(new Uri("http://example.com")));

p.BypassArrayList.RemoveRange(0, 1);
Assert.False(p.IsBypassed(new Uri("http://example.com")));
}

[Fact]
public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
{
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
System.Net.WebProxy Bypass regex list optimization by onehourlate · Pull Request #73803 · dotnet/runtime · GitHub
Skip to content
System.Net.WebProxy Bypass regex list optimization#73803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

stephentoub
merged 3 commits into

from

Aug 14, 2022
 Merged


System.Net.WebProxy Bypass regex list optimization
#73803
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f27b711

System.Net.WebProxy Bypass regex list optimization

Aug 11, 2022
02b0c7a

Cosmetic changes.

Aug 11, 2022
c635195

Address PR feedback


stephentoub Aug 14, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


129 changes: 105 additions & 24 deletions
src/libraries/System.Net.WebProxy/src/System/Net/WebProxy.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ namespace System.Net
{
 public partial class WebProxy : IWebProxy, ISerializable
 {
 private ArrayList? _bypassList;
 private ChangeTrackingArrayList? _bypassList;
 private Regex[]? _regexBypassList;

 public WebProxy() : this((Uri?)null, false, null, null) { }
Expand All@@ -31,8 +31,8 @@ public WebProxy(Uri? Address, bool BypassOnLocal, [StringSyntax(StringSyntaxAttr
 this.BypassProxyOnLocal = BypassOnLocal;
 if (BypassList != null)
 {
 _bypassList = new ArrayList(BypassList);
 UpdateRegexList(true);
 _bypassList = new ChangeTrackingArrayList(BypassList);
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

Expand DownExpand Up@@ -71,20 +71,22 @@ public string[] BypassList
 get
 {
 if (_bypassList == null)
 {
 return Array.Empty<string>();
 }

 var bypassList = new string[_bypassList.Count];
 _bypassList.CopyTo(bypassList);
 return bypassList;
 }
 set
 {
 _bypassList = value != null ? new ArrayList(value) : null;
 UpdateRegexList(true);
 _bypassList = value != null ? new ChangeTrackingArrayList(value) : null;
 UpdateRegexList(); // prompt creation of the Regex instances so that any exceptions are propagated
 }
 }

 public ArrayList BypassArrayList => _bypassList ??= new ArrayList();
 public ArrayList BypassArrayList => _bypassList ??= new ChangeTrackingArrayList();

 public ICredentials? Credentials { get; set; }

Expand DownExpand Up@@ -123,40 +125,41 @@ public bool UseDefaultCredentials
 return proxyUri;
 }

 private void UpdateRegexList(bool canThrow)
 private void UpdateRegexList()
 {
 Regex[]? regexBypassList = null;
 ArrayList? bypassList = _bypassList;
 try
 if (_bypassList is ChangeTrackingArrayList bypassList)
 {
 if (bypassList != null && bypassList.Count > 0)
 bypassList.IsChanged = false;
 if (bypassList.Count > 0)
 {
 regexBypassList = new Regex[bypassList.Count];
 for (int i = 0; i < bypassList.Count; i++)
 for (int i = 0; i < regexBypassList.Length; i++)
 {
 regexBypassList[i] = new Regex((string)bypassList[i]!, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
 }
 }
 }
 catch
 {
 if (!canThrow)
 {
 _regexBypassList = null;
 return;
 }
 throw;
 }

 // Update field here, as it could throw earlier in the loop
 _regexBypassList = regexBypassList;
 }

 private bool IsMatchInBypassList(Uri input)
 {
 UpdateRegexList(canThrow: false);
 // Update our list of Regex instances if the ArrayList has changed.
 if (_bypassList is ChangeTrackingArrayList bypassList && bypassList.IsChanged)
 {
 try
 {
 UpdateRegexList();
 }
 catch
 {
 _regexBypassList = null;
 }
 }

 if (_regexBypassList is Regex[] bypassList)
 if (_regexBypassList is Regex[] regexBypassList)
 {
 bool isDefaultPort = input.IsDefaultPort;
 int lengthRequired = input.Scheme.Length + 3 + input.Host.Length;
Expand All@@ -173,7 +176,7 @@ private bool IsMatchInBypassList(Uri input)
 Debug.Assert(formatted);
 url = url.Slice(0, charsWritten);

 foreach (Regex r in bypassList)
 foreach (Regex r in regexBypassList)
 {
 if (r.IsMatch(url))
 {
Expand DownExpand Up@@ -209,5 +212,83 @@ public static WebProxy GetDefaultProxy() =>
 // The .NET Framework here returns a proxy that fetches IE settings and
 // executes JavaScript to determine the correct proxy.
 throw new PlatformNotSupportedException();

 private sealed class ChangeTrackingArrayList : ArrayList
 {
 public ChangeTrackingArrayList() { }

 public ChangeTrackingArrayList(ICollection c) : base(c) { }

 public bool IsChanged { get; set; }

 // Override the methods that can add, remove, or change the regexes in the bypass list.
 // Methods that only read (like CopyTo, BinarySearch, etc.) and methods that reorder
 // the collection but that don't change the overall list of regexes (e.g. Sort) do not
 // need to be overridden.

 public override object? this[int index]
 {
 get => base[index];
 set
 {
 IsChanged = true;
 base[index] = value;
 }
 }

 public override int Add(object? value)
 {
 IsChanged = true;
 return base.Add(value);
 }

 public override void AddRange(ICollection c)
 {
 IsChanged = true;
 base.AddRange(c);
 }

 public override void Insert(int index, object? value)
 {
 IsChanged = true;
 base.Insert(index, value);
 }

 public override void InsertRange(int index, ICollection c)
 {
 IsChanged = true;
 base.InsertRange(index, c);
 }

 public override void SetRange(int index, ICollection c)
 {
 IsChanged = true;
 base.SetRange(index, c);
 }

 public override void Remove(object? obj)
 {
 IsChanged = true;
 base.Remove(obj);
 }

 public override void RemoveAt(int index)
 {
 IsChanged = true;
 base.RemoveAt(index);
 }

 public override void RemoveRange(int index, int count)
 {
 IsChanged = true;
 base.RemoveRange(index, count);
 }

 public override void Clear()
 {
 IsChanged = true;
 base.Clear();
 }
 }
 }
}

41 changes: 41 additions & 0 deletions
src/libraries/System.Net.WebProxy/tests/WebProxyTest.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -132,6 +132,47 @@ public static void WebProxy_InvalidBypassUrl_AddedDirectlyToList_SilentlyEaten()
 p.IsBypassed(new Uri("http://microsoft.com")); // exception should be silently eaten
 }

 [Fact]
 public static void WebProxy_BypassUrl_BypassArrayListChangedDirectly_IsBypassedAsExpected()
 {
 var p = new WebProxy("http://microsoft.com", BypassOnLocal: false);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Add("bing");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.Remove("bing");
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.AddRange(new[] { "dot.net" });
 Assert.True(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.InsertRange(0, new[] { "bing" });
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));

 p.BypassArrayList.SetRange(0, new[] { "example", "microsoft" });
 Assert.True(p.IsBypassed(new Uri("http://example.com")));
 Assert.True(p.IsBypassed(new Uri("http://microsoft.com")));
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.False(p.IsBypassed(new Uri("http://dot.net")));

 p.BypassArrayList.Clear();
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 Assert.False(p.IsBypassed(new Uri("http://microsoft.com")));

 p.BypassArrayList.Insert(0, "bing");
 p.BypassArrayList.Insert(1, "example");
 Assert.True(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveAt(0);
 Assert.False(p.IsBypassed(new Uri("http://bing.com")));
 Assert.True(p.IsBypassed(new Uri("http://example.com")));

 p.BypassArrayList.RemoveRange(0, 1);
 Assert.False(p.IsBypassed(new Uri("http://example.com")));
 }

 [Fact]
 public static void WebProxy_BypassList_DoesntContainUrl_NotBypassed()
 {
Expand Down