- Use username/password from Url

KoalaBear84 · Oct 30, 2021 · 5f08d02 · 5f08d02
1 parent 54ab07b
commit 5f08d02
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/OpenDirectoryDownloader/Library.cs b/src/OpenDirectoryDownloader/Library.cs
@@ -341,5 +341,22 @@ public static Stream GetEmbeddedResourceStream(Assembly assembly, string resourc
 
             return null;
         }
+
+        public static bool GetUriCredentials(Uri uri, out string username, out string password)
+        {
+            username = null;
+            password = null;
+
+            if (uri.UserInfo?.Contains(':') == true)
+            {
+                string[] splitted = uri.UserInfo.Split(':');
+
+                username = WebUtility.UrlDecode(splitted.First());
+                password = WebUtility.UrlDecode(splitted.Last());
+                return true;
+            }
+
+            return false;
+        }
     }
 }
diff --git a/src/OpenDirectoryDownloader/Program.cs b/src/OpenDirectoryDownloader/Program.cs
@@ -118,6 +118,16 @@ static async Task<int> Main(string[] args)
             openDirectoryIndexerSettings.Username = openDirectoryIndexerSettings.CommandLineOptions.Username;
             openDirectoryIndexerSettings.Password = openDirectoryIndexerSettings.CommandLineOptions.Password;
 
+            if (string.IsNullOrEmpty(openDirectoryIndexerSettings.Username) && string.IsNullOrEmpty(openDirectoryIndexerSettings.Password))
+            {
+                if (Library.GetUriCredentials(new Uri(url), out string username, out string password))
+                {
+                    Console.WriteLine($"Using username '{username}' and password '{password}'");
+                    openDirectoryIndexerSettings.Username = username;
+                    openDirectoryIndexerSettings.Password = password;
+                }
+            }
+
             // FTP
             if (openDirectoryIndexerSettings.Url?.StartsWith(Constants.UriScheme.Ftp) == true || openDirectoryIndexerSettings.Url?.StartsWith(Constants.UriScheme.Ftps) == true)
             {