Escape quotes when opening URL for webauthentication

Fixes #117
dotMorten · Oct 11, 2023 · 9c744d7 · 9c744d7
1 parent 66aa5fa
commit 9c744d7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -17,8 +17,8 @@
     <Authors>Morten Nielsen - https://xaml.dev</Authors>
     <Company>Morten Nielsen - https://xaml.dev</Company>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.3.1</Version>
-    <PackageValidationBaselineVersion>2.3.0</PackageValidationBaselineVersion>
+    <Version>2.3.2</Version>
+    <PackageValidationBaselineVersion>2.3.1</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(PackageId)'!=''">

diff --git a/src/WinUIEx/WebAuthenticator.cs b/src/WinUIEx/WebAuthenticator.cs
@@ -260,7 +260,7 @@ private async Task<WebAuthenticatorResult> Authenticate(Uri authorizeUri, Uri ca
 
             var process = new System.Diagnostics.Process();
             process.StartInfo.FileName = "rundll32.exe";
-            process.StartInfo.Arguments = "url.dll,FileProtocolHandler " + authorizeUri.ToString();
+            process.StartInfo.Arguments = $"url.dll,FileProtocolHandler \"{authorizeUri.ToString().Replace("\"","%22")}\"";
             process.StartInfo.UseShellExecute = true;
             process.Start();
             tasks.Add(taskId, tcs);

diff --git a/src/WinUIEx/WinUIEx.csproj b/src/WinUIEx/WinUIEx.csproj
@@ -24,7 +24,7 @@
     <PackageId>WinUIEx</PackageId>
     <Product>WinUI Extensions</Product>
     <PackageReleaseNotes>
-      - Added analyzers for some non-functional APIs
+      - Fixed WebAuthenticator issue not working with FireFox (#117)
     </PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/src/WinUIExSample/MockOAuthServer.cs b/src/WinUIExSample/MockOAuthServer.cs
@@ -92,7 +92,13 @@ private async void WebServer()
                             {
                                 writer.WriteLine($"<input type=\"hidden\" name=\"{key}\" value=\"{context.Request.QueryString[key].Replace("\"", "&quot;")}\" />");
                             }
-                            writer.WriteLine("</form></div></body></html>");
+                            writer.WriteLine("</form></div>");
+                            writer.WriteLine("<hr/><b>Values sent:</b><br/>");
+                                foreach(var key in context.Request.QueryString.AllKeys)
+                            {
+                                writer.WriteLine($"&nbsp;&nbsp;&nbsp;{key}: = {context.Request.QueryString[key]}<br/>");
+                            }
+                            writer.WriteLine("</body></html>");
                         }
                     }
                 }