blank useragent bug

gfody · Mar 14, 2018 · b8f3f0f · b8f3f0f
1 parent aa47171
commit b8f3f0f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/App/App.config b/App/App.config
@@ -21,7 +21,7 @@
     <!-- accept relays (required for the webclient) -->
     <add key="acceptRelays" value="true"/>
 
-    <!-- set to false to shutdown when the last relay is finished or canceled -->
+    <!-- set to false to shutdown when the last relay is finished or canceled (only applicable to the tray app) -->
     <add key="stayOpen" value="true"/>
 
     <!-- max concurrent connections for listener -->

diff --git a/Server/RelayServer.cs b/Server/RelayServer.cs
@@ -131,7 +131,7 @@ private async Task ProcessRequestAsync(HttpContextBase context)
 			{
 				if (validCode)
 				{
-					if (activeRelays.TryGetValue(code, out IRelay relay) && !botAgents.IsMatch(context.Request.UserAgent))
+					if (activeRelays.TryGetValue(code, out IRelay relay) && !botAgents.IsMatch(context.Request.UserAgent ?? ""))
 						await relay.HandleDownloadRequest(context);
 					else
 						context.Response.StatusCode = 410;

diff --git a/Tests/TestTransfers.cs b/Tests/TestTransfers.cs
@@ -55,7 +55,11 @@ private void LocalDownload(int size, bool pipe = false)
 			var code = server.AddRelay(new LocalRelay(stream));
 
 			using (var client = new WebClient())
-				CollectionAssert.AreEqual(data, client.DownloadData(downloadUrl + code));
+			{
+				var downloaded = client.DownloadData(downloadUrl + code);
+				if (listen.IsFaulted) throw listen.Exception.InnerException;
+				CollectionAssert.AreEqual(data, downloaded);
+			}
 		}
 
 		private void SocketDownload(int size, bool pipe = false)
@@ -66,7 +70,11 @@ private void SocketDownload(int size, bool pipe = false)
 			var code = socket.AddRelay(websocketUrl, stream).Result;
 
 			using (var client = new WebClient())
-				CollectionAssert.AreEqual(data, client.DownloadData(downloadUrl + code));
+			{
+				var downloaded = client.DownloadData(downloadUrl + code);
+				if (listen.IsFaulted) throw listen.Exception.InnerException;
+				CollectionAssert.AreEqual(data, downloaded);
+			}
 		}
 
 		[TestMethod] public void Local_Empty() => LocalDownload(0);