Https scheme fix, merging #12790 (#13606)

* HTTPS by default, HTTP only if specified * Added/Updated unit tests;Added FTPS * Added confirmation to system messages such as shutdown, reboot, and lock * Corrected Typo * Added confirmation to system messages such as shutdown, reboot, and lock * Corrected Typo * Made changes requested by @mykhailopylyp * Further changes per review by mykhailopylyp * Fixes per code review * Changes per Mykhailopylyp * Fix all schemes being replaced with HTTPS Added new tests * Merging conflicts * Add ftp to fix spell-check * Fix unit tests Co-authored-by: chrisharris333 <60838650+chrisharris333@users.noreply.github.com> Co-authored-by: Chris Harris <chris.harris@mytinycloud.com>
microsoft · Oct 4, 2021 · 7daf35d · 7daf35d
1 parent 9d3c5e5
commit 7daf35d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
@@ -669,6 +669,7 @@ FRAMEDOWNLOAD
 franky
 Froml
 fstream
+ftp
 ftps
 FTYPE
 FULLNAME

diff --git a/...dules/launcher/Plugins/Microsoft.Plugin.Uri.UnitTests/UriHelper/ExtendedUriParserTests.cs b/...dules/launcher/Plugins/Microsoft.Plugin.Uri.UnitTests/UriHelper/ExtendedUriParserTests.cs
@@ -52,6 +52,10 @@ public class ExtendedUriParserTests
         [DataRow("http://[2001:0DB8::1]", true, "http://[2001:db8::1]/")]
         [DataRow("[2001:0DB8::1]:80", true, "https://[2001:db8::1]/")]
         [DataRow("http://[2001:0DB8::1]:80", true, "http://[2001:db8::1]/")]
+        [DataRow("mailto:example@mail.com", true, "mailto:example@mail.com")]
+        [DataRow("tel:411", true, "tel:411")]
+        [DataRow("ftp://example.com", true, "ftp://example.com/")]
+
         public void TryParseCanParseHostName(string query, bool expectedSuccess, string expectedResult)
         {
             // Arrange

diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/UriHelper/ExtendedUriParser.cs b/src/modules/launcher/Plugins/Microsoft.Plugin.Uri/UriHelper/ExtendedUriParser.cs
@@ -35,8 +35,17 @@ public bool TryParse(string input, out System.Uri result)
                 var hadDefaultPort = urlBuilder.Uri.IsDefaultPort;
                 urlBuilder.Port = hadDefaultPort ? -1 : urlBuilder.Port;
 
-                if (!input.Contains("HTTP://", StringComparison.OrdinalIgnoreCase) &&
-                    !input.Contains("FTPS://", StringComparison.OrdinalIgnoreCase))
+                if (input.Contains("HTTP://", StringComparison.OrdinalIgnoreCase))
+                {
+                    urlBuilder.Scheme = System.Uri.UriSchemeHttp;
+                }
+                else if (input.Contains(":", StringComparison.OrdinalIgnoreCase) &&
+                        !input.Contains("http", StringComparison.OrdinalIgnoreCase) &&
+                        !input.Contains("[", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Do nothing, leave unchanged
+                }
+                else
                 {
                     urlBuilder.Scheme = System.Uri.UriSchemeHttps;
                 }

diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Main.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.